From 8837386b458b5868fd0a3e912f62eaec3277d88c Mon Sep 17 00:00:00 2001 From: Garey Akhmetshin Date: Wed, 13 Nov 2024 11:21:12 +0500 Subject: [PATCH] Fix windows linking --- .gitignore | 2 ++ CMakeSettings.json | 11 +++++++++++ .../sdk/amxx/include/amxx/amxx_config.h | 2 +- cmake/Definitions.cmake | 3 +++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6461f11..c56282d 100644 --- a/.gitignore +++ b/.gitignore @@ -447,3 +447,5 @@ dkms.conf *.exe *.out *.app + +CMakeSettings.json \ No newline at end of file diff --git a/CMakeSettings.json b/CMakeSettings.json index c7d8707..165848a 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -9,6 +9,17 @@ "cmakeCommandArgs": "", "buildCommandArgs": "", "ctestCommandArgs": "", + "inheritEnvironments": [ "msvc_x86" ] + }, + { + "name": "x86-Debug", + "generator": "Ninja", + "configurationType": "Debug", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", "inheritEnvironments": [ "msvc_x86" ], "variables": [] } diff --git a/addtofullpack_manager/sdk/amxx/include/amxx/amxx_config.h b/addtofullpack_manager/sdk/amxx/include/amxx/amxx_config.h index d0741d4..703f9de 100644 --- a/addtofullpack_manager/sdk/amxx/include/amxx/amxx_config.h +++ b/addtofullpack_manager/sdk/amxx/include/amxx/amxx_config.h @@ -75,7 +75,7 @@ constexpr auto AMXX_MODULE_LIB_CLASS = "addtofullpack_manager"; /// /// Reload module on map change. /// -constexpr auto AMXX_MODULE_RELOAD_ON_MAP_CHANGE = false; +constexpr auto AMXX_MODULE_RELOAD_ON_MAP_CHANGE = true; /* * ------------------------------------------------------------------------------------------- diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake index 7682e53..b62b78a 100644 --- a/cmake/Definitions.cmake +++ b/cmake/Definitions.cmake @@ -29,6 +29,9 @@ elseif(WIN32) set_target_properties("${CMAKE_PROJECT_NAME}" PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>" # static linking ) + target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE + "$<$:/ZI>") + target_link_options(${CMAKE_PROJECT_NAME} PRIVATE /EXPORT:GiveFnptrsToDll=_GiveFnptrsToDll@8 /SECTION:.data,RW) endif() # Set the DEFINE_SYMBOL property