diff --git a/engine/server/library/serverGame/src/CMakeLists.txt b/engine/server/library/serverGame/src/CMakeLists.txt index 5ecd7720..177ac731 100644 --- a/engine/server/library/serverGame/src/CMakeLists.txt +++ b/engine/server/library/serverGame/src/CMakeLists.txt @@ -757,16 +757,19 @@ include_directories( ${PCRE_INCLUDE_DIR} ) - file(TO_NATIVE_PATH ${SWG_ENGINE_SOURCE_DIR}/server/library/codegen/make_packages.pl MAKE_PACKAGES_NATIVE_PATH) file(TO_NATIVE_PATH ${SWG_ENGINE_SOURCE_DIR}/server/library/codegen/package_data.txt PACKAGE_DATA_NATIVE_PATH) file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/shared/generated/Packager.cpp SOURCE_OUTPUT_NATIVE_PATH) file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/shared/generated/Packager_cpp.template SOURCE_TEMPLATE_NATIVE_PATH) +if(WIN32) + set(WINDOWS_PLATFORM --windows) +endif() + add_custom_command( OUTPUT ${SOURCE_OUTPUT_NATIVE_PATH} COMMAND ${CMAKE_COMMAND} -E copy ${SOURCE_TEMPLATE_NATIVE_PATH} ${SOURCE_OUTPUT_NATIVE_PATH} - COMMAND ${PERL_EXECUTABLE} "${MAKE_PACKAGES_NATIVE_PATH}" --datafile "${PACKAGE_DATA_NATIVE_PATH}" --source "${SOURCE_OUTPUT_NATIVE_PATH}" --windows + COMMAND ${PERL_EXECUTABLE} "${MAKE_PACKAGES_NATIVE_PATH}" --datafile "${PACKAGE_DATA_NATIVE_PATH}" --source "${SOURCE_OUTPUT_NATIVE_PATH}" ${WINDOWS_PLATFORM} DEPENDS ${SOURCE_TEMPLATE_NATIVE_PATH} ${MAKE_PACKAGES_NATIVE_PATH} ${PACKAGE_DATA_NATIVE_PATH} ) diff --git a/game/server/application/SwgDatabaseServer/src/CMakeLists.txt b/game/server/application/SwgDatabaseServer/src/CMakeLists.txt index e75d3643..3d47bd8e 100644 --- a/game/server/application/SwgDatabaseServer/src/CMakeLists.txt +++ b/game/server/application/SwgDatabaseServer/src/CMakeLists.txt @@ -251,46 +251,49 @@ file(TO_NATIVE_PATH ${OBJECT_QUERIES_H_TEMPLATE} OBJECT_QUERIES_H_TEMPLATE_NATIV set(OBJECT_QUERIES_H_OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/shared/generated/ObjectQueries.h) file(TO_NATIVE_PATH ${OBJECT_QUERIES_H_OUTPUT} OBJECT_QUERIES_H_OUTPUT_NATIVE) +if(WIN32) + set(WINDOWS_PLATFORM --windows) +endif() add_custom_command( OUTPUT ${SCHEMA_H_OUTPUT_NATIVE} COMMAND ${CMAKE_COMMAND} -E copy ${SCHEMA_H_TEMPLATE_NATIVE} ${SCHEMA_H_OUTPUT_NATIVE} - COMMAND ${PERL_EXECUTABLE} "${MAKE_SCHEMA_H}" --ddldirectory "${SWG_GAME_SOURCE_DIR}/server/database/schema" --output "${SCHEMA_H_OUTPUT_NATIVE}" --windows + COMMAND ${PERL_EXECUTABLE} "${MAKE_SCHEMA_H}" --ddldirectory "${SWG_GAME_SOURCE_DIR}/server/database/schema" --output "${SCHEMA_H_OUTPUT_NATIVE}" ${WINDOWS_PLATFORM} DEPENDS ${SCHEMA_H_OUTPUT_NATIVE} ${MAKE_SCHEMA_H} ) add_custom_command( OUTPUT ${ENCODER_CPP_OUTPUT_NATIVE} COMMAND ${CMAKE_COMMAND} -E copy ${ENCODER_CPP_TEMPLATE_NATIVE} ${ENCODER_CPP_OUTPUT_NATIVE} - COMMAND ${PERL_EXECUTABLE} "${MAKE_PACKAGES_NATIVE}" --datafile "${PACKAGE_DATA_NATIVE}" --encoder "${ENCODER_CPP_OUTPUT_NATIVE}" --windows + COMMAND ${PERL_EXECUTABLE} "${MAKE_PACKAGES_NATIVE}" --datafile "${PACKAGE_DATA_NATIVE}" --encoder "${ENCODER_CPP_OUTPUT_NATIVE}" ${WINDOWS_PLATFORM} DEPENDS ${ENCODER_CPP_TEMPLATE_NATIVE} ${MAKE_PACKAGES_NATIVE} ${PACKAGE_DATA_NATIVE} ) add_custom_command( OUTPUT ${DECODER_CPP_OUTPUT_NATIVE} COMMAND ${CMAKE_COMMAND} -E copy ${DECODER_CPP_TEMPLATE_NATIVE} ${DECODER_CPP_OUTPUT_NATIVE} - COMMAND ${PERL_EXECUTABLE} "${MAKE_PACKAGES_NATIVE}" --datafile "${PACKAGE_DATA_NATIVE}" --decoder "${DECODER_CPP_OUTPUT_NATIVE}" --windows + COMMAND ${PERL_EXECUTABLE} "${MAKE_PACKAGES_NATIVE}" --datafile "${PACKAGE_DATA_NATIVE}" --decoder "${DECODER_CPP_OUTPUT_NATIVE}" ${WINDOWS_PLATFORM} DEPENDS ${DECODER_CPP_TEMPLATE_NATIVE} ${MAKE_PACKAGES_NATIVE} ${PACKAGE_DATA_NATIVE} ) add_custom_command( OUTPUT ${LOAD_OBJECT_CPP_OUTPUT_NATIVE} COMMAND ${CMAKE_COMMAND} -E copy ${LOAD_OBJECT_CPP_TEMPLATE_NATIVE} ${LOAD_OBJECT_CPP_OUTPUT_NATIVE} - COMMAND ${PERL_EXECUTABLE} "${MAKE_PACKAGES_NATIVE}" --datafile "${PACKAGE_DATA_NATIVE}" --loadobject "${LOAD_OBJECT_CPP_OUTPUT_NATIVE}" --windows + COMMAND ${PERL_EXECUTABLE} "${MAKE_PACKAGES_NATIVE}" --datafile "${PACKAGE_DATA_NATIVE}" --loadobject "${LOAD_OBJECT_CPP_OUTPUT_NATIVE}" ${WINDOWS_PLATFORM} DEPENDS ${LOAD_OBJECT_CPP_TEMPLATE_NATIVE} ${MAKE_PACKAGES_NATIVE} ${PACKAGE_DATA_NATIVE} ) add_custom_command( OUTPUT ${OBJECT_QUERIES_CPP_OUTPUT_NATIVE} COMMAND ${CMAKE_COMMAND} -E copy ${OBJECT_QUERIES_CPP_TEMPLATE_NATIVE} ${OBJECT_QUERIES_CPP_OUTPUT_NATIVE} - COMMAND ${PERL_EXECUTABLE} "${MAKE_QUERIES}" --plsql "${SWG_GAME_SOURCE_DIR}/server/database/packages/persister.plsqlh" --source "${OBJECT_QUERIES_CPP_OUTPUT_NATIVE}" --windows + COMMAND ${PERL_EXECUTABLE} "${MAKE_QUERIES}" --plsql "${SWG_GAME_SOURCE_DIR}/server/database/packages/persister.plsqlh" --source "${OBJECT_QUERIES_CPP_OUTPUT_NATIVE}" ${WINDOWS_PLATFORM} DEPENDS ${OBJECT_QUERIES_CPP_TEMPLATE_NATIVE} ${MAKE_QUERIES} ) add_custom_command( OUTPUT ${OBJECT_QUERIES_H_OUTPUT_NATIVE} COMMAND ${CMAKE_COMMAND} -E copy ${OBJECT_QUERIES_H_TEMPLATE_NATIVE} ${OBJECT_QUERIES_H_OUTPUT_NATIVE} - COMMAND ${PERL_EXECUTABLE} "${MAKE_QUERIES}" --plsql "${SWG_GAME_SOURCE_DIR}/server/database/packages/persister.plsqlh" --header "${OBJECT_QUERIES_H_OUTPUT_NATIVE}" --windows + COMMAND ${PERL_EXECUTABLE} "${MAKE_QUERIES}" --plsql "${SWG_GAME_SOURCE_DIR}/server/database/packages/persister.plsqlh" --header "${OBJECT_QUERIES_H_OUTPUT_NATIVE}" ${WINDOWS_PLATFORM} DEPENDS ${OBJECT_QUERIES_H_TEMPLATE_NATIVE} ${MAKE_QUERIES} )