[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36067] trunk/blender: remove -mwindows flag for scons/mingw, enable manifest & winblender. rc for all windows builds except for msvc2010

[Campbell Barton]

Revision: 36067
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36067
Author:   campbellbarton
Date:     2011-04-09 00:10:29 +0000 (Sat, 09 Apr 2011)
Log Message:
-----------
remove -mwindows flag for scons/mingw, enable manifest & winblender.rc for all windows builds except for msvc2010

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/win32-mingw-config.py
    trunk/blender/source/creator/CMakeLists.txt
    trunk/blender/source/icons/winblender.rc

Modified: trunk/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-mingw-config.py	2011-04-08 22:07:17 UTC (rev 36066)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py	2011-04-09 00:10:29 UTC (rev 36067)
@@ -165,7 +165,7 @@
 CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
 
 CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE']
-CXXFLAGS = ['-pipe', '-mwindows', '-funsigned-char', '-fno-strict-aliasing' ]
+CXXFLAGS = ['-pipe',  '-funsigned-char', '-fno-strict-aliasing' ]
 REL_CFLAGS = ['-DNDEBUG',  '-O2']
 REL_CCFLAGS = ['-DNDEBUG',  '-O2']
 

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2011-04-08 22:07:17 UTC (rev 36066)
+++ trunk/blender/source/creator/CMakeLists.txt	2011-04-09 00:10:29 UTC (rev 36067)
@@ -100,14 +100,14 @@
 	creator.c
 )
 
-if(OFF)  # XXX, Disable, is giving problems with linking msvc2010
-
-if(WIN32 AND NOT UNIX)
+# MSVC 2010 gives linking errors with the manifest
+if(WIN32 AND NOT UNIX AND NOT MSVC10)
 	string(SUBSTRING ${BLENDER_VERSION} 0 1 bver1)
 	string(SUBSTRING ${BLENDER_VERSION} 2 1 bver2)
 	string(SUBSTRING ${BLENDER_VERSION} 3 1 bver3)
 	add_definitions(
-		-DBLEN_VER_RC_STR=${BLENDER_VERSION}
+		-DWINDRES
+		-DBLEN_VER_RC_STR_M=${BLENDER_VERSION}
 		-DBLEN_VER_RC_1=${bver1}
 		-DBLEN_VER_RC_2=${bver2}
 		-DBLEN_VER_RC_3=${bver3}
@@ -119,8 +119,6 @@
 	)
 endif()
 
-endif(OFF)  # XXX.
-
 if(WITH_BUILDINFO)
 	# --------------------------------------------------------------------------
 	# These defines could all be moved into the header below

Modified: trunk/blender/source/icons/winblender.rc
===================================================================
--- trunk/blender/source/icons/winblender.rc	2011-04-08 22:07:17 UTC (rev 36066)
+++ trunk/blender/source/icons/winblender.rc	2011-04-09 00:10:29 UTC (rev 36067)
@@ -23,12 +23,12 @@
   BEGIN
     BLOCK "04090000"
     BEGIN
-#if defined(FREE_WINDOWS) || !defined(WINDRES) // this doesnt work for mingw.
+#ifdef WINDRES // this doesnt work for mingw.
+      VALUE "FileVersion", BLEN_VER_RC_STR
+      VALUE "ProductVersion", BLEN_VER_RC_STR
+#else
       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"