koffi 2.15.0 → 2.16.0-beta.1

package/src/cnoke/assets/FindCNoke.cmake

@@ -9,12 +9,19 @@ else()
 endif()
 
 if(NODE_JS_LINK_DEF)
-    add_custom_command(OUTPUT ${NODE_JS_LINK_LIB}
-                       COMMAND ${CMAKE_AR} ${CMAKE_STATIC_LINKER_FLAGS}
-                               /def:${NODE_JS_LINK_DEF} /out:${NODE_JS_LINK_LIB}
-                       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                       MAIN_DEPENDENCY ${NODE_JS_LINK_DEF})
-    add_custom_target(node.lib DEPENDS ${NODE_JS_LINK_LIB})
+    set(NODE_JS_LINK_LIB "${CMAKE_CURRENT_BINARY_DIR}/node.lib")
+    if (MSVC)
+        add_custom_command(OUTPUT node.lib
+                           COMMAND ${CMAKE_AR} ${CMAKE_STATIC_LINKER_FLAGS}
+                                   /def:${NODE_JS_LINK_DEF} /out:${NODE_JS_LINK_LIB}
+                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                           MAIN_DEPENDENCY ${NODE_JS_LINK_DEF})
+    else()
+        add_custom_command(OUTPUT node.lib
+                           COMMAND ${CMAKE_DLLTOOL} -d ${NODE_JS_LINK_DEF} -l ${NODE_JS_LINK_LIB}
+                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                           MAIN_DEPENDENCY ${NODE_JS_LINK_DEF})
+    endif()
 endif()
 
 function(add_node_addon)
@@ -26,10 +33,10 @@ endfunction()
 
 function(target_link_node TARGET)
     target_include_directories(${TARGET} PRIVATE ${NODE_JS_INCLUDE_DIRS})
+    if(NODE_JS_LINK_DEF)
+        target_sources(${TARGET} PRIVATE node.lib)
+    endif()
     if(NODE_JS_LINK_LIB)
-        if(TARGET node.lib)
-            add_dependencies(${TARGET} node.lib)
-        endif()
         target_link_libraries(${TARGET} PRIVATE ${NODE_JS_LINK_LIB})
     endif()
     target_compile_options(${TARGET} PRIVATE ${NODE_JS_COMPILE_FLAGS})
@@ -100,7 +107,6 @@ else()
 endif()
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    message(STATUS ${CMAKE_SYSTEM_PROCESSOR})
     if(CMAKE_SYSTEM_PROCESSOR MATCHES "(amd64|x86_64)")
         foreach(lang C CXX)
             set(CMAKE_${lang}_FLAGS_RELEASE "${CMAKE_${lang}_FLAGS_RELEASE} -mpopcnt -msse4.1 -msse4.2 -mssse3 -mcx16")

package/src/cnoke/assets/win_delay_hook.c

@@ -29,4 +29,8 @@ static FARPROC WINAPI self_exe_hook(unsigned int event, DelayLoadInfo *info)
     return NULL;
 }
 
+#if defined(__MINGW32__)
+PfnDliHook __pfnDliNotifyHook2 = self_exe_hook;
+#else
 const PfnDliHook __pfnDliNotifyHook2 = self_exe_hook;
+#endif

package/src/cnoke/src/builder.js

@@ -106,44 +106,41 @@ function Builder(config = {}) {
             args.push(`-DNODE_JS_INCLUDE_DIRS=${options.api}/include`);
         }
 
