[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36074] trunk/blender/source/creator/ CMakeLists.txt: Enable WINDRES only for MinGW, otherwise we get multiple manifest errors for ie.
Nathan Letwory
nathan at letworyinteractive.com
Sun Apr 10 01:25:52 CEST 2011
Revision: 36074
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36074
Author: jesterking
Date: 2011-04-09 23:25:52 +0000 (Sat, 09 Apr 2011)
Log Message:
-----------
Enable WINDRES only for MinGW, otherwise we get multiple manifest errors for ie. vs2008
Modified Paths:
--------------
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2011-04-09 23:19:11 UTC (rev 36073)
+++ trunk/blender/source/creator/CMakeLists.txt 2011-04-09 23:25:52 UTC (rev 36074)
@@ -105,14 +105,25 @@
string(SUBSTRING ${BLENDER_VERSION} 0 1 bver1)
string(SUBSTRING ${BLENDER_VERSION} 2 1 bver2)
string(SUBSTRING ${BLENDER_VERSION} 3 1 bver3)
- add_definitions(
- -DWINDRES
- -DBLEN_VER_RC_STR_M=${BLENDER_VERSION}
- -DBLEN_VER_RC_1=${bver1}
- -DBLEN_VER_RC_2=${bver2}
- -DBLEN_VER_RC_3=${bver3}
- -DBLEN_VER_RC_4=0
- )
+ if(MINGW)
+ add_definitions(
+ -DWINDRES
+ -DBLEN_VER_RC_STR_M=${BLENDER_VERSION}
+ -DBLEN_VER_RC_1=${bver1}
+ -DBLEN_VER_RC_2=${bver2}
+ -DBLEN_VER_RC_3=${bver3}
+ -DBLEN_VER_RC_4=0
+ )
+ else()
+ add_definitions(
+ -DBLEN_VER_RC_STR=${BLENDER_VERSION}
+ -DBLEN_VER_RC_1=${bver1}
+ -DBLEN_VER_RC_2=${bver2}
+ -DBLEN_VER_RC_3=${bver3}
+ -DBLEN_VER_RC_4=0
+ )
+ endif()
+
list(APPEND SRC
../icons/winblender.rc
More information about the Bf-blender-cvs
mailing list