mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some SCons-related improvements

metadata
Wenzel Jakob 2012-12-09 00:57:27 -05:00
parent ab9324c10b
commit 3a1fe7481e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -20,7 +20,7 @@ if sys.platform == 'win32':
# Set an application icon on Windows # Set an application icon on Windows
resources += [ env.RES('data/windows/mitsuba_res.rc') ] resources += [ env.RES('data/windows/mitsuba_res.rc') ]
# Convert the command line args from UTF-8 to UTF-16 # Convert the command line args from UTF-8 to UTF-16
winstubs += [os.path.abspath('data/windows/wmain_stub.cpp')] winstubs += [ env.SharedObject('#data/windows/wmain_stub.cpp') ]
Export('winstubs') Export('winstubs')
def build(scriptFile, exports = [], duplicate = 0): def build(scriptFile, exports = [], duplicate = 0):

7
src/mtsgui/SConscript
View File

@ -33,9 +33,8 @@ if hasQt:
del qtEnv['CXXFLAGS'][index-1] del qtEnv['CXXFLAGS'][index-1]
index = qtEnv['LINKFLAGS'].index('/SUBSYSTEM:CONSOLE') index = qtEnv['LINKFLAGS'].index('/SUBSYSTEM:CONSOLE')
del qtEnv['LINKFLAGS'][index] del qtEnv['LINKFLAGS'][index]
qtEnv.Append(CXXFLAGS=['/D', '_WINDOWS']) qtEnv.Append(CXXFLAGS=['/D', '_WINDOWS', '/D', 'MTS_CUSTOM_QTMAIN', '/D', 'MTSGUI_STATIC_QFILEDIALOG=1'])
qtEnv.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS']) qtEnv.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])
qtEnv.Append(LIBS=['qtmain'])
if hasBreakpad: if hasBreakpad:
qtEnv.Append(CPPPATH=['#dependencies/include/breakpad']) qtEnv.Append(CPPPATH=['#dependencies/include/breakpad'])
qtEnv.Append(LIBS=['breakpad_common', 'breakpad_exception_handler', 'breakpad_crash_generation_client', qtEnv.Append(LIBS=['breakpad_common', 'breakpad_exception_handler', 'breakpad_crash_generation_client',
@ -72,6 +71,10 @@ if hasQt:
qtSources += qtEnv_osx.StaticObject('breakpad.mm') qtSources += qtEnv_osx.StaticObject('breakpad.mm')
else: else:
qtSources = [x for x in qtSources if (not isinstance(x, str) or 'cocoa' not in x)] qtSources = [x for x in qtSources if (not isinstance(x, str) or 'cocoa' not in x)]
if sys.platform == 'win32':
qtSources += qtEnv.StaticObject('qtmain_win.cpp')
mtsgui = qtEnv.Program('mtsgui', qtSources) mtsgui = qtEnv.Program('mtsgui', qtSources)
if sys.platform == 'darwin': if sys.platform == 'darwin':
qtEnv.AddPostAction(mtsgui, 'install_name_tool -change QtGui.framework/Versions/4/QtGui @rpath/QtGui $TARGET') qtEnv.AddPostAction(mtsgui, 'install_name_tool -change QtGui.framework/Versions/4/QtGui @rpath/QtGui $TARGET')