diff options
| -rw-r--r-- | build_files/scons/config/win32-mingw-config.py | 2 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | source/icons/winblender.rc | 8 |
3 files changed, 9 insertions, 11 deletions
diff --git a/build_files/scons/config/win32-mingw-config.py b/build_files/scons/config/win32-mingw-config.py index 288d58d1ada..6dac29b37f7 100644 --- a/build_files/scons/config/win32-mingw-config.py +++ b/build_files/scons/config/win32-mingw-config.py @@ -165,7 +165,7 @@ CXX = 'g++' CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ] CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE'] -CXXFLAGS = ['-pipe', '-mwindows', '-funsigned-char', '-fno-strict-aliasing' ] +CXXFLAGS = ['-pipe', '-funsigned-char', '-fno-strict-aliasing' ] REL_CFLAGS = ['-DNDEBUG', '-O2'] REL_CCFLAGS = ['-DNDEBUG', '-O2'] diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 41bf5f960bc..2a21755b514 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -100,14 +100,14 @@ set(SRC creator.c ) -if(OFF) # XXX, Disable, is giving problems with linking msvc2010 - -if(WIN32 AND NOT UNIX) +# MSVC 2010 gives linking errors with the manifest +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( - -DBLEN_VER_RC_STR=${BLENDER_VERSION} + -DWINDRES + -DBLEN_VER_RC_STR_M=${BLENDER_VERSION} -DBLEN_VER_RC_1=${bver1} -DBLEN_VER_RC_2=${bver2} -DBLEN_VER_RC_3=${bver3} @@ -119,8 +119,6 @@ if(WIN32 AND NOT UNIX) ) endif() -endif(OFF) # XXX. - if(WITH_BUILDINFO) # -------------------------------------------------------------------------- # These defines could all be moved into the header below diff --git a/source/icons/winblender.rc b/source/icons/winblender.rc index d1b67725b57..316786c8b30 100644 --- a/source/icons/winblender.rc +++ b/source/icons/winblender.rc @@ -23,12 +23,12 @@ BEGIN BEGIN BLOCK "04090000" BEGIN -#if defined(FREE_WINDOWS) || !defined(WINDRES) // this doesnt work for mingw. - VALUE "FileVersion", "Unknown" - VALUE "ProductVersion", "Unknown" -#else +#ifdef WINDRES // this doesnt work for mingw. VALUE "FileVersion", BLEN_VER_RC_STR VALUE "ProductVersion", BLEN_VER_RC_STR +#else + VALUE "FileVersion", "Unknown" + VALUE "ProductVersion", "Unknown" #endif VALUE "CompanyName", "Blender Foundation" VALUE "FileDescription", "Blender" |