merge stuff frrom premake2 branch,

Updating stuff to work
FOSS-Archives · May 21, 2024 · 1d75b82 · 1d75b82
1 parent 01f4ee8
commit 1d75b82
Show file tree

Hide file tree

Showing 4 changed files with 878 additions and 539 deletions.
diff --git a/.github/workflows/emu-build-all-linux.yml b/.github/workflows/emu-build-all-linux.yml
@@ -33,15 +33,10 @@ jobs:
       fail-fast: false
       matrix:
         ## notice how on linux everything is lowercase, `cd GBE_Build`, then: `make help`
-        prj: [ 'GenerateInterfaces', 'SteamClient', 'SteamEmu', ]
+        prj: [ 'regular', 'experimental', 'steamclient_experimental', 'steamnetworkingsockets', 'tool_lobby_connect', 'GenerateInterfaces', 'steamclient_regular_linux', ]
         arch: [ 'x64', 'x32', ]
-        cfg: [ 'debug', 'release', 'experimentaldebug', 'experimentalrelease', ]
+        cfg: [ 'debug', 'release', ]
 
-        exclude:
-        - prj: 'GenerateInterfaces'
-          cfg: 'experimentaldebug'
-        - prj: 'GenerateInterfaces'
-          cfg: 'experimentalrelease'
 
     steps:
 ### clone branch

diff --git a/.github/workflows/emu-build-all-win.yml b/.github/workflows/emu-build-all-win.yml
@@ -31,20 +31,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        prj: [ 'GameOverlayRenderer', 'GenerateInterfaces', 'SteamClient', 'SteamEmu', ]
+        prj: [ 'regular', 'experimental', 'steamclient_experimental', 'steamnetworkingsockets', 'tool_lobby_connect', 'GenerateInterfaces', 'experimental_client_win', 'GameOverlayRenderer', ]
         arch: [ 'x64', 'Win32', ]
-        cfg: [ 'Debug', 'Release', 'ExperimentalDebug', 'ExperimentalRelease', ]
-
-        exclude:
-        - prj: 'GameOverlayRenderer'
-          cfg: 'Debug'
-        - prj: 'GameOverlayRenderer'
-          cfg: 'Release'
-
-        - prj: 'GenerateInterfaces'
-          cfg: 'ExperimentalDebug'
-        - prj: 'GenerateInterfaces'
-          cfg: 'ExperimentalRelease'
+        cfg: [ 'debug', 'release', ]
 
     steps:
 ### on Windows Git will auto change line ending to CRLF, not preferable

diff --git a/build_win_premake.bat b/build_win_premake.bat
@@ -23,14 +23,10 @@ if "%my_vs_path%"=="" (
 :: Set configuration and platform here :)
 
 :: manual config for all remove later
-call %my_vs_path% GBE_Build\GBE.sln /p:Configuration=Debug /p:Platform=x64 -v:n
-call %my_vs_path% GBE_Build\GBE.sln /p:Configuration=Debug /p:Platform=Win32 -v:n
-call %my_vs_path% GBE_Build\GBE.sln /p:Configuration=Release /p:Platform=x64 -v:n
-call %my_vs_path% GBE_Build\GBE.sln /p:Configuration=Release /p:Platform=Win32 -v:n
-call %my_vs_path% GBE_Build\GBE.sln /p:Configuration=ExperimentalDebug /p:Platform=x64 -v:n
-call %my_vs_path% GBE_Build\GBE.sln /p:Configuration=ExperimentalDebug /p:Platform=Win32 -v:n
-call %my_vs_path% GBE_Build\GBE.sln /p:Configuration=ExperimentalRelease /p:Platform=x64 -v:n
-call %my_vs_path% GBE_Build\GBE.sln /p:Configuration=ExperimentalRelease /p:Platform=Win32 -v:n
+call %my_vs_path% build\project\vs2022\win\GBE.sln /p:Configuration=debug /p:Platform=x64 -v:n
+call %my_vs_path% build\project\vs2022\win\GBE.sln /p:Configuration=debug /p:Platform=Win32 -v:n
+call %my_vs_path% build\project\vs2022\win\GBE.sln /p:Configuration=release /p:Platform=x64 -v:n
+call %my_vs_path% build\project\vs2022\win\GBE.sln /p:Configuration=release /p:Platform=Win32 -v:n
 
 exit /b
 
@@ -43,8 +39,8 @@ endlocal & (
 
 
 :: -v:n make it so we can actually see what commands it runs
-call %my_vs_path% GBE_Build\GBE.sln /p:Configuration=ExperimentalDebug /p:Platform=x64 -v:n
-::call %my_vs_path% GBE_Build\GBE.sln
+call %my_vs_path% build\project\vs2022\win\GBE.sln /p:Configuration=debuug /p:Platform=x64 -v:n
+::call %my_vs_path% build\project\vs2022\win\GBE.sln
 set /a _exit=%errorlevel%
 if %_exit% equ 0 (
     echo Please do change_dos_stub and sign it. (or you can move into premake to do it for you)