diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-04-10 03:25:52 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-04-10 03:25:52 +0400 |
| commit | 4d469265dd8993724bb251dff0e5cd48a7fcb592 (patch) | |
| tree | 6ab0843850c7af201de12b16ba99a64b4205d3af | |
| parent | 0a60bc14d63c898eef534fb5cdb7dc834fc74d90 (diff) | |
Enable WINDRES only for MinGW, otherwise we get multiple manifest errors for ie. vs2008
| -rw-r--r-- | source/creator/CMakeLists.txt | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 1ddab5992fd..90723f1b93d 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -105,14 +105,25 @@ 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( - -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 |