[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35932] trunk/blender/source: workaround for building blender with mingw, was giving syntax error, for now just dont include blender version in the exe for mingw

[Campbell Barton]

Revision: 35932
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35932
Author:   campbellbarton
Date:     2011-04-01 06:56:45 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
workaround for building blender with mingw, was giving syntax error, for now just dont include blender version in the exe for mingw

Modified Paths:
--------------
    trunk/blender/source/creator/CMakeLists.txt
    trunk/blender/source/icons/winblender.rc

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2011-04-01 06:39:19 UTC (rev 35931)
+++ trunk/blender/source/creator/CMakeLists.txt	2011-04-01 06:56:45 UTC (rev 35932)
@@ -105,7 +105,7 @@
 	string(SUBSTRING ${BLENDER_VERSION} 2 1 bver2)
 	string(SUBSTRING ${BLENDER_VERSION} 3 1 bver3)
 	add_definitions(
-		-DBLEN_VER_RC_STR="${BLENDER_VERSION}"
+		-DBLEN_VER_RC_STR_M=${BLENDER_VERSION}
 		-DBLEN_VER_RC_1=${bver1}
 		-DBLEN_VER_RC_2=${bver2}
 		-DBLEN_VER_RC_3=${bver3}

Modified: trunk/blender/source/icons/winblender.rc
===================================================================
--- trunk/blender/source/icons/winblender.rc	2011-04-01 06:39:19 UTC (rev 35931)
+++ trunk/blender/source/icons/winblender.rc	2011-04-01 06:56:45 UTC (rev 35932)
@@ -23,8 +23,13 @@
   BEGIN
     BLOCK "04090000"
     BEGIN
+#ifdef FREE_WINDOWS // this doesnt work for mingw.
+      VALUE "FileVersion", "Unknown"
+      VALUE "ProductVersion", "Unknown"
+#else
       VALUE "FileVersion", BLEN_VER_RC_STR
       VALUE "ProductVersion", BLEN_VER_RC_STR
+#endif
       VALUE "CompanyName", "Blender Foundation"
       VALUE "FileDescription", "Blender"
       VALUE "LegalCopyright", "GPLv2 (Blender Foundation)"