Better compatibility with msys2

Signed-off-by: falkTX <falktx@falktx.com>

Makefile

@@ -206,6 +206,19 @@ rest: libs
 theme: libs
 	@$(MAKE) -C source/theme
 
+# ---------------------------------------------------------------------------------------------------------------------
+# hacks
+
+msys2fix:
+	rm -rf source/includes/serd
+	rm -rf source/includes/sord
+	rm -rf source/includes/sratom
+	rm -rf source/includes/lilv
+	cp -r source/modules/lilv/serd-0.24.0/serd source/includes/serd
+	cp -r source/modules/lilv/sord-0.16.0/sord source/includes/sord
+	cp -r source/modules/lilv/sratom-0.6.0/sratom source/includes/sratom
+	cp -r source/modules/lilv/lilv-0.24.0/lilv source/includes/lilv
+
 # ---------------------------------------------------------------------------------------------------------------------
 # nuitka
 

source/Makefile.mk

@@ -42,6 +42,12 @@ MACOS=true
 endif
 ifneq (,$(findstring mingw,$(TARGET_MACHINE)))
 WIN32=true
+ifneq (,$(findstring x86_64,$(TARGET_MACHINE)))
+WIN64=true
+endif
+endif
+ifneq (,$(findstring msys,$(TARGET_MACHINE)))
+WIN32=true
 endif
 
 endif # WIN32

source/discovery/Makefile

@@ -4,16 +4,16 @@
 # Created by falkTX
 #
 
+CWD=..
+MODULENAME=carla-discovery
+include $(CWD)/Makefile.mk
+
 ifeq ($(WIN64),true)
 winv=64
 else
 winv=32
 endif
 
-CWD=..
-MODULENAME=carla-discovery
-include $(CWD)/Makefile.mk
-
 # Workaround GCC bug
 ifeq ($(TESTBUILD),true)
 ifeq ($(USING_JUCE),true)

source/frontend/carla_database.py

@@ -280,6 +280,8 @@ def runCarlaDiscovery(itype, stype, filename, tool, wineSettings=None):
                 pinfo['name'] = value if value else fakeLabel
             elif prop == "label":
                 pinfo['label'] = value if value else fakeLabel
+            elif prop == "filename":
+                pinfo['filename'] = value
             elif prop == "maker":
                 pinfo['maker'] = value
             elif prop == "category":
@@ -351,7 +353,7 @@ def checkPluginCached(desc, ptype):
     pinfo['parameters.outs'] = desc['parameterOuts']
 
     if ptype == PLUGIN_LV2:
-        pinfo['filename'], pinfo['label'] = pinfo['label'].split(os.path.sep,1)
+        pinfo['filename'], pinfo['label'] = pinfo['label'].split('\\' if WINDOWS else '/',1)
 
     elif ptype == PLUGIN_SFZ:
         pinfo['filename'] = pinfo['label']