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

Remove mxgeometry lib (geom is actually lego/sources/geom, which we don't have in our decomp yet)

Browse Source
This commit is contained in:
Christian Semmler 2024-01-24 20:23:09 -05:00
parent ef300fb439
commit aed2219738
4 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -47,14 +47,6 @@ set_property(TARGET SmartHeap::SmartHeap PROPERTY IMPORTED_LOCATION "${CMAKE_SOU
set_property(TARGET SmartHeap::SmartHeap PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/3rdparty/smartheap")
set_property(TARGET SmartHeap::SmartHeap PROPERTY INTERFACE_COMPILE_OPTIONS "/FI${CMAKE_SOURCE_DIR}/3rdparty/smartheap/SMRTHEAP.HPP")
add_library(mxgeometry STATIC
LEGO1/mxgeometry/mxgeometry3d.cpp
LEGO1/mxgeometry/mxmatrix.cpp
)
register_lego1_target(mxgeometry)
set_property(TARGET mxgeometry PROPERTY ARCHIVE_OUTPUT_NAME "geom$<$<CONFIG:Debug>:d>")
target_include_directories(mxgeometry PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
add_library(tglrl STATIC
LEGO1/tgl/d3drm/camera.cpp
LEGO1/tgl/d3drm/device.cpp
@ -361,7 +353,7 @@ target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources"
target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include")
# Link libraries
target_link_libraries(lego1 PRIVATE tglrl realtime viewmanager mxgeometry mxdirectx roi FLIC::FLIC Vec::Vec dinput dxguid Smacker::Smacker misc 3dmanager omni)
target_link_libraries(lego1 PRIVATE tglrl realtime viewmanager mxdirectx roi FLIC::FLIC Vec::Vec dinput dxguid Smacker::Smacker misc 3dmanager omni)
if (ISLE_USE_SMARTHEAP)
foreach(tgt IN LISTS lego1_targets)

3
LEGO1/lego/legoomni/src/build/helicopter.cpp
View File

@ -13,6 +13,9 @@
#include "mxtransitionmanager.h"
DECOMP_SIZE_ASSERT(Helicopter, 0x230)
DECOMP_SIZE_ASSERT(Mx3DPointFloat, 0x14)
DECOMP_SIZE_ASSERT(Mx4DPointFloat, 0x18)
DECOMP_SIZE_ASSERT(MxMatrix, 0x48)
// FUNCTION: LEGO1 0x10001e60
Helicopter::Helicopter()

6
LEGO1/mxgeometry/mxgeometry3d.cpp
View File

@ -1,6 +0,0 @@
#include "mxgeometry3d.h"
#include "decomp.h"
DECOMP_SIZE_ASSERT(Mx3DPointFloat, 0x14);
DECOMP_SIZE_ASSERT(Mx4DPointFloat, 0x18);

5
LEGO1/mxgeometry/mxmatrix.cpp
View File

@ -1,5 +0,0 @@
#include "mxmatrix.h"
#include "decomp.h"
DECOMP_SIZE_ASSERT(MxMatrix, 0x48);