A few more win32 compat fixes

Signed-off-by: falkTX <[email protected]>
mod-audio · Sep 25, 2023 · efeb3b8 · efeb3b8
1 parent eb25e56
commit efeb3b8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/html/js/modgui.js b/html/js/modgui.js
@@ -2660,7 +2660,7 @@ JqueryClass('customSelectPath', baseWidget, {
                 if (!self.data('enabled')) {
                     return self.customSelectPath('prevent', e)
                 }
-                var value = opt.attr('mod-parameter-value').replace('\\','\\\\')
+                var value = opt.attr('mod-parameter-value').replace(/\\/g,'\\\\')
                 self.customSelectPath('setValue', value, false)
             })
         })

diff --git a/modtools/utils.py b/modtools/utils.py
@@ -5,6 +5,7 @@
 import os
 from ctypes import *
 from mod import get_unique_name
+from sys import platform
 
 # ------------------------------------------------------------------------------------------------------------
 # Convert a ctypes c_char_p into a python string
@@ -144,13 +145,21 @@ def unionToDict(struct):
 
 # ------------------------------------------------------------------------------------------------------------
 
-tryPath1 = os.path.join(os.path.dirname(__file__), "libmod_utils.so")
-tryPath2 = os.path.join(os.path.dirname(__file__), "..", "utils", "libmod_utils.so")
+if platform == 'win32':
+    ext = "dll"
+else:
+    ext = "so"
+
+tryPath1 = os.path.join(os.path.dirname(__file__), "libmod_utils." + ext)
+tryPath2 = os.path.join(os.path.dirname(__file__), "..", "lib", "libmod_utils." + ext)
+tryPath3 = os.path.join(os.path.dirname(__file__), "..", "utils", "libmod_utils." + ext)
 
 if os.path.exists(tryPath1):
     utils = cdll.LoadLibrary(tryPath1)
-else:
+elif os.path.exists(tryPath2):
     utils = cdll.LoadLibrary(tryPath2)
+else:
+    utils = cdll.LoadLibrary(tryPath3)
 
 # PluginLicenseType
 kPluginLicenseNonCommercial = 0