Link libraries via CMake instead of #pragma

Author: mrexodia

cmake/x64dbg.cmake

@@ -1,12 +1,25 @@
 
 if(NOT TARGET x64dbg)
-    file(GLOB_RECURSE HEADERS CONFIGURE_DEPENDS ${x64dbg_SOURCE_DIR}/pluginsdk/*.h)
+    file(GLOB_RECURSE HEADERS ${x64dbg_SOURCE_DIR}/pluginsdk/*.h)
     add_custom_target(x64dbg-sdk SOURCES ${HEADERS})
     source_group(TREE ${x64dbg_SOURCE_DIR} FILES ${HEADERS})
 
     add_library(x64dbg INTERFACE)
     target_include_directories(x64dbg INTERFACE ${x64dbg_SOURCE_DIR})
     target_link_directories(x64dbg INTERFACE ${x64dbg_SOURCE_DIR})
+
+    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        file(GLOB_RECURSE LIBS
+            ${x64dbg_SOURCE_DIR}/pluginsdk/*_x64.lib
+            ${x64dbg_SOURCE_DIR}/pluginsdk/x64*.lib
+        )
+    else()
+        file(GLOB_RECURSE LIBS
+            ${x64dbg_SOURCE_DIR}/pluginsdk/*_x86.lib
+            ${x64dbg_SOURCE_DIR}/pluginsdk/x32*.lib
+        )
+    endif()
+    target_link_libraries(x64dbg INTERFACE ${LIBS})
 endif()
 
 function(x64dbg_plugin target)
@@ -31,6 +44,8 @@ function(x64dbg_plugin target)
     target_compile_definitions(${target} PRIVATE "-DPLUGIN_NAME=\"${target}\"")
 
     # Support PluginDevHelper (https://github.com/x64dbg/PluginDevHelper)
-    add_custom_command(TARGET ${target} PRE_LINK COMMAND if exist "\"$(SolutionDir)PluginDevBuildTool.exe\"" "(\"$(SolutionDir)PluginDevBuildTool.exe\"" unload "\"$(TargetPath)\")" else (echo Copy PluginDevBuildTool.exe next to the .sln to automatically reload plugins when building))
-    add_custom_command(TARGET ${target} POST_BUILD COMMAND if exist "\"$(SolutionDir)PluginDevBuildTool.exe\"" ("\"$(SolutionDir)PluginDevBuildTool.exe\"" reload "\"$(TargetPath)\""))
+    if(CMAKE_GENERATOR MATCHES "Visual Studio")
+        add_custom_command(TARGET ${target} PRE_LINK COMMAND if exist "\"$(SolutionDir)PluginDevBuildTool.exe\"" "(\"$(SolutionDir)PluginDevBuildTool.exe\"" unload "\"$(TargetPath)\")" else (echo Copy PluginDevBuildTool.exe next to the .sln to automatically reload plugins when building))
+        add_custom_command(TARGET ${target} POST_BUILD COMMAND if exist "\"$(SolutionDir)PluginDevBuildTool.exe\"" ("\"$(SolutionDir)PluginDevBuildTool.exe\"" reload "\"$(TargetPath)\""))
+    endif()
 endfunction()

src/pluginmain.h

@@ -32,24 +32,6 @@
 #include "pluginsdk/TitanEngine/TitanEngine.h"
 #include "pluginsdk/XEDParse/XEDParse.h"
 
-#ifdef _WIN64
-#pragma comment(lib, "pluginsdk/x64dbg.lib")
-#pragma comment(lib, "pluginsdk/x64bridge.lib")
-#pragma comment(lib, "pluginsdk/DeviceNameResolver/DeviceNameResolver_x64.lib")
-#pragma comment(lib, "pluginsdk/jansson/jansson_x64.lib")
-#pragma comment(lib, "pluginsdk/lz4/lz4_x64.lib")
-#pragma comment(lib, "pluginsdk/TitanEngine/TitanEngine_x64.lib")
-#pragma comment(lib, "pluginsdk/XEDParse/XEDParse_x64.lib")
-#else
-#pragma comment(lib, "pluginsdk/x32dbg.lib")
-#pragma comment(lib, "pluginsdk/x32bridge.lib")
-#pragma comment(lib, "pluginsdk/DeviceNameResolver/DeviceNameResolver_x86.lib")
-#pragma comment(lib, "pluginsdk/jansson/jansson_x86.lib")
-#pragma comment(lib, "pluginsdk/lz4/lz4_x86.lib")
-#pragma comment(lib, "pluginsdk/TitanEngine/TitanEngine_x86.lib")
-#pragma comment(lib, "pluginsdk/XEDParse/XEDParse_x86.lib")
-#endif //_WIN64
-
 #define Cmd(x) DbgCmdExecDirect(x)
 #define Eval(x) DbgValFromString(x)
 #define dprintf(x, ...) _plugin_logprintf("[" PLUGIN_NAME "] " x, __VA_ARGS__)