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

OSX-related build system fixes

metadata
Wenzel Jakob 2010-11-21 01:49:27 +01:00
parent ea650dc287
commit 514d6b5995
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.hgignore
View File

@ -19,6 +19,9 @@
^config.log$ ^config.log$
.*\.pyc$ .*\.pyc$
# Dependencies
^dependencies/.*$
# OSX binaries and byproducts # OSX binaries and byproducts
^Mitsuba.app/.*$ ^Mitsuba.app/.*$
\.DS_Store \.DS_Store

6
SConstruct
View File

@ -10,6 +10,10 @@ configFile = GetOption('cfg')
if configFile == None: if configFile == None:
configFile = "config.py" configFile = "config.py"
if (sys.platform == 'win32' or sys.platform == 'darwin') and not os.path.exists('dependencies'):
print 'The dependencies are missing -- see http://www.mitsuba-renderer.org/devblog/archives/11-Build-system-changes.html'
Exit(1)
if not os.path.exists(configFile): if not os.path.exists(configFile):
print 'A configuration file must be selected! Have a look at \"README\"' print 'A configuration file must be selected! Have a look at \"README\"'
Exit(1) Exit(1)
@ -700,6 +704,8 @@ elif sys.platform == 'darwin':
installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/Xerces-C.framework/Resources/lib/libxerces-c-3.0.dylib') installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/Xerces-C.framework/Resources/lib/libxerces-c-3.0.dylib')
installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/libpng.framework/Resources/lib/libpng.dylib') installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/libpng.framework/Resources/lib/libpng.dylib')
installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/libjpeg.framework/Resources/lib/libjpeg.dylib') installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/libjpeg.framework/Resources/lib/libjpeg.dylib')
installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/libboost.framework/Resources/lib/libboost_system.dylib')
installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/libboost.framework/Resources/lib/libboost_filesystem.dylib')
if hasCollada: if hasCollada:
installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/Collada14Dom.framework/Resources/lib/libCollada14Dom.dylib') installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/Collada14Dom.framework/Resources/lib/libCollada14Dom.dylib')
if hasQt: if hasQt:

4
config/config-darwin-universal.py
View File

@ -19,8 +19,8 @@ GLINCLUDE = ['#dependencies/darwin/GLEW.framework/Headers']
GLLIBDIR = ['#dependencies/darwin/GLEW.framework/Resources/libs'] GLLIBDIR = ['#dependencies/darwin/GLEW.framework/Resources/libs']
GLLIB = ['GLEW', 'objc'] GLLIB = ['GLEW', 'objc']
GLFLAGS = ['-DGLEW_MX'] GLFLAGS = ['-DGLEW_MX']
BOOSTINCLUDE = ['#dependencies/boost'] BOOSTINCLUDE = ['#dependencies']
BOOSTLIB = ['boost_filesystem-xgcc42-mt-1_39', 'boost_system-xgcc42-mt-1_39'] BOOSTLIB = ['boost_filesystem', 'boost_system']
BOOSTLIBDIR = ['dependencies/darwin/libboost.framework/Resources/lib'] BOOSTLIBDIR = ['dependencies/darwin/libboost.framework/Resources/lib']
COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4'] COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4']
COLLADALIB = ['libCollada14Dom'] COLLADALIB = ['libCollada14Dom']

4
config/config-darwin-x86.py
View File

@ -19,8 +19,8 @@ GLINCLUDE = ['#dependencies/darwin/GLEW.framework/Headers']
GLLIBDIR = ['#dependencies/darwin/GLEW.framework/Resources/libs'] GLLIBDIR = ['#dependencies/darwin/GLEW.framework/Resources/libs']
GLLIB = ['GLEW', 'objc'] GLLIB = ['GLEW', 'objc']
GLFLAGS = ['-DGLEW_MX'] GLFLAGS = ['-DGLEW_MX']
BOOSTINCLUDE = ['#dependencies/boost'] BOOSTINCLUDE = ['#dependencies']
BOOSTLIB = ['boost_filesystem-xgcc42-mt-1_39', 'boost_system-xgcc42-mt-1_39'] BOOSTLIB = ['boost_filesystem', 'boost_system']
BOOSTLIBDIR = ['dependencies/darwin/libboost.framework/Resources/lib'] BOOSTLIBDIR = ['dependencies/darwin/libboost.framework/Resources/lib']
COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4'] COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4']
COLLADALIB = ['libCollada14Dom'] COLLADALIB = ['libCollada14Dom']

4
config/config-darwin-x86_64.py
View File

@ -19,8 +19,8 @@ GLINCLUDE = ['#dependencies/darwin/GLEW.framework/Headers']
GLLIBDIR = ['#dependencies/darwin/GLEW.framework/Resources/libs'] GLLIBDIR = ['#dependencies/darwin/GLEW.framework/Resources/libs']
GLLIB = ['GLEW', 'objc'] GLLIB = ['GLEW', 'objc']
GLFLAGS = ['-DGLEW_MX'] GLFLAGS = ['-DGLEW_MX']
BOOSTINCLUDE = ['#dependencies/boost'] BOOSTINCLUDE = ['#dependencies']
BOOSTLIB = ['boost_filesystem-xgcc42-mt-1_39', 'boost_system-xgcc42-mt-1_39'] BOOSTLIB = ['boost_filesystem', 'boost_system']
BOOSTLIBDIR = ['dependencies/darwin/libboost.framework/Resources/lib'] BOOSTLIBDIR = ['dependencies/darwin/libboost.framework/Resources/lib']
COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4'] COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4']
COLLADALIB = ['libCollada14Dom'] COLLADALIB = ['libCollada14Dom']