From a0af22cea6308371179fbd860477981d47e43e4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20W=C3=BCbbers?= Date: Sat, 15 Mar 2025 23:33:58 +0100 Subject: [PATCH] fixing cmake bs --- src/CMakeLists.txt | 2 +- src/{setup.bat => configure.bat} | 0 src/dependency/minidef/CMakeLists.txt | 2 ++ tools/minidef.exe | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) rename src/{setup.bat => configure.bat} (100%) create mode 100644 tools/minidef.exe diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 55156d5..94a3f85 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,7 +30,7 @@ target_include_directories(PuzGameEngine PUBLIC dependency/tracy/public/) # Game add_custom_command( - COMMAND "${CMAKE_BINARY_DIR}/minidef.exe" "${CMAKE_SOURCE_DIR}/game/mini.def" "${CMAKE_SOURCE_DIR}/gen/" + COMMAND "${CMAKE_SOURCE_DIR}/../tools/minidef.exe" "${CMAKE_SOURCE_DIR}/game/mini.def" "${CMAKE_SOURCE_DIR}/gen/" DEPENDS "${CMAKE_SOURCE_DIR}/game/mini.def" OUTPUT "${CMAKE_SOURCE_DIR}/gen/Generated.h" "${CMAKE_SOURCE_DIR}/gen/Generated.cpp" COMMENT "Genrating from minidef" diff --git a/src/setup.bat b/src/configure.bat similarity index 100% rename from src/setup.bat rename to src/configure.bat diff --git a/src/dependency/minidef/CMakeLists.txt b/src/dependency/minidef/CMakeLists.txt index 9b2de4e..5a99dce 100644 --- a/src/dependency/minidef/CMakeLists.txt +++ b/src/dependency/minidef/CMakeLists.txt @@ -5,9 +5,11 @@ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h") file(GLOB sources "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") add_executable(minidef ${headers} ${sources}) +set_property(TARGET minidef PROPERTY CXX_STANDARD 17) target_include_directories(minidef PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../bgfx.cmake/bx/include/" "${CMAKE_CURRENT_SOURCE_DIR}/../bgfx.cmake/bx/include/compat/msvc/" ) target_link_libraries(minidef bx) target_compile_definitions(minidef PRIVATE "$<$:BX_CONFIG_DEBUG=1>$<$:BX_CONFIG_DEBUG=0>") +target_compile_definitions(minidef PUBLIC "_AMD64_") diff --git a/tools/minidef.exe b/tools/minidef.exe new file mode 100644 index 0000000..b88b36e --- /dev/null +++ b/tools/minidef.exe @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:342a876b7327e975996fabb5e9b082a99ea830a81a86d1543aa25751a97c7583 +size 144896