bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

remove -mwindows flag for scons/mingw, enable manifest & winblender.rc for all windows builds except for msvc2010

Browse Source
This commit is contained in:
Campbell Barton 2011-04-09 00:10:29 +00:00
parent 9feb70d390
commit 161927e27e
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/scons/config/win32-mingw-config.py
View File

@ -165,7 +165,7 @@ CXX = 'g++'
CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ] CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE'] 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_CFLAGS = ['-DNDEBUG', '-O2']
REL_CCFLAGS = ['-DNDEBUG', '-O2'] REL_CCFLAGS = ['-DNDEBUG', '-O2']

10
source/creator/CMakeLists.txt
View File

@ -100,14 +100,14 @@ set(SRC
creator.c creator.c
) )
if(OFF) # XXX, Disable, is giving problems with linking msvc2010 # MSVC 2010 gives linking errors with the manifest
if(WIN32 AND NOT UNIX AND NOT MSVC10)
if(WIN32 AND NOT UNIX)
string(SUBSTRING ${BLENDER_VERSION} 0 1 bver1) string(SUBSTRING ${BLENDER_VERSION} 0 1 bver1)
string(SUBSTRING ${BLENDER_VERSION} 2 1 bver2) string(SUBSTRING ${BLENDER_VERSION} 2 1 bver2)
string(SUBSTRING ${BLENDER_VERSION} 3 1 bver3) string(SUBSTRING ${BLENDER_VERSION} 3 1 bver3)
add_definitions( add_definitions(
-DBLEN_VER_RC_STR=${BLENDER_VERSION} -DWINDRES
-DBLEN_VER_RC_STR_M=${BLENDER_VERSION}
-DBLEN_VER_RC_1=${bver1} -DBLEN_VER_RC_1=${bver1}
-DBLEN_VER_RC_2=${bver2} -DBLEN_VER_RC_2=${bver2}
-DBLEN_VER_RC_3=${bver3} -DBLEN_VER_RC_3=${bver3}
@ -119,8 +119,6 @@ if(WIN32 AND NOT UNIX)
) )
endif() endif()
endif(OFF) # XXX.
if(WITH_BUILDINFO) if(WITH_BUILDINFO)
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# These defines could all be moved into the header below # These defines could all be moved into the header below

8
source/icons/winblender.rc
View File

@ -23,12 +23,12 @@ BEGIN
BEGIN BEGIN
BLOCK "04090000" BLOCK "04090000"
BEGIN BEGIN
#if defined(FREE_WINDOWS) || !defined(WINDRES) // this doesnt work for mingw. #ifdef WINDRES // this doesnt work for mingw.
VALUE "FileVersion", "Unknown"
VALUE "ProductVersion", "Unknown"
#else
VALUE "FileVersion", BLEN_VER_RC_STR VALUE "FileVersion", BLEN_VER_RC_STR
VALUE "ProductVersion", BLEN_VER_RC_STR VALUE "ProductVersion", BLEN_VER_RC_STR
#else
VALUE "FileVersion", "Unknown"
VALUE "ProductVersion", "Unknown"
#endif #endif
VALUE "CompanyName", "Blender Foundation" VALUE "CompanyName", "Blender Foundation"
VALUE "FileDescription", "Blender" VALUE "FileDescription", "Blender"