DescentDevelopers · GravisZro · May 31, 2024 · Jun 1, 2024 · Jun 1, 2024 · Jun 2, 2024
diff --git a/2dlib/CMakeLists.txt b/2dlib/CMakeLists.txt
@@ -12,4 +12,12 @@ set(CPPS
 add_library(2dlib STATIC ${HEADERS} ${CPPS})
 target_link_libraries(2dlib PRIVATE
   cfile
+  bitmap
+  renderer
+)
+
+target_include_directories(2dlib PUBLIC
+  $<BUILD_INTERFACE:
+    ${PROJECT_SOURCE_DIR}/2dlib
+  >
 )
diff --git a/lib/Ddgr.h → 2dlib/ddgr.h b/lib/Ddgr.h → 2dlib/ddgr.h
@@ -78,8 +78,6 @@
 #ifndef _DDGR_H
 #define _DDGR_H
 
-#include "pstypes.h"
-#include "Macros.h"
 #include "grdefs.h"
 
 //	----------------------------------------------------------------------------

diff --git a/lib/gr.h → 2dlib/gr.h b/lib/gr.h → 2dlib/gr.h
@@ -104,7 +104,7 @@
 #ifndef _GR_H
 #define _GR_H
 
-#include "Ddgr.h"
+#include "ddgr.h"
 #include "fix.h"
 #include "pserror.h"
 #include "pstypes.h"

diff --git a/lib/grdefs.h → 2dlib/grdefs.h b/lib/grdefs.h → 2dlib/grdefs.h
diff --git a/2dlib/lib2d.h b/2dlib/lib2d.h
@@ -24,7 +24,7 @@
 #define LIB2D_H
 
 #include "gr.h"
-#include "renderer.h"
+#include "ddgr.h"
 
 //	structures
 

diff --git a/2dlib/memsurf.cpp b/2dlib/memsurf.cpp
@@ -68,12 +68,13 @@
  * $NoKeywords: $
  */
 
-#include "lib2d.h"
+#include "gr.h"
 
-#include "bitmap.h"
+#include <cstring>
+#include <cstdlib>
 
-#include <string.h>
-#include <stdlib.h>
+#include "lib2d.h"
+#include "bitmap.h"
 #include "mem.h"
 
 //	----------------------------------------------------------------------------

diff --git a/2dlib/pen.cpp b/2dlib/pen.cpp
@@ -93,6 +93,7 @@
 
 #include "lib2d.h"
 #include "pserror.h"
+#include "renderer.h"
 
 #define CLIP_LEFT (vp_InitLeft + vp_Left)
 #define CLIP_TOP (vp_InitTop + vp_Top)

diff --git a/AudioEncode/CMakeLists.txt b/AudioEncode/CMakeLists.txt
@@ -1,6 +1,13 @@
-set(HEADERS)
+set(HEADERS
+  audio_encode.h)
 set(CPPS
-  encoder.cpp)
+  audio_encode.cpp)
 
 add_library(AudioEncode STATIC ${HEADERS} ${CPPS})
 target_link_libraries(AudioEncode libacm)
+
+target_include_directories(AudioEncode PUBLIC
+  $<BUILD_INTERFACE:
+    ${PROJECT_SOURCE_DIR}/AudioEncode
+  >
+)
diff --git a/AudioEncode/encoder.cpp → AudioEncode/audio_encode.cpp b/AudioEncode/encoder.cpp → AudioEncode/audio_encode.cpp
@@ -22,7 +22,7 @@
 #include <string.h>
 #include "audio_encode.h"
 #include "mono.h"
