fix/improve linux - use wsl - improve externals

IreNox · Oct 20, 2024 · f912d22 · f912d22
1 parent f098b44
commit f912d22
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 168 deletions.
diff --git a/premake5 b/premake5
diff --git a/samples/basics/generate_vs2022_linux.bat b/samples/basics/generate_vs2022_linux.bat
@@ -0,0 +1,3 @@
+@echo off
+..\..\premake5.exe --systemscript=../../tiki_build.lua --to=build/vs2022_linux --os=linux vs2022
+EXIT /B %ERRORLEVEL%
diff --git a/samples/basics/src/function.cpp b/samples/basics/src/function.cpp
@@ -2,7 +2,13 @@
 
 #include <iostream>
 
-void __cdecl printHelloWorld()
+#if _MSC_VER
+#	define CCALL __cdecl
+#else
+#	define CCALL  //__attribute__((cdecl))
+#endif
+
+CCALL void printHelloWorld()
 {
 	std::cout << "Hello World!" << std::endl;
 }
diff --git a/samples/externals/generate_gmake_linux.sh b/samples/externals/generate_gmake_linux.sh
@@ -0,0 +1,7 @@
+#/bin/bash
+
+../../premake5 --systemscript=../../tiki_build.lua --to=build/gmake_linux --os=linux --cc=gcc gmake
+if [ $? -ne 0 ]; then
+  echo "Press any key to continue..."
+  read -n 1
+fi
diff --git a/samples/externals/premake5.lua b/samples/externals/premake5.lua
@@ -9,6 +9,8 @@ project:add_external( "https://github.com/leethomason/tinyxml2.git" )
 project:add_external( "https://github.com/nothings/stb.git" )
 project:add_external( "https://github.com/ocornut/imgui.git" )
 project:add_external( "https://github.com/erincatto/box2d.git" )
+
 project:add_external( "https://www.sqlite.org/" )
+project:add_external( "https://github.com/richgel999/miniz" )
 
 finalize_default_solution( project )
diff --git a/src/base/globals.lua b/src/base/globals.lua
@@ -62,6 +62,7 @@ function tiki.get_platform_for_premake_string( platform )
 		return Platforms.MacOS
 	end
 
+	print( "Unknown platform: ".. platform );
 	return Platforms.Unknown
 end
 

diff --git a/src/base/project.lua b/src/base/project.lua
@@ -266,6 +266,11 @@ function Project:finalize( solution )
 		buildoptions( self.buildoptions )
 	end
 
+	if tiki.host_platform == Platforms.Windows and tiki.target_platform == Platforms.Linux then
+		-- TODO: wait for PR: debugger( "LinuxWSLDebugger" )
+		toolchainversion( "wsl2" )
+	end
+
 	self:finalize_create_directories()
 
 	local config_project = Configuration:new()

diff --git a/src/externals/https/github.com/erincatto/box2d.git/tiki.lua b/src/externals/https/github.com/erincatto/box2d.git/tiki.lua
@@ -5,7 +5,8 @@ local box2d_project = Project:new( "box2d", ProjectTypes.StaticLibrary )
 box2d_project.module.module_type = ModuleTypes.FilesModule
 
 box2d_project:add_files( "include/box2d/*.h" )
-box2d_project:add_files( "src/**/*.cpp" )
+box2d_project:add_files( "src/*.h" )
+box2d_project:add_files( "src/*.c" )
 
 box2d_project:add_include_dir( "include" )
 box2d_project:add_include_dir( "src" )

diff --git a/src/externals/https/github.com/libsdl-org/SDL/tiki.lua b/src/externals/https/github.com/libsdl-org/SDL/tiki.lua
diff --git a/src/externals/https/github.com/richgel999/miniz/tiki.lua b/src/externals/https/github.com/richgel999/miniz/tiki.lua
@@ -3,7 +3,7 @@
 local repo_name = "richgel999/miniz"
 if tiki.external.version == "latest" then
 	local response, result_code = http.get( "https://api.github.com/repos/" .. repo_name .. "/releases/latest" )
-	local response_json =  json.decode( response )
+	local response_json = json.decode( response )
 
 	tiki.external.version = response_json.tag_name
 end