Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove -mwindows flag for scons/mingw, enable manifest & winblender.rc for all windows builds except for msvc2010

Browse Source
This commit is contained in:
Campbell Barton
2011-04-09 00:10:29 +00:00
parent 9feb70d390
commit 161927e27e
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/creator/CMakeLists.txt
View 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