windows: set RuntimeLibrary for Debug and Release

versatica · May 21, 2024 · 85784ad · 85784ad
1 parent 8902239
commit 85784ad
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/.github/workflows/mediasoup-node.yaml b/.github/workflows/mediasoup-node.yaml
@@ -13,14 +13,14 @@ jobs:
     strategy:
       matrix:
         ci:
-          - os: ubuntu-20.04
-            node: 18
-          - os: ubuntu-22.04
-            node: 20
-          - os: macos-12
-            node: 18
-          - os: macos-14
-            node: 20
+          # - os: ubuntu-20.04
+            # node: 18
+          # - os: ubuntu-22.04
+            # node: 20
+          # - os: macos-12
+            # node: 18
+          # - os: macos-14
+            # node: 20
           - os: windows-2022
             node: 20
         build-type:

diff --git a/node/src/workerChannel/binding.gyp b/node/src/workerChannel/binding.gyp
@@ -22,7 +22,7 @@
             '<(module_root_dir)/../../../worker/out/<(mediasoup_build_type)/build/libmediasoup-worker.a'
           ],
         }, {
-          "libraries": [
+          'libraries': [
             '<(mediasoup_worker_lib)'
             ],
           }
@@ -31,6 +31,17 @@
           'libraries': [
             'Ws2_32.lib', 'Dbghelp.lib', 'Crypt32.lib', 'Userenv.lib',
           ],
+          'conditions': [
+            ['mediasoup_build_type=="Release"', {
+              'variables': {
+                'runtime_library': '0',
+              },
+            }, {
+              'variables': {
+                'runtime_library': '1',
+              },
+            }],
+          ],
           'msvs_settings': {
             'VCCLCompilerTool': {
               'ExceptionHandling': 1,
@@ -39,8 +50,8 @@
               # 1 - MultiThreadedDebug (/MTd)
               # 2 - MultiThreadedDLL (/MD)
               # 3 - MultiThreadedDebugDLL (/MDd)
-              'RuntimeLibrary': 0,
-              'AdditionalOptions': [ '/MT' ],
+              'RuntimeLibrary': '<(runtime_library)',
+              # 'AdditionalOptions': [ '/MT' ],
             },
             'VCLinkerTool': {
               'AdditionalOptions': ['/FORCE:MULTIPLE'],