Fix windows linking

Garey27 · Nov 13, 2024 · 8837386 · 8837386
1 parent 1ccb7e0
commit 8837386
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -447,3 +447,5 @@ dkms.conf
 *.exe
 *.out
 *.app
+
+CMakeSettings.json
diff --git 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
@@ -75,7 +75,7 @@ constexpr auto AMXX_MODULE_LIB_CLASS = "addtofullpack_manager";
 /// <summary>
 /// <para>Reload module on map change.</para>
 /// </summary>
-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
@@ -29,6 +29,9 @@ elseif(WIN32)
     set_target_properties("${CMAKE_PROJECT_NAME}" PROPERTIES
         MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>" # static linking
     )
+    target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE
+    "$<$<CONFIG:Debug>:/ZI>")
+    target_link_options(${CMAKE_PROJECT_NAME} PRIVATE /EXPORT:GiveFnptrsToDll=_GiveFnptrsToDll@8 /SECTION:.data,RW)
 endif()
 
 # Set the DEFINE_SYMBOL property
-Original file line number
+Diff line change
@@ Expand Up / @@ -447,3 +447,5 @@ dkms.conf @@
     *.exe
     *.out
     *.app
+    CMakeSettings.json