From e84c4776d778f4e407bf6f69195a4c6758f91d84 Mon Sep 17 00:00:00 2001
From: Geoff Evans <geoff@flummoxed.org>
Date: Mon, 12 Nov 2018 17:36:28 -0800
Subject: [PATCH] Update premake and core

---
 Core                      |  2 +-
 Dependencies/premake      |  2 +-
 Dependencies/premake.lua  | 10 ++--------
 Dependencies/premake5.lua |  5 -----
 make-all.sh               | 14 ++++----------
 5 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/Core b/Core
index 7be252b83..5c6c45308 160000
--- a/Core
+++ b/Core
@@ -1 +1 @@
-Subproject commit 7be252b83057281f5ee384eb01cb221ef53def7d
+Subproject commit 5c6c4530863975ff42229e1db6bf7fd173f66a32
diff --git a/Dependencies/premake b/Dependencies/premake
index 66362c08c..629c6c89c 160000
--- a/Dependencies/premake
+++ b/Dependencies/premake
@@ -1 +1 @@
-Subproject commit 66362c08c01f7073d8d0af517ea93a6833d17fd2
+Subproject commit 629c6c89c3814bca8752125f9b1ca80968e461cc
diff --git a/Dependencies/premake.lua b/Dependencies/premake.lua
index e81de4158..b895a3bde 100644
--- a/Dependencies/premake.lua
+++ b/Dependencies/premake.lua
@@ -202,10 +202,7 @@ Helium.DoBasicWorkspaceSettings = function()
 		symbols "On"
 		optimize "Speed"
 		editandcontinue "Off"
-		flags
-		{
-			"NoFramePointer",
-		}
+		omitframepointer "On"
 
 	configuration "Release"
 		defines
@@ -216,10 +213,7 @@ Helium.DoBasicWorkspaceSettings = function()
 		symbols "On"
 		optimize "Speed"
 		editandcontinue "Off"
-		flags
-		{
-			"NoFramePointer",
-		}
+		omitframepointer "On"
 
 	configuration "windows"
 		buildoptions
diff --git a/Dependencies/premake5.lua b/Dependencies/premake5.lua
index c13a6e665..a341a62d1 100644
--- a/Dependencies/premake5.lua
+++ b/Dependencies/premake5.lua
@@ -11,11 +11,6 @@ require( thisFileLocation .. '/premake-wx' )
 function CheckEnvironment()
 
 	print("\nChecking Environment...\n")
-	
-	if _PREMAKE_VERSION < Helium.RequiredPremakeVersion then
-		print( "You must be running at least Premake " .. Helium.RequiredPremakeVersion .. "." )
-		os.exit( 1 )
-	end
 
 	if os.host() == "windows" then
 	
diff --git a/make-all.sh b/make-all.sh
index 3f9d6161a..b9b55ebf6 100755
--- a/make-all.sh
+++ b/make-all.sh
@@ -2,33 +2,27 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-$DIR/premake.sh gmake
-if [ "$?" -ne "0" ]; then
-	echo "premake.sh failed!"
-	exit 1
-fi
-
 pushd Build
 
-make $@ config=debug_x64
+make $@ config=debug
 if [ "$?" -ne "0" ]; then
 	echo "Debug failed!"
 	exit 1
 fi
 
-make $@ config=intermediate_x64
+make $@ config=intermediate
 if [ "$?" -ne "0" ]; then
 	echo "Intermediate failed!"
 	exit 1
 fi
 
-make $@ config=profile_x64
+make $@ config=profile
 if [ "$?" -ne "0" ]; then
 	echo "Profile failed!"
 	exit 1
 fi
 
-make $@ config=release_x64
+make $@ config=release
 if [ "$?" -ne "0" ]; then
 	echo "Release failed!"
 	exit 1