nvapi: Use .def file for exporting

jp7677 · Feb 3, 2025 · c3b8cdb · c3b8cdb
1 parent 6efef69
commit c3b8cdb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/src/meson.build b/src/meson.build
@@ -35,6 +35,7 @@ nvapi_dll = shared_library(target_name, [ nvapi_src, dxvk_nvapi_version ],
   name_prefix         : '',
   dependencies        : [ lib_dxgi, lib_d3d11, lib_version ],
   include_directories : [ nvapi_headers, vk_headers ],
+  vs_module_defs      : target_name+'.def',
   install             : true)
 
 nvofapi_src = files([

diff --git a/src/nvapi.def b/src/nvapi.def
@@ -0,0 +1,3 @@
+LIBRARY nvapi.dll
+EXPORTS
+    nvapi_QueryInterface @2
diff --git a/src/nvapi64.def b/src/nvapi64.def
@@ -0,0 +1,3 @@
+LIBRARY nvapi64.dll
+EXPORTS
+    nvapi_QueryInterface @2
diff --git a/src/nvapi_interface.cpp b/src/nvapi_interface.cpp
@@ -39,7 +39,7 @@ extern "C" {
             log::info(str::format("NvAPI_QueryInterface: Ignoring unrecognized entrypoints from ", disabledEnvName, ": ", str::implode(", ", unrecognized)));
     }
 
-    __declspec(dllexport) void* __cdecl nvapi_QueryInterface(NvU32 id) {
+    void* __cdecl nvapi_QueryInterface(NvU32 id) {
         static std::unordered_map<NvU32, void*> registry;
         static std::mutex registryMutex;
         std::scoped_lock lock(registryMutex);