remove -mwindows flag for scons/mingw, enable manifest & winblender.rc for all window...
authorCampbell Barton <ideasman42@gmail.com>
Sat, 9 Apr 2011 00:10:29 +0000 (00:10 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 9 Apr 2011 00:10:29 +0000 (00:10 +0000)
build_files/scons/config/win32-mingw-config.py
source/creator/CMakeLists.txt
source/icons/winblender.rc

index 288d58d1adac2cab938c823e01c73a67511c9b27..6dac29b37f719c832a865bc71c2c6c8e8367bb1d 100644 (file)
@@ -165,7 +165,7 @@ CXX = 'g++'
 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']
 
index 41bf5f960bc4fbbd2aaf30082f16709ad7635855..2a21755b5142c45c4cb385c8bd7f81456e96c39b 100644 (file)
@@ -100,14 +100,14 @@ set(SRC
        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 @@ if(WIN32 AND NOT UNIX)
        )
 endif()
 
-endif(OFF)  # XXX.
-
 if(WITH_BUILDINFO)
        # --------------------------------------------------------------------------
        # These defines could all be moved into the header below
index d1b67725b57d391786cbeef23e7b042579931667..316786c8b30ff17b33cc01ae99e42de5c62f4c5d 100644 (file)
@@ -23,12 +23,12 @@ BEGIN
   BEGIN
     BLOCK "04090000"
     BEGIN
-#if defined(FREE_WINDOWS) || !defined(WINDRES) // this doesnt work for mingw.
-      VALUE "FileVersion", "Unknown"
-      VALUE "ProductVersion", "Unknown"
-#else
+#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"
 #endif
       VALUE "CompanyName", "Blender Foundation"
       VALUE "FileDescription", "Blender"