🚑 Fix MinGW

tonyfettes · Dec 6, 2024 · c481034 · c481034
1 parent 1ea8395
commit c481034
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -73,6 +73,7 @@ jobs:
       - name: Build
         run: |
           PKG_CONFIG_PATH="$HOME/.nix-profile/lib/pkgconfig" yarn install
+          ls -Rl build
           PKG_CONFIG_PATH="$HOME/.nix-profile/lib/pkgconfig" yarn pack
         env:
           NODE_ENV: production

diff --git a/xmake.lua b/xmake.lua
@@ -21,16 +21,10 @@ do
             target:set("kind", "shared")
         end
 
-        -- set library name
-        local modulename = target:name():split('.', { plain = true })
-        modulename = modulename[#modulename]
-        target:set("filename", modulename .. ".node")
-
         -- export symbols
         if target:is_plat("windows") then
-            local exported_name = target:name():gsub("%.", "_")
-            exported_name = exported_name:match('^[^%-]+%-(.+)$') or exported_name
-            target:add("shflags", "/export:napi_register_module_v1", { force = true })
+            target:add("shflags", "/export:napi_register_module_v1", "/export:node_api_module_get_api_version_v1",
+                { force = true })
         else
             target:set("symbols", "none")
         end
@@ -44,6 +38,11 @@ do
                 git.clone("https://github.com/napi-bindings/node-api-stub", { depth = 1, outputdir = outputdir })
             end
             target:add("files", outputdir .. "/node_api.c")
+        else
+            -- set library name
+            local modulename = target:name():split('.', { plain = true })
+            modulename = modulename[#modulename]
+            target:set("filename", modulename .. ".node")
         end
 
         -- add node library
@@ -77,11 +76,6 @@ do
             bindir = path.join("lib", moduledir),
             includedir = path.join("include", moduledir)
         })
-        if is_plat("mingw") then
-            local modulename = target:name():split('.', { plain = true })
-            modulename = modulename[#modulename]
-            os.mv(installdir .. "/" .. modulename .. ".dll.a", installdir .. "/" .. modulename .. ".node")
-        end
     end)
 end