isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-28 18:51:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Refactor some includes

Browse Source
This commit is contained in:
Christian Semmler 2024-02-23 09:37:29 -05:00
parent bb7b077573
commit a03cd26da5
11 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -144,7 +144,7 @@ add_library(roi STATIC
)
register_lego1_target(roi)
set_property(TARGET roi PROPERTY ARCHIVE_OUTPUT_NAME "roi$<$<CONFIG:Debug>:d>")
target_include_directories(roi PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
target_include_directories(roi PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources" "${CMAKE_SOURCE_DIR}/util")
target_link_libraries(roi PRIVATE)
add_library(anim STATIC
@ -152,7 +152,7 @@ add_library(anim STATIC
)
register_lego1_target(anim)
set_property(TARGET anim PROPERTY ARCHIVE_OUTPUT_NAME "anim$<$<CONFIG:Debug>:d>")
target_include_directories(anim PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
target_include_directories(anim PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources" "${CMAKE_SOURCE_DIR}/util")
target_link_libraries(anim PRIVATE)
add_library(misc STATIC
@ -164,7 +164,7 @@ add_library(misc STATIC
)
register_lego1_target(misc)
set_property(TARGET misc PROPERTY ARCHIVE_OUTPUT_NAME "misc$<$<CONFIG:Debug>:d>")
target_include_directories(misc PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/LEGO1/realtime" "${CMAKE_SOURCE_DIR}/util")
target_include_directories(misc PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
target_link_libraries(misc PRIVATE)
add_library(3dmanager STATIC
@ -408,7 +408,6 @@ target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1")
target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/omni/include")
target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources")
target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include")
target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/realtime")
# Link libraries
target_link_libraries(lego1 PRIVATE tglrl viewmanager realtime mxdirectx roi anim FLIC::FLIC Vec::Vec dinput dxguid misc 3dmanager omni)

2
LEGO1/lego/legoomni/include/legoanimpresenter.h
View File

@ -1,7 +1,7 @@
#ifndef LEGOANIMPRESENTER_H
#define LEGOANIMPRESENTER_H
#include "lego/sources/anim/legoanim.h"
#include "anim/legoanim.h"
#include "mxgeometry/mxgeometry3d.h"
#include "mxvideopresenter.h"

2
LEGO1/lego/legoomni/include/legogamestate.h
View File

@ -2,9 +2,9 @@
#define LEGOGAMESTATE_H
#include "decomp.h"
#include "lego/sources/misc/legostorage.h"
#include "legobackgroundcolor.h"
#include "legofullscreenmovie.h"
#include "misc/legostorage.h"
#include "mxtypes.h"
#include "mxvariabletable.h"

2
LEGO1/lego/legoomni/include/legostate.h
View File

@ -2,7 +2,7 @@
#define LEGOSTATE_H
#include "decomp.h"
#include "lego/sources/misc/legostorage.h"
#include "misc/legostorage.h"
#include "mxcore.h"
#include "mxstring.h"

2
LEGO1/lego/legoomni/include/legounksavedatawriter.h
View File

@ -2,8 +2,8 @@
#define LEGOUNKSAVEDATAWRITER_H
#include "decomp.h"
#include "lego/sources/misc/legostorage.h"
#include "legovariables.h"
#include "misc/legostorage.h"
#include "mxstl/stlcompat.h"
#include "mxtypes.h"

4
LEGO1/lego/legoomni/src/common/legotextureinfo.cpp
View File

@ -1,9 +1,9 @@
#include "legotextureinfo.h"
#include "lego/sources/misc/legoimage.h"
#include "lego/sources/misc/legotexture.h"
#include "legoomni.h"
#include "legovideomanager.h"
#include "misc/legoimage.h"
#include "misc/legotexture.h"
#include "tgl/d3drm/impl.h"
DECOMP_SIZE_ASSERT(LegoTextureInfo, 0x10);

2
LEGO1/lego/legoomni/src/infocenter/score.cpp
View File

@ -2,11 +2,11 @@
#include "ambulancemissionstate.h"
#include "jukebox.h"
#include "lego/sources/misc/legocontainer.h"
#include "legocontrolmanager.h"
#include "legogamestate.h"
#include "legoinputmanager.h"
#include "legoomni.h"
#include "misc/legocontainer.h"
#include "mxnotificationmanager.h"
#include "mxnotificationparam.h"
#include "mxtransitionmanager.h"

2
LEGO1/lego/legoomni/src/main/legoomni.cpp
View File

@ -1,6 +1,5 @@
#include "legoomni.h"
#include "lego/sources/misc/legocontainer.h"
#include "legoanimationmanager.h"
#include "legobuildingmanager.h"
#include "legogamestate.h"
@ -14,6 +13,7 @@
#include "legovideomanager.h"
#include "legoworld.h"
#include "legoworldlist.h"
#include "misc/legocontainer.h"
#include "mxactionnotificationparam.h"
#include "mxautolocker.h"
#include "mxbackgroundaudiomanager.h"

2
LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
View File

@ -1,8 +1,8 @@
#include "legopalettepresenter.h"
#include "lego/sources/misc/legostorage.h"
#include "legoomni.h"
#include "legovideomanager.h"
#include "misc/legostorage.h"
#include "mxstreamchunk.h"
DECOMP_SIZE_ASSERT(LegoPalettePresenter, 0x68)

4
LEGO1/lego/sources/anim/legoanim.h
View File

@ -2,8 +2,8 @@
#define __LEGOANIM_H
#include "decomp.h"
#include "lego/sources/misc/legostorage.h"
#include "lego/sources/misc/legotree.h"
#include "misc/legostorage.h"
#include "misc/legotree.h"
// SIZE 0x08
class LegoAnimKey {

2
LEGO1/lego/sources/roi/legoroi.h
View File

@ -1,7 +1,7 @@
#ifndef LEGOROI_H
#define LEGOROI_H
#include "lego/sources/misc/legotypes.h"
#include "misc/legotypes.h"
#include "viewmanager/viewroi.h"
typedef unsigned char (*ROIHandler)(char*, char*, unsigned int);