workaround for building blender with mingw, was giving syntax error, for now just...

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 7e30e19a73fb19170f81c9972dc89fc10d15894e..1678edcd6a34d3ded69090046b8218cbbe0fc2aa 100644 (file)
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -105,7 +105,7 @@ if(WIN32 AND NOT UNIX)
        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_STR_M=${BLENDER_VERSION}
                -DBLEN_VER_RC_1=${bver1}
                -DBLEN_VER_RC_2=${bver2}
                -DBLEN_VER_RC_3=${bver3}

diff --git a/source/icons/winblender.rc b/source/icons/winblender.rc
index 244c2cb2e2cdb40306585fff908ec904b1aec275..ea9285dbaafce04acee0b27e5e75a790114c290a 100644 (file)
--- a/source/icons/winblender.rc
+++ b/source/icons/winblender.rc
@@ -23,8 +23,13 @@ BEGIN
   BEGIN
     BLOCK "04090000"
     BEGIN
+#ifdef FREE_WINDOWS // this doesnt work for mingw.
+      VALUE "FileVersion", "Unknown"
+      VALUE "ProductVersion", "Unknown"
+#else
       VALUE "FileVersion", BLEN_VER_RC_STR
       VALUE "ProductVersion", BLEN_VER_RC_STR
+#endif
       VALUE "CompanyName", "Blender Foundation"
       VALUE "FileDescription", "Blender"
       VALUE "LegalCopyright", "GPLv2 (Blender Foundation)"