Switch to cppan.

This commit is contained in:
lzwdgc 2017-02-05 02:31:42 +03:00
parent 5bc953198e
commit 0df077b7ab
5 changed files with 12 additions and 12 deletions

3
.gitignore vendored
View file

@ -1,2 +1,3 @@
win* win*
build build
.cppan

View file

@ -29,14 +29,7 @@ endif(MSVC)
add_definitions(-DPOLYGON4_TOOLS=1) add_definitions(-DPOLYGON4_TOOLS=1)
add_definitions(-DPOLYGON4_STATIC=1) add_definitions(-DPOLYGON4_STATIC=1)
if (NOT DATA_MANAGER_DIR) add_subdirectory(.cppan)
message(FATAL_ERROR "DATA_MANAGER_DIR variable is not set!")
else()
set(SOLUTION_FOLDER Extern)
add_subdirectory(${DATA_MANAGER_DIR} DataManager)
include_directories(${DATA_MANAGER_DIR}/include)
include_directories(${DATA_MANAGER_ADDITIONAL_INCLUDES})
endif()
if (Git_FOUND) if (Git_FOUND)
add_custom_target(version ALL add_custom_target(version ALL

6
cppan.yml Normal file
View file

@ -0,0 +1,6 @@
local_settings:
dependencies:
#- name: pvt.lzwdgc.polygon4.data_manager
- name: data_manager
local: k:/AIM/DataManager

View file

@ -11,11 +11,11 @@ endif()
file(GLOB mmm_extractor_src "mmm_extractor/*") file(GLOB mmm_extractor_src "mmm_extractor/*")
add_executable(mmm_extractor ${mmm_extractor_src}) add_executable(mmm_extractor ${mmm_extractor_src})
target_link_libraries(mmm_extractor DataManager common) target_link_libraries(mmm_extractor common data_manager)
file(GLOB mmo_extractor_src "mmo_extractor/*") file(GLOB mmo_extractor_src "mmo_extractor/*")
add_executable(mmo_extractor ${mmo_extractor_src}) add_executable(mmo_extractor ${mmo_extractor_src})
target_link_libraries(mmo_extractor DataManager common) target_link_libraries(mmo_extractor common data_manager)
file(GLOB mmp_extractor_src "mmp_extractor/*") file(GLOB mmp_extractor_src "mmp_extractor/*")
add_executable(mmp_extractor ${mmp_extractor_src}) add_executable(mmp_extractor ${mmp_extractor_src})

View file

@ -562,7 +562,7 @@ struct mech_segment : public segment
if (unk14 == 0) if (unk14 == 0)
return; return;
READ(b, unk15_1); READ(b, unk15_1); // size?
b.read_vector(equipments); b.read_vector(equipments);