[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36510] trunk/blender/source/blenderplayer /CMakeLists.txt: Patch #27225: blenderplayer resource compilation error fix for cmake + mingw,

[Brecht Van Lommel]

Revision: 36510
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36510
Author:   blendix
Date:     2011-05-06 08:16:44 +0000 (Fri, 06 May 2011)
Log Message:
-----------
Patch #27225: blenderplayer resource compilation error fix for cmake + mingw,
patch by Ryakiotakis Antonis.

Modified Paths:
--------------
    trunk/blender/source/blenderplayer/CMakeLists.txt

Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
===================================================================
--- trunk/blender/source/blenderplayer/CMakeLists.txt   2011-05-06 03:29:55 UTC 
(rev 36509)
+++ trunk/blender/source/blenderplayer/CMakeLists.txt   2011-05-06 08:16:44 UTC 
(rev 36510)
@@ -43,13 +43,25 @@
        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)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs