v.1.71.15.0 building xcode with macosx10.14

WolfSource · Feb 23, 2019 · 3d6e121 · 3d6e121
1 parent 92fafc5
commit 3d6e121
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/engine/builds/xcode/tests/vulkan/test_vulkan_osx.xcodeproj/project.pbxproj b/engine/builds/xcode/tests/vulkan/test_vulkan_osx.xcodeproj/project.pbxproj
@@ -392,6 +392,7 @@
 					"$(SRCROOT)/../../../../deps/assimp/lib/osx/debug",
 					"$(SRCROOT)/../../../../deps/libpng/lib/osx",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				PRODUCT_BUNDLE_IDENTIFIER = wolf.engine.vulkan.osx.test;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				"VALID_ARCHS[sdk=*]" = x86_64;
@@ -410,6 +411,7 @@
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = test_vulkan_osx/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../../../engine/dependencies/vulkan/macOS/macOS/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				PRODUCT_BUNDLE_IDENTIFIER = wolf.engine.vulkan.osx.test;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				"VALID_ARCHS[sdk=*]" = x86_64;

diff --git a/...ulkan.osx.xcworkspace/xcuserdata/pooyaeimandar.xcuserdatad/UserInterfaceState.xcuserstate b/...ulkan.osx.xcworkspace/xcuserdata/pooyaeimandar.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/engine/builds/xcode/wolf.system/wolf.system.osx.xcodeproj/project.pbxproj b/engine/builds/xcode/wolf.system/wolf.system.osx.xcodeproj/project.pbxproj
@@ -7052,7 +7052,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				"HEADER_SEARCH_PATHS[arch=*]" = "";
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -7102,7 +7102,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				"HEADER_SEARCH_PATHS[arch=*]" = "";
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 			};

diff --git a/install.sh b/install.sh
@@ -5,16 +5,22 @@ cd ./engine/deps/
 
 keys=(
 assimp
-ffmpeg 
+ffmpeg
+libjpeg-turbo
+libpng 
 luaJIT 
 nanomsg 
-tbb)
+tbb
+zlib)
 
 values=(
 version.txt
 version.txt 
+version.txt
+version.txt 
 version.txt  
 COPYING 
+version.txt,
 version.txt)
 
 for i in "${!keys[@]}"; do
@@ -51,9 +57,9 @@ fi
 echo "$OSTYPE"
 echo "start building Wolf"
 
-if [[ "$OSTYPE" == "darwin" ]]; then
+if [ "$OSTYPE" == "darwin" ] || [ "$OSTYPE" == "darwin18" ] ; then
   tar -zxvf ./vulkan/macOS.tar.gz -C ./vulkan/ 
-  xcodebuild clean build -workspace ../../engine/builds/xcode/wolf.engine.vulkan.osx.xcworkspace -scheme test_vulkan_osx -sdk macosx10.13 -configuration Debug
+  xcodebuild clean build -workspace ../../engine/builds/xcode/wolf.engine.vulkan.osx.xcworkspace -scheme test_vulkan_osx -sdk macosx10.14 -configuration Debug
   echo "All done successfully"
 elif [[ "$OSTYPE" == "linux-gnu" ]]; then
   echo "building wolf.system.linux"