From 71d77350d56d0714ad75cefe513388f3c7f0450f Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sat, 12 Mar 2022 14:04:45 +0100 Subject: [PATCH] Fixes Windows build --- CMakeLists.txt | 18 +++++++++++++----- src/Tester/TestRunner.hpp | 4 +++- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 64f5d79..707d2fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,8 +37,6 @@ include_directories(${Angelscript_SOURCE_DIR}/angelscript/include) include_directories(${Angelscript_SOURCE_DIR}/add_on) -include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/) -include_directories(${PkmnLib_BINARY_DIR}/include/) if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") add_compile_options(-fconcepts) @@ -48,11 +46,21 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") add_link_options(-fuse-ld=lld) endif () - -file(GLOB_RECURSE SRC_FILES src/*.cpp src/*.hpp extern/AngelscriptDebugger/src/*.cpp) +set(SRC_FILES_PATTERN src/*.cpp src/*.hpp) +if (NOT WINDOWS) + set(SRC_FILES_PATTERN ${SRC_FILES_PATTERN} extern/AngelscriptDebugger/src/*.cpp) +endif() +file(GLOB_RECURSE SRC_FILES ${SRC_FILES_PATTERN}) add_executable(PokemonScriptTester ${SRC_FILES}) + +target_include_directories(PokemonScriptTester PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/include/) +target_include_directories(PokemonScriptTester PUBLIC ${PkmnLib_BINARY_DIR}/include/) +target_link_directories(PokemonScriptTester PUBLIC ${Angelscript_BINARY_DIR}) + add_definitions(-DLEVEL_U8) -ADD_DEFINITIONS(-DANGELSCRIPT_DEBUGGER) +if (NOT WINDOWS) + ADD_DEFINITIONS(-DANGELSCRIPT_DEBUGGER) +endif() SET(_LINKS -static pkmnLib Arbutils) diff --git a/src/Tester/TestRunner.hpp b/src/Tester/TestRunner.hpp index 914dda5..893253c 100644 --- a/src/Tester/TestRunner.hpp +++ b/src/Tester/TestRunner.hpp @@ -34,9 +34,10 @@ public: } } - i32 RunAll(bool waitForDebugger) { + i32 RunAll([[maybe_unused]]bool waitForDebugger) { auto ctx = _scriptResolver->GetContextPool()->RequestContext(); ctx->SetUserData(_scriptResolver->GetUserdata()); +#if ANGELSCRIPT_DEBUGGER _scriptResolver->SetDebugger(new AngelscriptDebugger()); auto& debugger = *_scriptResolver->GetDebugger().GetValue(); debugger.Run(8684); @@ -48,6 +49,7 @@ public: } std::this_thread::sleep_for(std::chrono::milliseconds(500)); } +#endif for (auto& test : _tests) { test.second->Run(ctx);