Support building Oni as 32-bit Linux executable

.github/workflows/cmake.yml

@@ -7,7 +7,7 @@ jobs:
   msvc:
     runs-on: 'windows-latest'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - name: 'Configure cmake'
         run: |
           cmake -DCMAKE_SYSTEM_VERSION=10.0.19041.0 -DONI_BINK_VIDEO=ON `
@@ -18,7 +18,7 @@ jobs:
   mingw-linux:
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - name: 'Install MinGW'
         run: |
           sudo apt-get install gcc-mingw-w64-i686 g++-mingw-w64-i686

BungieFrameWork/BFW_Source/BFW_AppUtilities/BFW_AppUtilities.c

@@ -2907,7 +2907,7 @@ AUrFlags_PrintFromValue(
 			}
 			inFlagList++;
 		}
-		fprintf(inFile, "???(%d)", inValue);
+		fprintf(inFile, "???" "(%d)", inValue);
 	}
 }
 

BungieFrameWork/BFW_Source/BFW_Console/BFW_Console.c

@@ -164,8 +164,8 @@ static char**					COgCompletionNames;
 static UUtUns16					COgNumCompletionNames;
 static UUtBool					COgPerformCompletionOnTab;
 
-extern IMtShade COgDefaultTextShade = IMcShade_White;
-extern IMtShade COgDefaultTextShadowShade = IMcShade_Gray25;
+IMtShade COgDefaultTextShade = IMcShade_White;
+IMtShade COgDefaultTextShadowShade = IMcShade_Gray25;
 
 
 // ======================================================================

BungieFrameWork/BFW_Source/BFW_Motoko/Manager/Motoko_Utility.c

@@ -149,7 +149,7 @@ UUtBool M3rIntersect_BBox(
 	*/
 
 
-const extern UUtUns8 M3gBBox_EdgeList[12][2] = 
+const UUtUns8 M3gBBox_EdgeList[12][2] =
 {
 	0,1,	// 0
 	1,3,	// 1
@@ -165,7 +165,7 @@ const extern UUtUns8 M3gBBox_EdgeList[12][2] =
 	5,1		// 11
 };
 
-const extern M3tQuad M3gBBox_QuadList[6] =	// Do NOT make this UUtUns8
+const M3tQuad M3gBBox_QuadList[6] =	// Do NOT make this UUtUns8
 {		// Look-up table for which indices to use to form each box side
 	{ 0,1,3,2 }, // 0
 	{ 4,6,7,5 }, // 1

BungieFrameWork/BFW_Source/BFW_SoundSystem2/Platform_OpenAL/BFW_SS2_Platform_OpenAL.c

@@ -198,7 +198,8 @@ SS2r_DecompressMSADPCM(
 		UUrPrintWarning("Failed to allocate ADPCM_MS codec context");
 		return UUcFalse;
 	}
-	c->channels = channels;
+	c->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC;
+	c->ch_layout.nb_channels = channels;
 	c->sample_rate = SScSamplesPerSecond;
 	c->sample_fmt = SScBitsPerSample == 8 ? AV_SAMPLE_FMT_U8 : AV_SAMPLE_FMT_S16;
 	int ret = avcodec_open2(c, codec, NULL);
@@ -270,7 +271,7 @@ SS2r_DecompressMSADPCM(
 		}
 		int data_size = av_samples_get_buffer_size(
 			NULL,
-			decoded_frame->channels,
+			decoded_frame->ch_layout.nb_channels,
 			decoded_frame->nb_samples,
 			decoded_frame->format,
 			1

BungieFrameWork/BFW_Source/BFW_Totoro/BFW_Totoro.c

@@ -1759,24 +1759,24 @@ static void TRrQuatArray_SetAnimationInternal(
 						frame_vector[0]=into_gap;
 						frame_vector[1]=frame_gap;
 
-        				asm __volatile__("
-            				lqc2 vf01, 0(%0)
-            				lqc2 vf02, 0(%1)
-            				lqc2 vf29, 0(%3)
-            				vcallms quat_lerp
-							mtsab	$0,8
-            				qmfc2.i $6, vf13
-							qfsrv	$5, $5, $6
-							nop
-							nop
-							sdl $6, 0(%2)
-							sdr $6, 0(%2)
-							sdl $5, 8(%2)
-							sdr $5, 8(%2)
-							nop
-							nop
-							
-            				" :: "r" (interp), "r" (interp+1), "r" (quaternions+i), "r" (frame_vector): "$5","$6");
+        				asm __volatile__(
+            				"lqc2 vf01, 0(%0)\n\t"
+            				"lqc2 vf02, 0(%1)\n\t"
+            				"lqc2 vf29, 0(%3)\n\t"
+            				"vcallms quat_lerp\n\t"
+							"mtsab	$0,8\n\t"
+            				"qmfc2.i $6, vf13\n\t"
+							"qfsrv	$5, $5, $6\n\t"
+							"nop\n\t"
+							"nop\n\t"
+							"sdl $6, 0(%2)\n\t"
+							"sdr $6, 0(%2)\n\t"
+							"sdl $5, 8(%2)\n\t"
+							"sdr $5, 8(%2)\n\t"
+							"nop\n\t"
+							"nop\n\t"
+
+            				:: "r" (interp), "r" (interp+1), "r" (quaternions+i), "r" (frame_vector): "$5","$6");
 
 
 #else

BungieFrameWork/BFW_Source/BFW_Utility/BFW_Timer.c

@@ -295,7 +295,7 @@ void UUrStallTimer_End(UUtStallTimer *inTimer, const char *inName)
 	return;
 }
 
-#endif TOOL_VERSION
+#endif // TOOL_VERSION
 
 #if PERFORMANCE_TIMER
 

BungieFrameWork/BFW_Source/BFW_Utility/BFW_Utility.c

@@ -28,10 +28,10 @@
 
 	UUtBool		UUgFalse = 0;
 	UUtError	UUgError_None = 0;
-	
+
 #endif
 
-	extern double UUgMachineTime_High_Frequency = 0;
+	double UUgMachineTime_High_Frequency = 0;
 
 // initialize random is internal
 void UUiRandom_Initialize(void);

OniProj/OniCMakeProjs/OniProj/CMakeLists.txt

@@ -569,7 +569,7 @@ elseif(WIN32)
 		PRIVATE
 			winmm
 			msacm32
-			Ws2_32
+			ws2_32
 			dinput8
 			dsound
 			dxguid

OniProj/OniCMakeProjs/TEVCProj/CMakeLists.txt

@@ -33,9 +33,9 @@ if (WIN32)
             # shoved here for now
             ../../OniWin32Projs/ImpConsole/templatechecksum.c
     )
-endif ()
 
-target_precompile_headers(TEVCProj PRIVATE ../../../BungieFrameWork/BFW_Headers/BFW_MasterHeader.h)
+    target_precompile_headers(TEVCProj PRIVATE ../../../BungieFrameWork/BFW_Headers/BFW_MasterHeader.h)
+endif ()
 
 if (MSVC)
     target_compile_options(TEVCProj

OniProj/OniGameSource/Oni_GameState.c

@@ -155,7 +155,7 @@ UUtBool ONgFastLookups = UUcTrue;
 
 BFtFileRef ONgGameDataFolder;
 ONtGameState *ONgGameState = NULL;
-extern ONtLevel *ONgLevel = NULL;
+ONtLevel *ONgLevel = NULL;
 UUtBool					ONgTerminateGame;
 UUtBool					ONgRunMainMenu;
 M3tGeomContext			*ONgGeomContext = NULL;

OniProj/OniGameSource/Oni_Weapon.c

@@ -107,7 +107,7 @@ struct WPtWeapon
 	UUtUns32 oct_tree_node_index[WPcWeaponNodeCount]; // S.S. length-prefixed list of oct tree nodes
 };
 
-extern const char *WPgPowerupName[WPcPowerup_NumTypes]
+const char *WPgPowerupName[WPcPowerup_NumTypes]
 	= {"ammo", "cell", "hypo", "shield", "invis", "lsi"};
 
 WPtWeapon WPgWeapons[WPcMaxWeapons];