JCS-Prod/RDI
0
1
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Patch for boost import

Browse Source
This commit is contained in:
JackCarterSmith 2022-09-18 17:50:24 +02:00
parent bb4cafd680
commit 167b8b3f27
Signed by: JackCarterSmith
GPG Key ID: 832E52F4E23F8F24
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -24,6 +24,7 @@ find_package(RSPTexture 2.1 REQUIRED)
include_directories(${RSPTexture_INCLUDE_DIR}) include_directories(${RSPTexture_INCLUDE_DIR})
find_package(Boost 1.80.0 EXACT REQUIRED) find_package(Boost 1.80.0 EXACT REQUIRED)
include_directories(${Boost_INCLUDE_DIR}) include_directories(${Boost_INCLUDE_DIR})
add_definitions(-DBOOST_ALL_NO_LIB)
# Project definition # Project definition
@ -114,9 +115,9 @@ if(RDI_STATIC)
target_include_directories(rdi-libstatic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) target_include_directories(rdi-libstatic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
target_link_libraries(rdi-libstatic PRIVATE target_link_libraries(rdi-libstatic PRIVATE
${RSPModel_LIBRARIES} ${RSPModel_LIBRARIES}
${RSPTerrain_LIBRARIES} ${RSPTerrain_LIBRARIES}
${RSPTexture_LIBRARIES} ${RSPTexture_LIBRARIES}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
) )
@ -154,7 +155,7 @@ if(BUILD_TOOLS)
add_executable(rdi-debug-tools ${RDI_TOOLS_SOURCES}) add_executable(rdi-debug-tools ${RDI_TOOLS_SOURCES})
set_property(TARGET rdi-debug-tools PROPERTY C_STANDARD 90) set_property(TARGET rdi-debug-tools PROPERTY C_STANDARD 90)
set_target_properties(rdi-debug-tools PROPERTIES OUTPUT_NAME "RDI-debug") set_target_properties(rdi-debug-tools PROPERTIES OUTPUT_NAME "RDI-debug")
set(RDI_TARGETS_LIST rdi-debug-tools) list(APPEND RDI_TARGETS_LIST rdi-debug-tools)
if(MSVC) if(MSVC)

2
conanfile.txt
View File

@ -9,6 +9,8 @@ cmake
cmake_find_package cmake_find_package
[options] [options]
boost:zlib=False
boost:bzip2=False
[imports] [imports]
bin, *.dll -> ./bin bin, *.dll -> ./bin

2
src/RDat.h
View File

@ -22,7 +22,7 @@ namespace RDI {
std::string workingDir = "."; std::string workingDir = ".";
unsigned char cDatSection = 0; unsigned char cDatSection = 0;
std::vector<struct dataSection> *pDatSection; std::vector<struct dataSection> *pDatSection = nullptr;
MEMFILE rDatPtr = nullptr; MEMFILE rDatPtr = nullptr;
public: public: