Revert "ios tweaks"

This reverts commit 0cf2ae5.

Lumos/premake5.lua

@@ -244,7 +244,7 @@ project "Lumos"
 			"-Wno-attributes"
 		}
 
-		xcodebuildresources { 'res' }
+		xcodebuildresources { "res/**" }
 
 
 	filter "system:linux"

Lumos/src/Platform/Vulkan/VKContext.cpp

@@ -232,7 +232,6 @@ namespace Lumos
 
 		void VKContext::CreateInstance()
 		{
-#ifndef LUMOS_PLATFORM_IOS
 			if (volkInitialize() != VK_SUCCESS)
 			{
 				Debug::Log::Critical("volkInitialize failed");
@@ -242,7 +241,6 @@ namespace Lumos
 			{
 				Debug::Log::Critical("Could not find loader");
 			}
-#endif
 
 			VkApplicationInfo appInfo = {};
 			appInfo.pApplicationName = "Sandbox";
@@ -285,9 +283,7 @@ namespace Lumos
 				Debug::Log::Critical("[VULKAN] Failed to create instance!");
 			}
 
-#ifndef LUMOS_PLATFORM_IOS
 			volkLoadInstance(m_VkInstance);
-#endif
 		}
 
 		void VKContext::SetupDebugCallback()

Sandbox/premake5.lua

@@ -189,9 +189,44 @@ project "Sandbox"
 		files
 		{
 			"../Lumos/src/Platform/iOS/Client/**",
+			"res/**"
 		}
 
-		xcodebuildresources { 'res' }
+		xcodebuildresources { "res/**" }
+
+		filter {"system:ios", "configurations:release"}
+
+		local source = "../Dependencies/vulkan/libs/ios/**"
+		local target = "../bin/release/"
+
+		buildmessage("copying "..source.." -> "..target)
+
+		postbuildcommands {
+			"{COPY} "..source.." "..target
+		}
+
+		filter {"system:ios", "configurations:dist"}
+
+			local source = "../Dependencies/vulkan/libs/ios/**"
+			local target = "../bin/dist/"
+
+			buildmessage("copying "..source.." -> "..target)
+
+			postbuildcommands {
+				"{COPY} "..source.." "..target
+			}
+
+		filter {"system:ios", "configurations:debug"}
+
+			local source = "../Dependencies/vulkan/libs/ios/**"
+			local target = "../bin/debug/"
+
+			buildmessage("copying "..source.." -> "..target)
+
+			postbuildcommands {
+				"{COPY} "..source.." "..target
+			}
+
 
 	filter "system:linux"
 		cppdialect "C++17"

Scripts/ios.lua

@@ -3,7 +3,6 @@ local action = premake.action
 
 -- Add iOS to the allowed system values and `os` command line option
 api.addAllowed("system", { "ios" })
-api.addAllowed('language', 'ObjCpp' )
 table.insert(premake.option.list["os"].allowed, { "ios", "Apple iOS" })
 
 -- The `xcode4` action hardcodes OS to `macosx`. Unset that.

premake5.lua

@@ -1,16 +1,6 @@
 require 'Scripts/ios'
 require 'Scripts/premakeDefines'
 
-if( _TARGET_OS == 'macosx' ) then
-	newoption {
-		trigger = 'ios',
-		description = 'Target iOS'
-	}
-	if( _OPTIONS[ 'ios' ] ) then
-		_TARGET_OS = 'ios'
-	end
-end
-
 workspace "Lumos"
 	architecture "x64"