-        // Download or create Node import library (Windows)
-        if (process.platform == 'win32') {
-            if (options.api == null) {
-                let dirname;
-                switch (arch) {
-                    case 'ia32': { dirname = 'win-x86'; } break;
-                    case 'x64': { dirname = 'win-x64'; } break;
-                    case 'arm64': { dirname = 'win-arm64'; } break;
-
-                    default: {
-                        throw new Error(`Unsupported architecture '${arch}' for Node on Windows`);
-                    } break;
-                }
-
-                let destname = `${cache_dir}/node_v${runtime_version}_${arch}.lib`;
-
-                if (!fs.existsSync(destname)) {
-                    fs.mkdirSync(cache_dir, { recursive: true, mode: 0o755 });
+        args.push(`-DCMAKE_MODULE_PATH=${app_dir}/assets`);
 
-                    let url = `https://nodejs.org/dist/v${runtime_version}/${dirname}/node.lib`;
-                    await tools.download_http(url, destname);
-                }
+        let win32 = (process.platform == 'win32');
+        let msvc = (process.platform == 'win32' && process.env.MSYSTEM == null);
+        let darwin = (process.platform == 'darwin');
+
+        // Handle Node import library on Windows
+        if (win32) {
+            if (msvc) {
+                if (options.api == null) {
+                    let dirname;
+                    switch (arch) {
+                        case 'ia32': { dirname = 'win-x86'; } break;
+                        case 'x64': { dirname = 'win-x64'; } break;
+                        case 'arm64': { dirname = 'win-arm64'; } break;
+
+                        default: {
+                            throw new Error(`Unsupported architecture '${arch}' for Node on Windows`);
+                        } break;
+                    }
 
-                fs.copyFileSync(destname, work_dir + '/node.lib');
-            } else {
-                args.push(`-DNODE_JS_LINK_DEF=${options.api}/def/node_api.def`);
-            }
-        }
+                    let destname = `${cache_dir}/node_v${runtime_version}_${arch}.lib`;
 
-        args.push(`-DCMAKE_MODULE_PATH=${app_dir}/assets`);
+                    if (!fs.existsSync(destname)) {
+                        fs.mkdirSync(cache_dir, { recursive: true, mode: 0o755 });
 
-        // Set platform flags
-        switch (process.platform) {
-            case 'win32': {
-                fs.copyFileSync(`${app_dir}/assets/win_delay_hook.c`, work_dir + '/win_delay_hook.c');
+                        let url = `https://nodejs.org/dist/v${runtime_version}/${dirname}/node.lib`;
+                        await tools.download_http(url, destname);
+                    }
 
-                args.push(`-DNODE_JS_SOURCES=${work_dir}/win_delay_hook.c`);
-                args.push(`-DNODE_JS_LINK_LIB=${work_dir}/node.lib`);
+                    fs.copyFileSync(destname, work_dir + '/node.lib');
+                    args.push(`-DNODE_JS_LINK_LIB=${work_dir}/node.lib`);
+                } else {
+                    args.push(`-DNODE_JS_LINK_DEF=${options.api}/def/node_api.def`);
+                }
 
                 switch (arch) {
                     case 'ia32': {
@@ -159,22 +156,29 @@ function Builder(config = {}) {
                         args.push('-A', 'x64');
                     } break;
                 }
-            } break;
 
-            case 'darwin': {
-                args.push('-DNODE_JS_LINK_FLAGS=-undefined;dynamic_lookup');
+                fs.copyFileSync(`${app_dir}/assets/win_delay_hook.c`, work_dir + '/win_delay_hook.c');
+                args.push(`-DNODE_JS_SOURCES=${work_dir}/win_delay_hook.c`);
+            } else {
+                args.push(`-DNODE_JS_LINK_LIB=node.dll`);
+            }
+        }
+
+        if (darwin) {
+            args.push('-DNODE_JS_LINK_FLAGS=-undefined;dynamic_lookup');
 
-                switch (arch) {
-                    case 'arm64': { args.push('-DCMAKE_OSX_ARCHITECTURES=arm64'); } break;
-                    case 'x64': { args.push('-DCMAKE_OSX_ARCHITECTURES=x86_64'); } break;
-                }
-            } break;
+            switch (arch) {
+                case 'arm64': { args.push('-DCMAKE_OSX_ARCHITECTURES=arm64'); } break;
+                case 'x64': { args.push('-DCMAKE_OSX_ARCHITECTURES=x86_64'); } break;
+            }
         }
 
-        if (process.platform != 'win32') {
-            // Prefer Ninja if available
-            if (spawnSync('ninja', ['--version']).status === 0)
+        if (!msvc) {
+            if (spawnSync('ninja', ['--version']).status === 0) {
                 args.push('-G', 'Ninja');
+            } else if (process.platform == 'win32') {
+                args.push('-G', 'MinGW Makefiles');
+            }
 
             // Use CCache if available
             if (spawnSync('ccache', ['--version']).status === 0) {
@@ -182,9 +186,8 @@ function Builder(config = {}) {
                 args.push('-DCMAKE_CXX_COMPILER_LAUNCHER=ccache');
             }
         }
-
         if (prefer_clang) {
-            if (process.platform == 'win32') {
+            if (msvc) {
                 args.push('-T', 'ClangCL');
             } else {
                 args.push('-DCMAKE_C_COMPILER=clang');

package/src/koffi/CMakeLists.txt

@@ -99,7 +99,11 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
         list(APPEND KOFFI_SRC src/abi_riscv64.cc src/abi_loong64_asm.S)
     else()
         if(WIN32)
-            list(APPEND KOFFI_SRC src/abi_x64_win.cc src/abi_x64_win_asm.asm)
+            if(MSVC)
+                list(APPEND KOFFI_SRC src/abi_x64_win.cc src/abi_x64_win_asm.asm)
+            else()
+                list(APPEND KOFFI_SRC src/abi_x64_win.cc src/abi_x64_win_asm.S)
+            endif()
         else()
             list(APPEND KOFFI_SRC src/abi_x64_sysv.cc src/abi_x64_sysv_asm.S)
         endif()
@@ -121,13 +125,19 @@ target_include_directories(koffi PRIVATE . ../.. ../../vendor/node-addon-api)
 
 if(WIN32)
     set(UV_LINK_LIB "${CMAKE_CURRENT_BINARY_DIR}/uv.lib")
-    add_custom_command(OUTPUT ${UV_LINK_LIB}
-                       COMMAND ${CMAKE_AR} ${CMAKE_STATIC_LINKER_FLAGS}
-                               /def:src/uv.def /out:${UV_LINK_LIB}
-                       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                       MAIN_DEPENDENCY src/uv.def)
-    add_custom_target(uv.lib DEPENDS ${UV_LINK_LIB})
-    add_dependencies(koffi uv.lib)
+    if(MSVC)
+        add_custom_command(OUTPUT uv.lib
+                           COMMAND ${CMAKE_AR} ${CMAKE_STATIC_LINKER_FLAGS}
+                                   /def:src/uv.def /out:${UV_LINK_LIB}
+                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                           MAIN_DEPENDENCY src/uv.def)
+    else()
+        add_custom_command(OUTPUT uv.lib
+                           COMMAND ${CMAKE_DLLTOOL} -d src/uv.def -l ${UV_LINK_LIB}
+                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                           MAIN_DEPENDENCY src/uv.def)
+    endif()
+    target_sources(koffi PRIVATE uv.lib)
     target_link_libraries(koffi PRIVATE ${UV_LINK_LIB})
 endif()