TBB : Move to config-based build

johnhaddon · Sep 11, 2018 · 10d2528 · 10d2528
1 parent 4273cf4
commit 10d2528
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 42 deletions.
diff --git a/TBB/config.py b/TBB/config.py
@@ -0,0 +1,51 @@
+{
+
+	"downloads" : [
+
+		"https://github.com/01org/tbb/archive/2017_U6.tar.gz"
+
+	],
+
+	"license" : "LICENSE",
+
+	"commands" : [
+
+		"make -j {jobs} stdver=c++11",
+		"cp -r include/tbb {buildDir}/include",
+		"{installLibsCommand}",
+
+	],
+
+	"platform:linux" : {
+
+		"environment" : {
+
+			"tbb_os" : "linux",
+
+		},
+
+		"variables" : {
+
+			"installLibsCommand" : "cp build/*_release/*.so* {buildDir}/lib",
+
+		},
+
+	},
+
+	"platform:osx" : {
+
+		"environment" : {
+
+			"tbb_os" : "macos",
+
+		},
+
+		"variables" : {
+
+			"installLibsCommand" : "cp build/macos_*_release/*.dylib {buildDir}/lib",
+
+		},
+
+	},
+
+}
diff --git a/archives/tbb-2017_U6.tar.gz b/archives/tbb-2017_U6.tar.gz
diff --git a/build/buildAll.sh b/build/buildAll.sh
@@ -33,7 +33,7 @@ cd `dirname $0`
 ./buildTIFF.sh
 (cd .. && ./build/build.py --project PNG --buildDir $BUILD_DIR)
 (cd .. && ./build/build.py --project FreeType --buildDir $BUILD_DIR)
-./buildTBB.sh
+(cd .. && ./build/build.py --project TBB --buildDir $BUILD_DIR)
 ./buildEXR.sh
 ./buildFonts.sh
 (cd .. && ./build/build.py --project GLEW --buildDir $BUILD_DIR)

diff --git a/build/buildTBB.sh b/build/buildTBB.sh