DescentDevelopers · winterheart · Jul 15, 2024 · Jul 12, 2024 · Jul 12, 2024 · Jul 12, 2024
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -103,11 +103,11 @@ message("SDL2 Include Dir is ${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS}")
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   message("Building for Linux")
-  add_compile_definitions(__LINUX__ _USE_OGL_ACTIVE_TEXTURES PRIMARY_HOG=\"d3-linux.hog\")
+  add_compile_definitions(POSIX __LINUX__ _USE_OGL_ACTIVE_TEXTURES PRIMARY_HOG=\"d3-linux.hog\")
   set(PLATFORM_INCLUDES "lib/linux" ${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS})
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   message("Building for MAC OSX")
-  add_compile_definitions(__LINUX__ MACOSX=1 _USE_OGL_ACTIVE_TEXTURES PRIMARY_HOG=\"d3-osx.hog\")
+  add_compile_definitions(POSIX MACOSX=1 _USE_OGL_ACTIVE_TEXTURES PRIMARY_HOG=\"d3-osx.hog\")
   set(PLATFORM_INCLUDES "lib/linux" ${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS})
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   # Windows.h defines to avoid as many issues as possible.

diff --git a/Descent3/BriefingParse.h b/Descent3/BriefingParse.h
@@ -50,7 +50,7 @@
 #ifndef __BRIEFPARSE_H_
 #define __BRIEFPARSE_H_
 
-#if defined(__LINUX__)
+#if defined(POSIX)
 #include "linux_fix.h" //for stricmp
 #endif
 

diff --git a/Descent3/ConfigItem.h b/Descent3/ConfigItem.h
@@ -58,7 +58,7 @@
 
 #include "newui.h"
 
-#if defined(__LINUX__)
+#if defined(POSIX)
 void CIListBoxCallback(int ID, void *);
 void CISliderCallback(int ID, void *);
 #endif

diff --git a/Descent3/Game2DLL.cpp b/Descent3/Game2DLL.cpp
@@ -92,7 +92,7 @@ struct game_api {
   tOSIRISModuleInit *osiris_functions;
 };
 // The exported DLL function call prototypes
-#if defined(__LINUX__)
+#if defined(POSIX)
 typedef void DLLFUNCCALL (*DLLGameCall_fp)(int eventnum, dllinfo *data);
 typedef void DLLFUNCCALL (*DLLGameInit_fp)(int *api_func, uint8_t *all_ok, int num_teams_to_use);
 typedef void DLLFUNCCALL (*DLLGameClose_fp)();

diff --git a/Descent3/LoadLevel.cpp b/Descent3/LoadLevel.cpp
@@ -3240,7 +3240,7 @@ void ReadTerrainSkyAndLightChunk(CFILE *fp, int version) {
 
   Terrain_sky.flags = cf_ReadInt(fp);
 
-#ifdef __LINUX__
+#if defined(POSIX)
   if (FindArg("-noterrainfog") > 0) {
     Terrain_sky.flags &= ~TF_FOG;
   }

diff --git a/Descent3/Mission.cpp b/Descent3/Mission.cpp
@@ -1694,12 +1694,12 @@ void InitLevelScript() {
     ddio_SplitPath(Current_level->filename, NULL, filename, ext);
 #if defined(WIN32)
     strcat(filename, ".dll");
-#else
-#if defined(MACOSX)
+#elif defined(MACOSX)
     strcat(filename, ".dylib");
-#else
+#elif defined(__LINUX__)
     strcat(filename, ".so");
-#endif
+#else
+    #error Unsupported platform!
 #endif
     Osiris_LoadLevelModule(filename);
   }

diff --git a/Descent3/OsirisLoadandBind.cpp b/Descent3/OsirisLoadandBind.cpp
@@ -438,7 +438,7 @@ bool Show_osiris_debug = false;
        // 0, only when the level ends
 
 // The exported DLL function call prototypes
-#if defined(__LINUX__)
+#if defined(POSIX)
 typedef char DLLFUNCCALL (*InitializeDLL_fp)(tOSIRISModuleInit *function_list);
 typedef void DLLFUNCCALL (*ShutdownDLL_fp)(void);
 typedef int DLLFUNCCALL (*GetGOScriptID_fp)(const char *name, uint8_t isdoor);
@@ -3144,14 +3144,14 @@ int Osiris_ExtractScriptsFromHog(int library_handle, bool is_mission_hog) {
   int count = 0;
 
   const char *script_extension;
-#if defined(__LINUX__)
 #if defined(MACOSX)
   script_extension = "*.dylib";
-#else
+#elif defined(__LINUX__)
   script_extension = "*.so";
-#endif
-#else
+#elif defined(WIN32)
   script_extension = "*.dll";
+#else
+  #error Unsupported platform!
 #endif
 
   int index;
@@ -4037,4 +4037,3 @@ void Osiris_CreateModuleInitStruct(tOSIRISModuleInit *mi) {
     mi->fp[i] = NULL;
   }
 }
-
diff --git a/Descent3/config.cpp b/Descent3/config.cpp
@@ -679,7 +679,7 @@ struct video_menu {
     sheet->AddLongRadioButton("1600x1200");
     *resolution = iTemp;
 
-#if !defined(__LINUX__)
+#if !defined(POSIX)
     // renderer bit depth
     switch (Render_preferred_bitdepth) {
     case 16:
@@ -708,7 +708,7 @@ struct video_menu {
 
     sheet->NewGroup(TXT_MONITOR, 0, 180);
     vsync = sheet->AddLongCheckBox(TXT_CFG_VSYNCENABLED, (Render_preferred_state.vsync_on != 0));
-#ifndef __LINUX__
+#if !defined(POSIX)
     sheet->AddText("");
     sheet->AddLongButton(TXT_AUTO_GAMMA, IDV_AUTOGAMMA);
 #endif
@@ -723,7 +723,7 @@ struct video_menu {
       Render_preferred_state.mipping = (*mipmapping) ? 1 : 0;
     if (vsync)
       Render_preferred_state.vsync_on = (*vsync) ? 1 : 0;
-#if !defined(__LINUX__)
+#if !defined(POSIX)
     if (bitdepth)
       Render_preferred_bitdepth = (*bitdepth) == 1 ? 32 : 16;
 #endif
@@ -753,7 +753,7 @@ struct video_menu {
 
   // process
   void process(int res) {
-#ifndef __LINUX__
+#if !defined(POSIX)
     switch (res) {
     case IDV_AUTOGAMMA:
       config_gamma();

diff --git a/Descent3/credits.cpp b/Descent3/credits.cpp
@@ -94,7 +94,7 @@
 #include <math.h>
 #include "psrand.h"
 
-#if defined(__LINUX__)
+#if defined(POSIX)
 #include "linux_fix.h"
 #endif
 

diff --git a/Descent3/dedicated_server.cpp b/Descent3/dedicated_server.cpp
@@ -108,7 +108,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifndef __LINUX__
+#if !defined(POSIX)
 typedef int socklen_t;
 #endif
 
@@ -788,7 +788,7 @@ void PrintDedicatedMessage(const char *fmt, ...) {
   DedicatedSocketputs(buf);
 }
 
-#ifdef __LINUX__
+#if defined(POSIX)
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>

diff --git a/Descent3/gamesave.cpp b/Descent3/gamesave.cpp
@@ -511,7 +511,7 @@ struct tLoadGameDialogData {
   chunked_bitmap chunk;
 };
 
-#if defined(__LINUX__)
+#if defined(POSIX)
 void LoadGameDialogCB(newuiTiledWindow *wnd, void *data)
 #else
 void __cdecl LoadGameDialogCB(newuiTiledWindow *wnd, void *data)

diff --git a/Descent3/matcen.cpp b/Descent3/matcen.cpp
@@ -1904,7 +1904,7 @@ void InitMatcens() {
   atexit(DestroyAllMatcens);
 }
 
-#if defined(__LINUX__)
+#if defined(POSIX)
 void DestroyAllMatcens()
 #else
 void __cdecl DestroyAllMatcens()

diff --git a/Descent3/mission_download.cpp b/Descent3/mission_download.cpp
@@ -826,7 +826,7 @@ int msn_ExtractZipFile(char *zipfilename, char *mn3name) {
   return 1;
 }
 
-#ifdef __LINUX__
+#if defined(POSIX)
 char *_strlwr(char *string) {
   char *ptr = string;
   while (*ptr) {

diff --git a/Descent3/mmItem.h b/Descent3/mmItem.h
@@ -103,7 +103,7 @@ enum tmmItemFX {
 void MenuScene(); // display menu scene
 /////////////////////////////////////////////////////////////////////
 // gcc doesn't like the tQueue template in psclass.h
-#ifdef __LINUX__
+#if defined(POSIX)
 //	tQueue
 //		a circular queue implementation
 class tmmItemQueue {
@@ -144,7 +144,7 @@ class mmItem : public UIGadget {
   int16_t m_alpha; // alpha for text item
   int16_t m_satcount;
   tmmItemFX m_curfx; // current effect
-#ifndef __LINUX__
+#if !defined(POSIX)
   tQueue<tmmItemFX, 8> m_fxqueue; // special effects queue
 #else
   tmmItemQueue m_fxqueue;

diff --git a/Descent3/multi.h b/Descent3/multi.h
@@ -498,7 +498,7 @@
 #include "object_external.h"
 #include "player_external.h"
 
-#if defined(__LINUX__)
+#if defined(POSIX)
 #include "linux_fix.h"
 #endif
 

diff --git a/Descent3/multi_dll_mgr.cpp b/Descent3/multi_dll_mgr.cpp
@@ -328,7 +328,7 @@ extern bool Multi_Gamelist_changed;
 int CheckMissionForScript(char *mission, char *script, int dedicated_server_num_teams);
 void ShowNetgameInfo(network_game *game);
 // The exported DLL function call prototypes
-#if defined(__LINUX__)
+#if defined(POSIX)
 typedef void DLLFUNCCALL (*DLLMultiCall_fp)(int eventnum);
 typedef void DLLFUNCCALL (*DLLMultiScoreCall_fp)(int eventnum, void *data);
 typedef void DLLFUNCCALL (*DLLMultiInit_fp)(int *api_fp);

diff --git a/Descent3/multi_external.h b/Descent3/multi_external.h
@@ -107,7 +107,7 @@
 #ifndef __MULTI_EXTERNAL_H_
 #define __MULTI_EXTERNAL_H_
 
-#if defined(__LINUX__)
+#if defined(POSIX)
 #include <cstring>
 #include <cstdint>
 typedef uintptr_t DWORD;

diff --git a/Descent3/newui.h b/Descent3/newui.h
@@ -187,7 +187,7 @@
 #ifndef NEWUI_H
 #define NEWUI_H
 
-#if defined(__LINUX__)
+#if defined(POSIX)
 #include "linux_fix.h" //fix some of the stricmp's
 #endif
 

diff --git a/Descent3/sdlmain.cpp b/Descent3/sdlmain.cpp
@@ -142,13 +142,13 @@ void just_exit(void) {
 #endif
 
   SDL_Quit();
-#ifdef __LINUX__
+#if defined(POSIX)
   sync(); // just in case.
 #endif
   _exit(0);
 }
 
-#ifdef __LINUX__
+#if defined(POSIX)
 void fatal_signal_handler(int signum) {
   switch (signum) {
   case SIGHUP:
@@ -612,7 +612,7 @@ int main(int argc, char *argv[]) {
     }
 
     bool run_d3 = true;
-#ifdef __LINUX__
+#if defined(POSIX)
     if (flags & APPFLAG_USESERVICE) {
       run_d3 = false;
       pid_t np = fork();

diff --git a/Descent3/terrainrender.cpp b/Descent3/terrainrender.cpp
@@ -2717,7 +2717,7 @@ static g3Point *slist[256];
 // Draws the 2 triangles of the Terrainlist[index] (software)
 int DrawTerrainTrianglesSoftware(int index, int bm_handle, int upper_left, int lower_right) {
   /*
-  #ifndef __LINUX__
+  #if !defined(POSIX)
           int i,tlist[4],close=0,lit=0;
           float closest_z=9999;
           int color;

diff --git a/bitmap/lightmap.cpp b/bitmap/lightmap.cpp
@@ -24,7 +24,7 @@
 #include "bitmap.h"
 #include "mono.h"
 #include "mem.h"
-#ifndef __LINUX__
+#if !defined(POSIX)
 #include "Macros.h"
 #endif
 

diff --git a/cfile/cfile.cpp b/cfile/cfile.cpp
@@ -28,7 +28,7 @@
 #include <memory>
 #include <vector>
 
-#ifndef __LINUX__
+#if !defined(POSIX)
 // Non-Linux Build Includes
 #include <io.h>
 #else
@@ -425,7 +425,7 @@ CFILE *open_file_in_directory(const std::filesystem::path &filename, const char
   fp = fopen(using_filename.u8string().c_str(), tmode);
 
   if (!fp) {
-#ifdef __LINUX__
+#if defined(POSIX)
     // If we tried to open file for reading, assume there maybe case-sensitive files
     if (tmode[0] == 'r') {
       // Try different cases of the filename

diff --git a/ddebug/debug.h b/ddebug/debug.h
@@ -133,7 +133,7 @@
 #define IDNO 7
 #endif
 // #define DEBUG_LEVEL 0		//DAJ
-#if defined(WIN32) || defined(__LINUX__)
+#if defined(WIN32) || defined(POSIX)
 constexpr const int OSMBOX_OK = 1;
 constexpr const int OSMBOX_YESNO = 2;
 constexpr const int OSMBOX_YESNOCANCEL = 3;
@@ -172,7 +172,7 @@ void Debug_ConsolePrintfAt(int n, int row, int col, const char *format, ...);
 #if !defined(RELEASE)
 #include "debugbreak.h"
 #if defined(WIN32)
-#elif defined(__LINUX__)
+#elif defined(POSIX)
 void ddio_InternalKeyClose();
 #else
 #define debug_break()

diff --git a/legacy/briefinglocalizer/briefinglocalizerDlg.cpp b/legacy/briefinglocalizer/briefinglocalizerDlg.cpp
@@ -23,7 +23,7 @@
 #include "briefinglocalizer.h"
 #include "briefinglocalizerDlg.h"
 
-#ifdef __LINUX__
+#if defined(POSIX)
 #include "linux_fix.h"
 #endif