remove -mwindows flag for scons/mingw, enable manifest & winblender.rc for all window...
[blender-staging.git] / source / creator / CMakeLists.txt
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