From 514d6b59958dd1ea51d581b5af037eb641271636 Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@cs.cornell.edu>
Date: Sun, 21 Nov 2010 01:49:27 +0100
Subject: [PATCH] OSX-related build system fixes

---
 .hgignore                         | 3 +++
 SConstruct                        | 6 ++++++
 config/config-darwin-universal.py | 4 ++--
 config/config-darwin-x86.py       | 4 ++--
 config/config-darwin-x86_64.py    | 4 ++--
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.hgignore b/.hgignore
index a1c55e66..25a2e97c 100644
--- a/.hgignore
+++ b/.hgignore
@@ -19,6 +19,9 @@
 ^config.log$
 .*\.pyc$
 
+# Dependencies
+^dependencies/.*$
+
 # OSX binaries and byproducts
 ^Mitsuba.app/.*$
 \.DS_Store
diff --git a/SConstruct b/SConstruct
index 7550f90e..c7ffd3d4 100644
--- a/SConstruct
+++ b/SConstruct
@@ -10,6 +10,10 @@ configFile = GetOption('cfg')
 if configFile == None:
 	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):
 	print 'A configuration file must be selected! Have a look at \"README\"'
 	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/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/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:
 		installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/Collada14Dom.framework/Resources/lib/libCollada14Dom.dylib')
 	if hasQt:
diff --git a/config/config-darwin-universal.py b/config/config-darwin-universal.py
index 5a91a991..9b9dfb35 100644
--- a/config/config-darwin-universal.py
+++ b/config/config-darwin-universal.py
@@ -19,8 +19,8 @@ GLINCLUDE      = ['#dependencies/darwin/GLEW.framework/Headers']
 GLLIBDIR       = ['#dependencies/darwin/GLEW.framework/Resources/libs']
 GLLIB          = ['GLEW', 'objc']
 GLFLAGS        = ['-DGLEW_MX']
-BOOSTINCLUDE   = ['#dependencies/boost']
-BOOSTLIB       = ['boost_filesystem-xgcc42-mt-1_39', 'boost_system-xgcc42-mt-1_39']
+BOOSTINCLUDE   = ['#dependencies']
+BOOSTLIB       = ['boost_filesystem', 'boost_system']
 BOOSTLIBDIR    = ['dependencies/darwin/libboost.framework/Resources/lib']
 COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4']
 COLLADALIB     = ['libCollada14Dom']
diff --git a/config/config-darwin-x86.py b/config/config-darwin-x86.py
index 6f363bad..2099e119 100644
--- a/config/config-darwin-x86.py
+++ b/config/config-darwin-x86.py
@@ -19,8 +19,8 @@ GLINCLUDE      = ['#dependencies/darwin/GLEW.framework/Headers']
 GLLIBDIR       = ['#dependencies/darwin/GLEW.framework/Resources/libs']
 GLLIB          = ['GLEW', 'objc']
 GLFLAGS        = ['-DGLEW_MX']
-BOOSTINCLUDE   = ['#dependencies/boost']
-BOOSTLIB       = ['boost_filesystem-xgcc42-mt-1_39', 'boost_system-xgcc42-mt-1_39']
+BOOSTINCLUDE   = ['#dependencies']
+BOOSTLIB       = ['boost_filesystem', 'boost_system']
 BOOSTLIBDIR    = ['dependencies/darwin/libboost.framework/Resources/lib']
 COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4']
 COLLADALIB     = ['libCollada14Dom']
diff --git a/config/config-darwin-x86_64.py b/config/config-darwin-x86_64.py
index 390852fe..3f736085 100644
--- a/config/config-darwin-x86_64.py
+++ b/config/config-darwin-x86_64.py
@@ -19,8 +19,8 @@ GLINCLUDE      = ['#dependencies/darwin/GLEW.framework/Headers']
 GLLIBDIR       = ['#dependencies/darwin/GLEW.framework/Resources/libs']
 GLLIB          = ['GLEW', 'objc']
 GLFLAGS        = ['-DGLEW_MX']
-BOOSTINCLUDE   = ['#dependencies/boost']
-BOOSTLIB       = ['boost_filesystem-xgcc42-mt-1_39', 'boost_system-xgcc42-mt-1_39']
+BOOSTINCLUDE   = ['#dependencies']
+BOOSTLIB       = ['boost_filesystem', 'boost_system']
 BOOSTLIBDIR    = ['dependencies/darwin/libboost.framework/Resources/lib']
 COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4']
 COLLADALIB     = ['libCollada14Dom']