Update premake and core

HeliumProject · Nov 13, 2018 · e84c477 · e84c477
1 parent c7bb2f8
commit e84c477
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 25 deletions.
diff --git a/Core b/Core
diff --git a/Dependencies/premake b/Dependencies/premake
diff --git 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
@@ -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
@@ -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
+6 −0		.appveyor.yml
+1 −5		.travis.yml
+32 −0		.vscode/launch.json
+1 −1		Dependencies/premake
+3 −3		Source/Foundation/FilePath.cpp
+1 −0		Source/Platform/AssertWin.cpp
+15 −3		Source/Platform/File.cpp
+7 −3		Source/Platform/File.h
+16 −11		Source/Platform/FilePosix.cpp
+213 −0		Source/Platform/FileTests.cpp
+31 −8		Source/Platform/FileWin.cpp
+0 −130		Source/Platform/Tests.cpp