diff --git a/CMakeLists.txt b/CMakeLists.txt index bb338dc..2f61fb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,7 @@ find_package(RSPTexture 2.1 REQUIRED) include_directories(${RSPTexture_INCLUDE_DIR}) find_package(Boost 1.80.0 EXACT REQUIRED) include_directories(${Boost_INCLUDE_DIR}) +add_definitions(-DBOOST_ALL_NO_LIB) # Project definition @@ -114,9 +115,9 @@ if(RDI_STATIC) target_include_directories(rdi-libstatic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) target_link_libraries(rdi-libstatic PRIVATE - ${RSPModel_LIBRARIES} - ${RSPTerrain_LIBRARIES} - ${RSPTexture_LIBRARIES} + ${RSPModel_LIBRARIES} + ${RSPTerrain_LIBRARIES} + ${RSPTexture_LIBRARIES} ${Boost_LIBRARIES} ) @@ -154,7 +155,7 @@ if(BUILD_TOOLS) add_executable(rdi-debug-tools ${RDI_TOOLS_SOURCES}) set_property(TARGET rdi-debug-tools PROPERTY C_STANDARD 90) 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) diff --git a/conanfile.txt b/conanfile.txt index cb672c7..5fe2a90 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -9,6 +9,8 @@ cmake cmake_find_package [options] +boost:zlib=False +boost:bzip2=False [imports] bin, *.dll -> ./bin \ No newline at end of file diff --git a/src/RDat.h b/src/RDat.h index f7cc67a..68dadcc 100644 --- a/src/RDat.h +++ b/src/RDat.h @@ -22,7 +22,7 @@ namespace RDI { std::string workingDir = "."; unsigned char cDatSection = 0; - std::vector *pDatSection; + std::vector *pDatSection = nullptr; MEMFILE rDatPtr = nullptr; public: