mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Add Ja2Export target and get it to build on C++17
nice little tool
This commit is contained in:
committed by
majcosta
parent
3985dca2c1
commit
0ee2cfe010
@@ -22,6 +22,9 @@ add_subdirectory("ext/zlib")
|
||||
add_subdirectory("ext/VFS")
|
||||
target_link_libraries(bfVFS PRIVATE 7z)
|
||||
|
||||
# ja2export utility
|
||||
add_subdirectory("ext/export/src")
|
||||
|
||||
# internal libraries that are Good
|
||||
add_subdirectory(Lua)
|
||||
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
option(BUILD_JA2EXPORT "Build the Ja2Export tool." ON)
|
||||
|
||||
if(BUILD_JA2EXPORT)
|
||||
message(STATUS "Configuring Ja2Export")
|
||||
|
||||
add_executable(Ja2Export
|
||||
init_vfs.cpp
|
||||
main.cpp
|
||||
progress_bar.cpp
|
||||
ja2/himage.cpp
|
||||
ja2/XMLWriter.cpp
|
||||
export/jsd/export_jsd.cpp
|
||||
export/jsd/structure.cpp
|
||||
export/slf/export_slf.cpp
|
||||
export/sti/export_sti.cpp
|
||||
export/sti/Image.cpp
|
||||
export/sti/stci_image_utils.cpp
|
||||
export/sti/STCI_lib.cpp
|
||||
)
|
||||
target_include_directories(Ja2Export PUBLIC
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}"
|
||||
)
|
||||
target_link_libraries(Ja2Export PUBLIC bfVFS libpng)
|
||||
set_target_properties(Ja2Export PROPERTIES
|
||||
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
|
||||
)
|
||||
else()
|
||||
message(STATUS "BUILD_JA2EXPORT set to \"OFF\", not configuring Ja2Export by default")
|
||||
endif()
|
||||
@@ -81,16 +81,16 @@ int wmain(int argc, wchar_t **argv)
|
||||
param_list.push_back(*argv++);
|
||||
};
|
||||
|
||||
std::auto_ptr<HelpCommand> cmd_help(new HelpCommand());
|
||||
auto cmd_help{ std::make_unique<HelpCommand>() };
|
||||
g_command_map[HelpCommand::commandString] = cmd_help.get();
|
||||
|
||||
std::auto_ptr<ja2xp::CExportSTI> cmd_sti(new ja2xp::CExportSTI());
|
||||
auto cmd_sti{ std::make_unique<ja2xp::CExportSTI>() };
|
||||
g_command_map[ja2xp::CExportSTI::commandString] = cmd_sti.get();
|
||||
|
||||
std::auto_ptr<ja2xp::CExportSLF> cmd_slf(new ja2xp::CExportSLF());
|
||||
auto cmd_slf{ std::make_unique<ja2xp::CExportSLF>() };
|
||||
g_command_map[ja2xp::CExportSLF::commandString] = cmd_slf.get();
|
||||
|
||||
std::auto_ptr<ja2xp::CExportJSD> cmd_jsd(new ja2xp::CExportJSD());
|
||||
auto cmd_jsd{ std::make_unique<ja2xp::CExportJSD>() };
|
||||
g_command_map[ja2xp::CExportJSD::commandString] = cmd_jsd.get();
|
||||
|
||||
if(!param_list.empty())
|
||||
|
||||
Reference in New Issue
Block a user