diff --git a/CMakeLists.txt b/CMakeLists.txt index 334b653f..275313ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,6 +144,7 @@ include_directories( "ddebug" # -*- "fix" # -*- "lib" # TODO: Remove after untying all modules + "linux" # -*- "Descent3" ${PLATFORM_INCLUDES} ) diff --git a/Descent3/BriefingParse.h b/Descent3/BriefingParse.h index d4f46b32..4d448f00 100644 --- a/Descent3/BriefingParse.h +++ b/Descent3/BriefingParse.h @@ -51,7 +51,7 @@ #define __BRIEFPARSE_H_ #if defined(__LINUX__) -#include "linux/linux_fix.h" //for stricmp +#include "linux_fix.h" //for stricmp #endif #include "TelComEfxStructs.h" diff --git a/Descent3/credits.cpp b/Descent3/credits.cpp index 4b992d2e..28faeb38 100644 --- a/Descent3/credits.cpp +++ b/Descent3/credits.cpp @@ -95,7 +95,7 @@ #include "psrand.h" #if defined(__LINUX__) -#include "linux/linux_fix.h" +#include "linux_fix.h" #endif /* diff --git a/Descent3/dedicated_server.cpp b/Descent3/dedicated_server.cpp index 89d6576f..aa01f6d0 100644 --- a/Descent3/dedicated_server.cpp +++ b/Descent3/dedicated_server.cpp @@ -791,12 +791,9 @@ void PrintDedicatedMessage(const char *fmt, ...) { #include #include #include -#include -#include -#include #include -#include "linux/linux_fix.h" +#include "linux_fix.h" #include "errno.h" #define BOOL bool #ifndef SOCKET diff --git a/Descent3/lnxmain.cpp b/Descent3/lnxmain.cpp index a2262f33..6b7fdb5e 100644 --- a/Descent3/lnxmain.cpp +++ b/Descent3/lnxmain.cpp @@ -23,36 +23,25 @@ * $NoKeywords: $ */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include + +#include -#include "SDL.h" #include "program.h" -#include "mono.h" #include "descent.h" #include "application.h" #include "appdatabase.h" -#include "pserror.h" #include "args.h" #include "init.h" -#include "renderer.h" #include "ddio.h" -#include "ddvid.h" #include "osiris_dll.h" #include "loki_utils.h" #include "log.h" -#if defined(MACOSX) -#include -#endif - extern bool ddio_mouseGrabbed; int no_debug_dialog = 0; const char *DMFCGetString(int d); @@ -184,7 +173,6 @@ void fatal_signal_handler(int signum) { break; } - sync(); // just in case. _exit(-10); } diff --git a/Descent3/multi.h b/Descent3/multi.h index 9666fd81..6ba88c8a 100644 --- a/Descent3/multi.h +++ b/Descent3/multi.h @@ -499,7 +499,7 @@ #include "player_external.h" #if defined(__LINUX__) -#include "linux/linux_fix.h" +#include "linux_fix.h" #endif #include "multi_external.h" //defines and structs are in here diff --git a/Descent3/newui.h b/Descent3/newui.h index e2de29fb..250d6768 100644 --- a/Descent3/newui.h +++ b/Descent3/newui.h @@ -188,7 +188,7 @@ #define NEWUI_H #if defined(__LINUX__) -#include "linux/linux_fix.h" //fix some of the stricmp's +#include "linux_fix.h" //fix some of the stricmp's #endif #include "newui_core.h" diff --git a/cfile/cfile.cpp b/cfile/cfile.cpp index 200b300d..f0f8468c 100644 --- a/cfile/cfile.cpp +++ b/cfile/cfile.cpp @@ -29,7 +29,7 @@ #include #else // Linux Build Includes -#include "linux/linux_fix.h" +#include "linux_fix.h" #endif #include "byteswap.h" diff --git a/dd_sndlib/ddsoundload.cpp b/dd_sndlib/ddsoundload.cpp index 3cec0ae9..996f9287 100644 --- a/dd_sndlib/ddsoundload.cpp +++ b/dd_sndlib/ddsoundload.cpp @@ -92,7 +92,7 @@ #include "windows.h" #include "winbase.h" #elif defined(__LINUX__) -#include "linux/linux_fix.h" +#include "linux_fix.h" #endif #include "ssl_lib.h" diff --git a/ddvid_lnx/CMakeLists.txt b/ddvid_lnx/CMakeLists.txt index d28fea76..8e657fea 100644 --- a/ddvid_lnx/CMakeLists.txt +++ b/ddvid_lnx/CMakeLists.txt @@ -3,3 +3,6 @@ set(CPPS video_lnx.cpp) add_library(ddvid_lnx STATIC ${HEADERS} ${CPPS}) +target_link_libraries(ddvid_lnx PRIVATE + linux +) diff --git a/ddvid_lnx/video_lnx.cpp b/ddvid_lnx/video_lnx.cpp index 4720ff9a..8fd8b201 100644 --- a/ddvid_lnx/video_lnx.cpp +++ b/ddvid_lnx/video_lnx.cpp @@ -22,15 +22,13 @@ * $NoKeywords: $ */ -#include "pserror.h" +#include +#include + #include "ddvid.h" #include "application.h" -#include "linux/lnxapp.h" -#include -#include -#include -#undef EGA -// #include +#include "lnxapp.h" + typedef struct { int width, height, bytesperpixel, linewidth; } tinfo; diff --git a/lib/Controller.h b/lib/Controller.h index 0ffabffb..ed6a0a9a 100644 --- a/lib/Controller.h +++ b/lib/Controller.h @@ -258,7 +258,7 @@ void DestroyController(gameController *ctl); #if defined(WIN32) #include "win\WinController.h" #elif defined(__LINUX__) -#include "linux/lnxcontroller.h" +#include "lnxcontroller.h" #endif #endif diff --git a/lib/application.h b/lib/application.h index 51f48b9c..8ee6e1e4 100644 --- a/lib/application.h +++ b/lib/application.h @@ -112,6 +112,6 @@ public: #if defined(WIN32) #include "win\Win32App.h" #elif defined(__LINUX__) -#include "linux/lnxapp.h" +#include "lnxapp.h" #endif #endif diff --git a/lib/bitmap.h b/lib/bitmap.h index c3083149..bc67c2d2 100644 --- a/lib/bitmap.h +++ b/lib/bitmap.h @@ -23,7 +23,7 @@ #include "cfile.h" #ifdef __LINUX__ -#include "linux/linux_fix.h" //needed for stricmp's throughout bitmap lib +#include "linux_fix.h" //needed for stricmp's throughout bitmap lib #endif #define MAX_BITMAPS 5000 diff --git a/lib/lnxscreenmode.h b/lib/lnxscreenmode.h index 9d5729bb..7f10e4dd 100644 --- a/lib/lnxscreenmode.h +++ b/lib/lnxscreenmode.h @@ -52,7 +52,7 @@ #ifndef __LNXVIDEOMODE_H__ #define __LNXVIDEOMODE_H__ -#include "linux/linux_fix.h" +#include "linux_fix.h" #include #define MODE_OK 0 diff --git a/lib/manage.h b/lib/manage.h index 1eb63ecf..05284020 100644 --- a/lib/manage.h +++ b/lib/manage.h @@ -26,7 +26,7 @@ #include "manage_external.h" #if defined(__LINUX__) -#include "linux/linux_fix.h" //for strnicmp,etc. +#include "linux_fix.h" //for strnicmp,etc. #endif #define LOCAL_TABLE "Table.loc" diff --git a/lib/networking.h b/lib/networking.h index 4e73248f..f1eeaeb8 100644 --- a/lib/networking.h +++ b/lib/networking.h @@ -211,7 +211,7 @@ static inline void INADDR_GET_SUN_SUNB(struct in_addr *st, unsigned char *s_b1, #include "SDL.h" #include "SDL_thread.h" -#include "linux/linux_fix.h" +#include "linux_fix.h" #define SOCKET int #define BOOL bool diff --git a/lib/ui.h b/lib/ui.h index f22cc598..a48e6f0b 100644 --- a/lib/ui.h +++ b/lib/ui.h @@ -268,7 +268,7 @@ #define UI_H #if defined(__LINUX__) -#include "linux/linux_fix.h" //for stricmp's through code +#include "linux_fix.h" //for stricmp's through code #endif #include "uires.h" diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index da878ab4..1f959c16 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -12,3 +12,8 @@ add_library(linux STATIC ${CPPS}) target_link_libraries(linux PRIVATE cfile ) +target_include_directories(linux PUBLIC + $ +) diff --git a/lib/linux/linux_fix.h b/linux/linux_fix.h similarity index 100% rename from lib/linux/linux_fix.h rename to linux/linux_fix.h diff --git a/linux/lnxapp.cpp b/linux/lnxapp.cpp index ffe27e74..b2ee52db 100644 --- a/linux/lnxapp.cpp +++ b/linux/lnxapp.cpp @@ -75,7 +75,7 @@ #include #include "application.h" -#include "linux/lnxapp.h" +#include "lnxapp.h" #ifdef buttons // termios.h defines buttons, but SDL's headers use that symbol. #undef buttons diff --git a/lib/linux/lnxapp.h b/linux/lnxapp.h similarity index 100% rename from lib/linux/lnxapp.h rename to linux/lnxapp.h diff --git a/linux/lnxcontroller.cpp b/linux/lnxcontroller.cpp index fb80df90..71c731cd 100644 --- a/linux/lnxcontroller.cpp +++ b/linux/lnxcontroller.cpp @@ -47,6 +47,7 @@ #include "pserror.h" #include "joystick.h" #include "inffile.h" +#include "lnxcontroller.h" // Sorry! This is needed for the semi-hacky mouselook support #include "descent.h" diff --git a/lib/linux/lnxcontroller.h b/linux/lnxcontroller.h similarity index 100% rename from lib/linux/lnxcontroller.h rename to linux/lnxcontroller.h diff --git a/manage/manage.cpp b/manage/manage.cpp index 3927833a..0a7ee429 100644 --- a/manage/manage.cpp +++ b/manage/manage.cpp @@ -441,7 +441,7 @@ #include #include #if defined(__LINUX__) -#include "linux/linux_fix.h" +#include "linux_fix.h" #endif #include "descent.h" #include "manage.h" diff --git a/module/module.cpp b/module/module.cpp index be0284cc..e9c59d67 100644 --- a/module/module.cpp +++ b/module/module.cpp @@ -109,7 +109,7 @@ static bool mod_FindRealFileNameCaseInsenstive(const char *directory, const char #include #include #if defined(__LINUX__) -#include "linux/linux_fix.h" +#include "linux_fix.h" #endif #if defined(WIN32) // INSTEAD OF MAKING MODULE HAVE DEPENDENCIES, PUT THE 2 DDIO FUNCTIONS I NEED HERE // Split a pathname into its component parts diff --git a/netcon/includes/con_dll.h b/netcon/includes/con_dll.h index bf36edc3..2f37f046 100644 --- a/netcon/includes/con_dll.h +++ b/netcon/includes/con_dll.h @@ -269,7 +269,7 @@ #ifdef __LINUX__ #include -#include "linux/linux_fix.h" +#include "linux_fix.h" #endif // Uncomment out this line of code to build the demo version of the multiplayer connection dlls diff --git a/netcon/includes/inetgetfile.h b/netcon/includes/inetgetfile.h index bae0d231..0d285b06 100644 --- a/netcon/includes/inetgetfile.h +++ b/netcon/includes/inetgetfile.h @@ -98,7 +98,7 @@ #include #include -#include "linux/linux_fix.h" +#include "linux_fix.h" // Linux includes/defines #if !MACOSX diff --git a/renderer/HardwareOpenGL.cpp b/renderer/HardwareOpenGL.cpp index 56fc968e..939bb839 100644 --- a/renderer/HardwareOpenGL.cpp +++ b/renderer/HardwareOpenGL.cpp @@ -20,18 +20,14 @@ #if defined(WIN32) #include #elif defined(__LINUX__) -#include "linux/linux_fix.h" #include "lnxscreenmode.h" #else #endif -#include "pstypes.h" #include "pserror.h" #include "mono.h" #include "3d.h" #include "renderer.h" -#include "ddvid.h" -#include "ddio.h" #include "application.h" #include "bitmap.h" #include "lightmap.h"