Github Actions - Fix various compilation errors and optimize Linux an…

…d 32-bit Windows workflows
MadDeCoDeR · Feb 11, 2025 · a6062fe · a6062fe
1 parent a88eaac
commit a6062fe
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/.github/workflows/cmake_linux_x64.yml b/.github/workflows/cmake_linux_x64.yml
@@ -56,7 +56,7 @@ jobs:
           env:
             CC: gcc-13
             CXX: g++-13
-          run: cmake --build ${{github.workspace}}/build --parallel=16
+          run: cmake --build ${{github.workspace}}/build --parallel=16 --target DoomBFA
 
         - name: Archive production artifacts
           id: step8
@@ -83,7 +83,7 @@ jobs:
             CC: gcc-13
             CXX: g++-13
           # Build your program with the given configuration
-          run: cmake --build ${{github.workspace}}/build --parallel=16
+          run: cmake --build ${{github.workspace}}/build --parallel=16 --target DoomBFA
 
         - name: Archive debug artifacts
           id: step11

diff --git a/.github/workflows/cmake_windows_x86.yml b/.github/workflows/cmake_windows_x86.yml
@@ -49,7 +49,7 @@ jobs:
 
             - name: Build
               # Build your program with the given configuration
-              run: cmake --build ${{github.workspace}}/build --config ${{inputs.build_type}}
+              run: MSBuild ${{github.workspace}}/build/DoomBFA.vcxproj -property:Configuration=${{inputs.build_type}}
 
             - name: Archive production artifacts
               uses: ./.github/actions/upload_artifact

diff --git a/doomclassic/doom/info.h b/doomclassic/doom/info.h
@@ -1173,14 +1173,8 @@ typedef struct state_s
 	 // actionf_p2			action; // <- this was left
 	//  int					filler;
  // };
-#ifdef _MSC_VER
+
   actionf_t			action;
-#else
-  struct {
-    actionf_p2			action;
-    //  int					filler;
-  };
-#endif
 
   int			nextstate;
   long			misc1, misc2;

diff --git a/neo/d3xp/Classic.cpp b/neo/d3xp/Classic.cpp
@@ -30,7 +30,7 @@
 #ifdef GAME_DLL
 //GK: Declare the fuctions here
 void idTest(const idCmdArgs& args);
-void A_InstaKill(mobj_t* mo, void*);
+void A_InstaKill(mobj_t* mo);
 
 //GK: Declare custom Code Pointers here
 dehcptr customcptr[] = {