Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean/headers #415

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
More file moving
  • Loading branch information
GravisZro committed Jun 1, 2024
commit c6dbb5194c87653b9eb122a6f415e36ca7fcb0f6
3 changes: 3 additions & 0 deletions Descent3/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -327,6 +327,9 @@ target_include_directories(Descent3
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/unzip
>
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/ddio
>

PRIVATE ${PROJECT_BINARY_DIR}/lib)
add_dependencies(Descent3 get_git_hash Direct_TCP_IP_Hog HogFull NetgamesDir)
2 changes: 1 addition & 1 deletion Descent3/Controls.cpp
Original file line number Diff line number Diff line change
@@ -414,7 +414,7 @@
#include "descent.h"
#include "mono.h"
#include "weapon.h"
#include "Controller.h"
#include "controller.h"
#include "Macros.h"
#include "gamesequence.h"
#include "pilot.h"
2 changes: 1 addition & 1 deletion Descent3/CtlCfgElem.h
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@
#define CTLCFGELEM_H

#include "newui.h"
#include "Controller.h"
#include "controller.h"
#include "controls.h"
#include "stringtable.h"

2 changes: 1 addition & 1 deletion Descent3/GameLoop.cpp
Original file line number Diff line number Diff line change
@@ -834,7 +834,7 @@
#include "newui.h"
#include "Inventory.h"
#include "physics.h"
#include "Controller.h"
#include "controller.h"
#include "controls.h"
#include "gamesequence.h"
#include "cockpit.h"
2 changes: 1 addition & 1 deletion Descent3/Mission.cpp
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion Descent3/controls.h
Original file line number Diff line number Diff line change
@@ -169,7 +169,7 @@
#define CONTROLS_H

#include "object.h"
#include "Controller.h"
#include "controller.h"

class gameController;
class pilot;
2 changes: 1 addition & 1 deletion Descent3/dedicated_server.cpp
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@ typedef int socklen_t;
#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"
2 changes: 1 addition & 1 deletion Descent3/descent.cpp
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion Descent3/hudmessage.cpp
Original file line number Diff line number Diff line change
@@ -339,7 +339,7 @@
#include "game2dll.h"
#include "stringtable.h"
#include "dedicated_server.h"
#include "AppConsole.h"
#include "appconsole.h"
#include "demofile.h"
#include "mem.h"
#include "textaux.h"
2 changes: 1 addition & 1 deletion Descent3/init.cpp
Original file line number Diff line number Diff line change
@@ -944,7 +944,7 @@
#include "Mission.h"
#include "findintersection.h"
#include "appdatabase.h"
#include "AppConsole.h"
#include "appconsole.h"
#include "room.h"
#include "game.h"
#include "render.h"
2 changes: 1 addition & 1 deletion Descent3/osiris_predefs.cpp
Original file line number Diff line number Diff line change
@@ -451,7 +451,7 @@
#include "matcen.h"
#include "findintersection.h"
#include "controls.h"
#include "Controller.h"
#include "controller.h"
#include "ship.h"
#include "Mission.h"
#include "osiris_share.h"
2 changes: 1 addition & 1 deletion Descent3/pilot.h
Original file line number Diff line number Diff line change
@@ -186,7 +186,7 @@

/*
#include "controls.h"
#include "Controller.h"
#include "controller.h"
#include "ship.h"

#define PILOT_STRING_SIZE 20
2 changes: 1 addition & 1 deletion Descent3/pilot_class.h
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@

#include "pstypes.h"
#include "controls.h"
#include "Controller.h"
#include "controller.h"
#include "cfile.h"
#include "weapon.h"
#include "config.h"
9 changes: 9 additions & 0 deletions Descent3/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -27,6 +27,15 @@ target_include_directories(porting-tests PUBLIC
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/networking
>
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/ddio
>
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/win32
>
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/linux
>
)

gtest_discover_tests(porting-tests)
3 changes: 3 additions & 0 deletions bitmap/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -27,4 +27,7 @@ target_include_directories(bitmap PUBLIC
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/renderer
>
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/ddio
>
)
4 changes: 3 additions & 1 deletion cfile/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -15,9 +15,11 @@ target_link_libraries(cfile PRIVATE
ddio
)


target_include_directories(cfile PUBLIC
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/bitmap
>
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/ddio
>
)
9 changes: 9 additions & 0 deletions dd_grwin32/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -9,3 +9,12 @@ set(CPPS
ddgrWin32Init.cpp)

add_library(dd_grwin32 STATIC ${HEADERS} ${CPPS})

target_include_directories(dd_grwin32 PUBLIC
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/ddio
>
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/win32
>
)
2 changes: 1 addition & 1 deletion dd_grwin32/ddgrWin32DX.cpp
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@

#include "ddgrWin32.h"
#include "ddgrWin32DX.h"
#include "Application.h"
#include "application.h"
#include "mono.h"
#include "pserror.h"

2 changes: 1 addition & 1 deletion dd_grwin32/ddgrWin32GDI.cpp
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@

#include "ddgrWin32.h"
#include "ddgrWin32GDI.h"
#include "Application.h"
#include "application.h"
#include "mono.h"
#include "pserror.h"
#include "gr.h"
19 changes: 18 additions & 1 deletion dd_video/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
set(HEADERS
ddvid.h
ddvidlib.h
)

set(CPPS
$<$<PLATFORM_ID:Windows>:
video_win32.cpp
@@ -9,9 +14,21 @@ set(CPPS
>
)

add_library(dd_video STATIC ${CPPS})
add_library(dd_video STATIC ${HEADERS} ${CPPS})
target_link_libraries(dd_video PRIVATE
$<$<PLATFORM_ID:Linux,Darwin>:
linux
>
)

target_include_directories(dd_video PUBLIC
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/ddio
>
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/win32
>
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/linux
>
)
File renamed without changes.
2 changes: 1 addition & 1 deletion dd_video/vidWin32Win.cpp
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@

#include "ddvidlib.h"
#include "pserror.h"
#include "Application.h"
#include "application.h"

//////////////////////////////////////////////////////////////////////////////
// Variables
2 changes: 1 addition & 1 deletion dd_video/video_win32.cpp
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@

#include "ddvidlib.h"
#include "pserror.h"
#include "Application.h"
#include "application.h"

#include <string.h>

26 changes: 22 additions & 4 deletions ddio/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,31 @@
set(HEADERS
appconsole.h
appdatabase.h
application.h
chrono_timer.h
controller.h
ddio_common.h
ddio.h
ddio_lnx.h
ddio_win.h
forcefeedback.h
joystick.h
)

set(CPPS
chrono_timer.cpp
ddio.cpp
key.cpp
$<$<PLATFORM_ID:Darwin,Linux>:
lnxcdrom.cpp
lnxfile.cpp
lnxforcefeedback.cpp
lnxio.cpp
sdljoy.cpp
lnxkey.cpp
lnxkey_null.cpp
lnxmouse.cpp
lnxcdrom.cpp
lnxkey_sdl.cpp
lnxmouse.cpp
sdljoy.cpp
>
$<$<PLATFORM_ID:Windows>:
winfile.cpp
@@ -26,8 +40,12 @@ add_library(ddio STATIC ${CPPS})
target_link_libraries(ddio
ddebug
)

target_include_directories(ddio PUBLIC
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/ddio
${PROJECT_SOURCE_DIR}/win32
>
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/linux
>
)
File renamed without changes.
4 changes: 2 additions & 2 deletions lib/appdatabase.h → ddio/appdatabase.h
Original file line number Diff line number Diff line change
@@ -101,9 +101,9 @@ class oeAppDatabase {
*/