-#include "Aencode.h"
+#include "aencode.h"
 
 int32_t aenc_ReadSamp(void *data) {
   FILE *f = (FILE *)data;

diff --git a/lib/audio_encode.h → AudioEncode/audio_encode.h b/lib/audio_encode.h → AudioEncode/audio_encode.h
diff --git a/Descent3/AImain.cpp b/Descent3/AImain.cpp
@@ -1534,7 +1534,7 @@
 #include "attach.h"
 #include "demofile.h"
 #include "matcen.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "difficulty.h"
 #include "osiris_dll.h"
 #include "multi.h"

diff --git a/Descent3/CMakeLists.txt b/Descent3/CMakeLists.txt
@@ -301,7 +301,8 @@ target_link_libraries(Descent3
   fix grtext manage mem misc model module movie stream_audio
   music networking physics renderer rtperformance sndlib ui unzip vecmat md5
   ${PLATFORM_LIBS})
-target_include_directories(Descent3 PRIVATE ${PROJECT_BINARY_DIR}/lib)
+target_include_directories(Descent3 PUBLIC .
+  PRIVATE ${PROJECT_BINARY_DIR}/lib)
 add_dependencies(Descent3 get_git_hash Direct_TCP_IP_Hog HogFull NetgamesDir)
 install(TARGETS Descent3 RUNTIME)
 

diff --git a/Descent3/Controls.cpp b/Descent3/Controls.cpp
@@ -406,21 +406,16 @@
 
 #include "controls.h"
 
-#include "object.h"
 #include "pserror.h"
 #include "game.h"
 #include "ddio.h"
 #include "joystick.h"
-#include "descent.h"
 #include "mono.h"
 #include "weapon.h"
-#include "Controller.h"
-#include "Macros.h"
 #include "gamesequence.h"
 #include "pilot.h"
 #include "hud.h"
 #include "stringtable.h"
-#include "TelCom.h"
 #include "multi.h"
 #include "args.h"
 

diff --git a/Descent3/CtlCfgElem.cpp b/Descent3/CtlCfgElem.cpp
@@ -125,7 +125,6 @@
 #include "localization.h"
 
 #include <string.h>
-#include "joystick.h"
 
 // all controller binding texts
 static char Ctltext_KeyBindings[][16] = {"",

diff --git a/Descent3/CtlCfgElem.h b/Descent3/CtlCfgElem.h
@@ -78,7 +78,7 @@
 #define CTLCFGELEM_H
 
 #include "newui.h"
-#include "Controller.h"
+#include "controller.h"
 #include "controls.h"
 #include "stringtable.h"
 

diff --git a/Descent3/Game2DLL.cpp b/Descent3/Game2DLL.cpp
@@ -52,7 +52,7 @@
 #include "vclip.h"
 #include "osiris_dll.h"
 #include "manage.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "collide.h"
 #include "render.h"
 #include "audiotaunts.h"

diff --git a/Descent3/GameLoop.cpp b/Descent3/GameLoop.cpp
@@ -833,8 +833,8 @@
 #include "SmallViews.h"
 #include "newui.h"
 #include "Inventory.h"
-#include "PHYSICS.H"
-#include "Controller.h"
+#include "physics.h"
+#include "controller.h"
 #include "controls.h"
 #include "gamesequence.h"
 #include "cockpit.h"
@@ -862,7 +862,7 @@
 #include "pilot.h"
 #include "rtperformance.h"
 #include "demofile.h"
-#include "d3music.h"
+#include "musicapi.h"
 // #include "gamespy.h"
 #include "osiris_dll.h"
 #include "aiambient.h"

diff --git a/Descent3/LoadLevel.cpp b/Descent3/LoadLevel.cpp
@@ -1287,7 +1287,7 @@
 #include "ambient.h"
 #include "matcen.h"
 #include "dedicated_server.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "levelgoal.h"
 #include "aiambient.h"
 #include "args.h"

diff --git a/Descent3/Mission.cpp b/Descent3/Mission.cpp
@@ -659,7 +659,7 @@
 #include "mem.h"
 #include "newui.h"
 #include "stringtable.h"
-#include "AppConsole.h"
+#include "appconsole.h"
 #include "pstring.h"
 #include "dedicated_server.h"
 #include "osiris_dll.h"

diff --git a/Descent3/ObjInit.cpp b/Descent3/ObjInit.cpp
@@ -602,7 +602,7 @@
 #include "player.h"
 #include "ship.h"
 #include "pserror.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "weapon.h"
 #include "AIMain.h"
 #include "fireball.h"

diff --git a/Descent3/Player.cpp b/Descent3/Player.cpp
@@ -1096,7 +1096,7 @@
 #include "findintersection.h"
 #include "hud.h"
 #include "splinter.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "viseffect.h"
 #include "damage.h"
 #include "multi.h"

diff --git a/Descent3/TelCom.cpp b/Descent3/TelCom.cpp
@@ -521,7 +521,7 @@
 #include "textaux.h"
 #include "psrand.h"
 #include "controls.h"
-#include "d3music.h"
+#include "musicapi.h"
 
 #define FRAME_RATE 30.0f
 #define TCPE_TIME 0.5f

diff --git a/Descent3/TelComGoals.cpp b/Descent3/TelComGoals.cpp
@@ -95,14 +95,12 @@
 #include "game.h"
 #include "mem.h"
 #include "stringtable.h"
-#include "gametexture.h"
 #include "textaux.h"
 #include "TelComEfxStructs.h"
 #include "TelComEffects.h"
 #include "levelgoal.h"
 #include "textaux.h"
 #include "Mission.h"
-#include "Macros.h"
 #include "hlsoundlib.h"
 
 #include <algorithm>

diff --git a/Descent3/config.cpp b/Descent3/config.cpp
@@ -279,43 +279,30 @@
  * $NoKeywords: $
  */
 
-#include "ConfigItem.h"
-#include "player.h"
 #include "config.h"
-#include "ddio.h"
 #include "newui.h"
 #include "3d.h"
-#include "polymodel.h"
 #include "application.h"
 #include "descent.h"
 #include "mono.h"
-#include "Mission.h"
-#include "ddio.h"
-#include "gamefont.h"
-#include "multi_ui.h"
-#include "cinematics.h"
 #include "hlsoundlib.h"
 #include "terrain.h"
-#include "cfile.h"
-#include "mem.h"
-#include "lighting.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "pilot.h"
 #include "hud.h"
-#include "voice.h"
 #include "bitmap.h"
 #include "game.h"
-#include "render.h"
 #include "stringtable.h"
 #include "SmallViews.h"
-#include "D3ForceFeedback.h"
 #include "descent.h"
 #include "appdatabase.h"
 #include "hlsoundlib.h"
 #include "soundload.h"
 #include "sounds.h"
 #include "ctlconfig.h"
-#include "d3music.h"
+#include "musicapi.h"
+#include "Macros.h"
+#include "forcefeedback.h"
 
 #include <string.h>
 #include <stdlib.h>

diff --git a/Descent3/config.h b/Descent3/config.h
@@ -117,6 +117,8 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
+#include <cstdint>
+
 // Main menu configuration functions
 // ------------------------------------------------------
 // ConfigForceFeedback

diff --git a/Descent3/controls.h b/Descent3/controls.h
@@ -169,7 +169,7 @@
 #define CONTROLS_H
 
 #include "object.h"
-#include "Controller.h"
+#include "controller.h"
 
 class gameController;
 class pilot;

diff --git a/Descent3/credits.cpp b/Descent3/credits.cpp
@@ -88,7 +88,7 @@
 #include "descent.h"
 #include "mem.h"
 #include "3d.h"
-#include "d3music.h"
+#include "musicapi.h"
 #include "hlsoundlib.h"
 #include <string.h>
 #include <math.h>

diff --git a/Descent3/ctlconfig.cpp b/Descent3/ctlconfig.cpp
@@ -277,20 +277,23 @@
  *
  * $NoKeywords: $
  */
+
 #include "ctlconfig.h"
+
+#include <cstring>
+
 #include "CtlCfgElem.h"
 #include "ctlconfigtxt.h"
 #include "game.h"
 #include "weapon.h"
 #include "pilot.h"
-#include "bitmap.h"
-#include "multi.h"
 #include "gameloop.h"
 #include "gamefont.h"
 #include "D3ForceFeedback.h"
 #include "hlsoundlib.h"
-#include "ddio.h"
-#include <string.h>
+#include "Macros.h"
+#include "ddio_common.h"
+
 //////////////////////////////////////////////////////////////////////////////
 #define IDV_KCONFIG 10
 #define IDV_CCONFIG 11

diff --git a/Descent3/damage.cpp b/Descent3/damage.cpp
@@ -577,7 +577,7 @@
 #include "attach.h"
 #include "difficulty.h"
 #include "demofile.h"
-#include "d3music.h"
+#include "musicapi.h"
 #include "osiris_dll.h"
 #include "D3ForceFeedback.h"
 #include "multi_server.h"

diff --git a/Descent3/dedicated_server.cpp b/Descent3/dedicated_server.cpp
@@ -112,24 +112,18 @@
 typedef int socklen_t;
 #endif
 
-#include "pstypes.h"
 #include "pserror.h"
 #include "pstring.h"
-#include "cfile.h"
 #include "inffile.h"
 #include "dedicated_server.h"
 #include "multi.h"
 #include "args.h"
-#include "AppConsole.h"
+#include "appconsole.h"
 #include "ddio.h"
-#include "newui.h"
-#include "ui.h"
 #include "multi_dll_mgr.h"
 #include "multi_ui.h"
 #include "Mission.h"
 #include "multi_server.h"
-#include "Macros.h"
-#include "game.h"
 #include "mem.h"
 #include "stringtable.h"
 #include "multi_save_settings.h"

diff --git a/Descent3/descent.cpp b/Descent3/descent.cpp
@@ -395,7 +395,7 @@
 #include "Mission.h"
 #include "ddio.h"
 #include "controls.h"
-#include "Controller.h"
+#include "controller.h"
 #include "gamesequence.h"
 #include "stringtable.h"
 #include "dedicated_server.h"

diff --git a/Descent3/descent.h b/Descent3/descent.h
@@ -131,6 +131,10 @@
 #include <stdlib.h>
 #include "application.h"
 
+#ifdef __LINUX__
+#include "linux_fix.h"
+#endif
+
 // The name of this product
 #ifdef DEMO
 #define PRODUCT_NAME "Descent 3 Demo"