diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-05-09 03:43:18 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-05-09 03:43:18 +0400 |
| commit | 6ef77cf95accc3cb914e7efd964118ce6e9521cf (patch) | |
| tree | 1d8dbf95355038c93f79f9053a0bf1d55b561ec3 /source/blenderplayer/CMakeLists.txt | |
| parent | 3462ddf17f38eb61fc3bb2751d55de15a47455c3 (diff) | |
| parent | 770119d16f7dbee99a60d19540818892c970c4e2 (diff) | |
=bmesh= merge from trunk at r36529
Diffstat (limited to 'source/blenderplayer/CMakeLists.txt')
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index cccb5e5ddaf..97021df288f 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) @@ -99,7 +111,6 @@ endif() bf_intern_smoke bf_modifiers bf_intern_moto - bf_gen_system bf_nodes bf_gpu bf_imbuf @@ -114,7 +125,8 @@ endif() bf_blenlib bf_imbuf_cineon bf_imbuf_openexr - extern_openjpeg + extern_openjpeg + extern_redcode bf_imbuf_dds bf_readblenfile bf_dna |