Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-05-06 12:16:44 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-05-06 12:16:44 +0400
commit576035f9e1080198367be6742309bdda680540d0 (patch)
tree5374d3d772eb1872f13a2d928adb9d281749c3be
parentba5d18b41faa6cff6bfa1a8bb060b47dc4d61309 (diff)
Patch #27225: blenderplayer resource compilation error fix for cmake + mingw,
patch by Ryakiotakis Antonis.
-rw-r--r--source/blenderplayer/CMakeLists.txt26
1 files changed, 19 insertions, 7 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index 1f796e86693..83dfd15f2dd 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -43,13 +43,25 @@ if(WIN32 AND NOT UNIX)
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}
- -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()
+
add_executable(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc)
else()
add_executable(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c)