#if defined(WIN32)
#include "win\Win32Database.h"
#include "win32database.h"
#elif defined(__LINUX__)
#include "linux/lnxdatabase.h"
#include "lnxdatabase.h"
#endif

#endif
2 changes: 1 addition & 1 deletion lib/application.h → ddio/application.h
Original file line number Diff line number Diff line change
@@ -110,7 +110,7 @@ class oeApplication {
Win32 Samir Win32App.h 06/97
*/
#if defined(WIN32)
#include "win\win32app.h"
#include "win32app.h"
#elif defined(__LINUX__)
#include "lnxapp.h"
#endif
2 changes: 1 addition & 1 deletion lib/Controller.h → ddio/controller.h
Original file line number Diff line number Diff line change
@@ -265,7 +265,7 @@ gameController *CreateController(int num_funcs, ct_function *funcs, char *remote
void DestroyController(gameController *ctl);

#if defined(WIN32)
#include "win\WinController.h"
#include "wincontroller.h"
#elif defined(__LINUX__)
#include "lnxcontroller.h"
#endif
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion ddio/winforcefeedback.cpp
Original file line number Diff line number Diff line change
@@ -101,7 +101,7 @@
#include "mono.h"
#include "ddio.h"
#include "ddio_win.h"
#include "Application.h"
#include "application.h"
#include "forcefeedback.h"
#include "mem.h"
#include "dinput.h"
2 changes: 1 addition & 1 deletion ddio/winio.cpp
Original file line number Diff line number Diff line change
@@ -112,7 +112,7 @@
#include <windows.h>

#include "pserror.h"
#include "Application.h"
#include "application.h"
#include "ddio_win.h"
#include "ddio.h"
#include "dinput.h"
2 changes: 1 addition & 1 deletion ddio/winkey.cpp
Original file line number Diff line number Diff line change
@@ -180,7 +180,7 @@
#include "mono.h"
#include "ddio.h"
#include "ddio_win.h"
#include "Application.h"
#include "application.h"
#include "TaskSystem.h"

#include <stdlib.h>
2 changes: 1 addition & 1 deletion ddio/winmouse.cpp
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
#include "mono.h"
#include "ddio.h"
#include "ddio_win.h"
#include "Application.h"
#include "application.h"
#include "psclass.h"
#include "Macros.h"

8 changes: 7 additions & 1 deletion grtext/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(HEADERS
set(HEADERS
grtext.h
grtextlib.h)

@@ -19,4 +19,10 @@ target_include_directories(grtext PUBLIC
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/renderer
>
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/ddio
>
$<BUILD_INTERFACE:
${PROJECT_SOURCE_DIR}/dd_video
>
)
2 changes: 1 addition & 1 deletion legacy/editor/MainFrm.cpp
Original file line number Diff line number Diff line change
@@ -806,7 +806,7 @@

// D3 EDITOR HEADERS
#include "pserror.h"
#include "Application.h"
#include "application.h"
#include "AppDatabase.h"
#include "program.h"
#include "gr.h"
2 changes: 1 addition & 1 deletion legacy/editor/editor_lighting.cpp
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@
#include "d3edit.h"
#include "ddio.h"
#include "bsp.h"
#include "Application.h"
#include "application.h"
#include "AppDatabase.h"
#include "program.h"
#include "loadlevel.h"
2 changes: 1 addition & 1 deletion legacy/editor/gameeditor.cpp
Original file line number Diff line number Diff line change
@@ -496,7 +496,7 @@
#include "init.h"
#include "game.h"
#include "descent.h"
#include "Application.h"
#include "application.h"
#include "AppDatabase.h"
#include "program.h"
#include "ddio.h"
Loading