diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f1c26d2..35087b1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -309,6 +309,12 @@ set(WOWEE_HEADERS set(WOWEE_PLATFORM_SOURCES) if(WIN32) + # Copy icon into build tree so llvm-rc can find it via the relative path in wowee.rc + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/assets/Wowee.ico + ${CMAKE_CURRENT_BINARY_DIR}/assets/wowee.ico + COPYONLY + ) list(APPEND WOWEE_PLATFORM_SOURCES resources/wowee.rc) endif() diff --git a/src/game/warden_module.cpp b/src/game/warden_module.cpp index 0e11441d..c6e9fa78 100644 --- a/src/game/warden_module.cpp +++ b/src/game/warden_module.cpp @@ -494,7 +494,6 @@ bool WardenModule::parseExecutableFormat(const std::vector& exeData) { return false; } #else - #include moduleMemory_ = mmap( nullptr, finalCodeSize,