[[ Prebuilt ]] Add thirdparty prebuilt project file

livecodeian · livecodeian · commit 05884e24afc1 · 2019-05-07T23:40:08.000+01:00
Add gyp target to link prebuilt thirdparty libraries into compiled executables
diff --git a/engine/kernel-development.gyp b/engine/kernel-development.gyp
@@ -50,7 +50,7 @@
 				'kernel.gyp:kernel',
 
 				'../thirdparty/libopenssl/libopenssl.gyp:libopenssl_stubs',
-				'../thirdparty/libz/libz.gyp:libz',
+				'../prebuilt/thirdparty.gyp:thirdparty_prebuilt',
 			],
 			
 			'sources':
diff --git a/engine/kernel-installer.gyp b/engine/kernel-installer.gyp
@@ -38,7 +38,7 @@
 			[
 				'kernel.gyp:kernel',
 				
-				'../thirdparty/libz/libz.gyp:libz',
+				'../prebuilt/thirdparty.gyp:thirdparty_prebuilt',
 			],
 			
 			'includes':
diff --git a/engine/kernel-server.gyp b/engine/kernel-server.gyp
@@ -57,11 +57,7 @@
 				'../prebuilt/libcurl.gyp:libcurl',
 				'../prebuilt/libopenssl.gyp:libopenssl',
 				
-				'../thirdparty/libgif/libgif.gyp:libgif',
-				'../thirdparty/libjpeg/libjpeg.gyp:libjpeg',
-				'../thirdparty/libpcre/libpcre.gyp:libpcre',
-				'../thirdparty/libpng/libpng.gyp:libpng',
-				'../thirdparty/libz/libz.gyp:libz',
+				'../prebuilt/thirdparty.gyp:thirdparty_prebuilt',
 				
 				'engine-common.gyp:quicktime_stubs',
 				
diff --git a/engine/kernel.gyp b/engine/kernel.gyp
@@ -20,15 +20,12 @@
 				
 				'../libbrowser/libbrowser.gyp:libbrowser',
 
-				'../thirdparty/libgif/libgif.gyp:libgif',
-				'../thirdparty/libjpeg/libjpeg.gyp:libjpeg',
 				'../thirdparty/libopenssl/libopenssl.gyp:libopenssl_stubs',
-				'../thirdparty/libpcre/libpcre.gyp:libpcre',
-				'../thirdparty/libpng/libpng.gyp:libpng',
-				'../thirdparty/libz/libz.gyp:libz',
 				
 				'../prebuilt/libopenssl.gyp:libopenssl_headers',
 
+				'../prebuilt/thirdparty.gyp:thirdparty_prebuilt',
+
 				'engine-common.gyp:encode_version',
 				'engine-common.gyp:quicktime_stubs',
 			],
@@ -68,12 +65,6 @@
 				[
 					'OS == "android"',
 					{
-						'dependencies':
-						[
-							'../thirdparty/libfreetype/libfreetype.gyp:libfreetype',
-							'../thirdparty/libskia/libskia.gyp:libskia',
-						],
-						
 						'sources!':
 						[
 							# Not yet supported on Android
@@ -100,10 +91,6 @@
 				[
 					'OS == "emscripten"',
 					{
-						'dependencies':
-						[
-							'../thirdparty/libskia/libskia.gyp:libskia',
-						],
 						'sources':
 						[
 							'<@(engine_minizip_source_files)',
diff --git a/libfoundation/libfoundation.gyp b/libfoundation/libfoundation.gyp
@@ -45,10 +45,10 @@
 			
 			'dependencies':
 			[
+				'../prebuilt/thirdparty.gyp:thirdparty_prebuilt',
 				'../prebuilt/libicu.gyp:libicu',
 				'../prebuilt/libicu.gyp:encode_minimal_icu_data',
 				'../thirdparty/libffi/libffi.gyp:libffi',
-				'../thirdparty/libz/libz.gyp:libz',
 			],
 			
 			'include_dirs':
diff --git a/libgraphics/libgraphics.gyp b/libgraphics/libgraphics.gyp
@@ -14,8 +14,8 @@
 			
 			'dependencies':
 			[
+				'../prebuilt/thirdparty.gyp:thirdparty_prebuilt',
 				'../libfoundation/libfoundation.gyp:libFoundation',
-				'../thirdparty/libskia/libskia.gyp:libskia',
 			],
 			
 			'include_dirs':
@@ -48,21 +48,6 @@
 				'src/drawing.cpp',
 			],
 			
-			'conditions':
-			[
-				[
-					'OS in ("emscripten", "android")',
-					{
-						'dependencies':
-						[
-							'../prebuilt/libicu.gyp:libicu',
-							'../thirdparty/libfreetype/libfreetype.gyp:libfreetype',
-							'../thirdparty/libharfbuzz/libharfbuzz.gyp:libharfbuzz',
-						],
-					},
-				],
-			],
-
 			'target_conditions':
 			[
 				[
diff --git a/prebuilt/fetch-libraries.sh b/prebuilt/fetch-libraries.sh
@@ -8,12 +8,12 @@ ARCHS_ios=( Universal )
 ARCHS_win32=( x86 x86_64 )
 ARCHS_linux=( i386 x86_64 )
 ARCHS_emscripten=( js )
-LIBS_android=( OpenSSL ICU )
-LIBS_mac=( OpenSSL ICU )
-LIBS_ios=( OpenSSL ICU )
-LIBS_win32=( OpenSSL Curl ICU CEF )
-LIBS_linux=( OpenSSL Curl ICU CEF )
-LIBS_emscripten=( ICU )
+LIBS_android=( Thirdparty OpenSSL ICU )
+LIBS_mac=( Thirdparty OpenSSL ICU )
+LIBS_ios=( Thirdparty OpenSSL ICU )
+LIBS_win32=( Thirdparty OpenSSL Curl ICU CEF )
+LIBS_linux=( Thirdparty OpenSSL Curl ICU CEF )
+LIBS_emscripten=( Thirdparty ICU )
 
 SUBPLATFORMS_ios=(iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator12.1 iPhoneOS9.2 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS12.1)
 SUBPLATFORMS_win32=(v141_static_debug v141_static_release)
diff --git a/prebuilt/thirdparty.gyp b/prebuilt/thirdparty.gyp
diff --git a/revdb/revdb.gyp b/revdb/revdb.gyp
diff --git a/revxml/revxml.gyp b/revxml/revxml.gyp

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`[`
`39`	`39`	`'kernel.gyp:kernel',`
`40`	`40`
`41`		`- '../thirdparty/libz/libz.gyp:libz',`
	`41`	`+ '../prebuilt/thirdparty.gyp:thirdparty_prebuilt',`
`42`	`42`	`],`
`43`	`43`
`44`	`44`	`'includes':`