Browse Source

Fix (native) plugin discovery under Windows

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.3.0-RC2
falkTX 3 years ago
parent
commit
2d6b710b1e
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 1 additions and 5 deletions
  1. +0
    -3
      source/discovery/Makefile
  2. +1
    -2
      source/frontend/carla_database.py

+ 0
- 3
source/discovery/Makefile View File

@@ -179,9 +179,6 @@ $(BINDIR)/$(MODULENAME)-native.exe: $(OBJS_native) $(LIBS_native)
-@mkdir -p $(BINDIR) -@mkdir -p $(BINDIR)
@echo "Linking $(MODULENAME)-native.exe" @echo "Linking $(MODULENAME)-native.exe"
@$(CXX) $< $(LIBS_START) $(LIBS_native) $(LIBS_END) $(LINK_FLAGS) $(NATIVE_LINK_FLAGS) -o $@ @$(CXX) $< $(LIBS_START) $(LIBS_native) $(LIBS_END) $(LINK_FLAGS) $(NATIVE_LINK_FLAGS) -o $@
@echo "Symlinking $(MODULENAME)-win$(winv).exe"
@rm -f $(BINDIR)/$(MODULENAME)-win$(winv).exe
@ln -s $(MODULENAME)-native.exe $(BINDIR)/$(MODULENAME)-win$(winv).exe


$(BINDIR)/$(MODULENAME)-arm32: $(OBJS_arm32) $(LIBS_arm32) $(BINDIR)/$(MODULENAME)-arm32: $(OBJS_arm32) $(LIBS_arm32)
-@mkdir -p $(BINDIR) -@mkdir -p $(BINDIR)


+ 1
- 2
source/frontend/carla_database.py View File

@@ -413,12 +413,11 @@ class SearchPluginsThread(QThread):
self.fCheckSFZ = False self.fCheckSFZ = False


if WINDOWS: if WINDOWS:
toolNative = "carla-discovery-win64.exe" if kIs64bit else "carla-discovery-win32.exe"
toolNative = "carla-discovery-native.exe"
self.fWineSettings = None self.fWineSettings = None


else: else:
toolNative = "carla-discovery-native" toolNative = "carla-discovery-native"

settings = QSafeSettings("falkTX", "Carla2") settings = QSafeSettings("falkTX", "Carla2")
self.fWineSettings = { self.fWineSettings = {
'executable' : settings.value(CARLA_KEY_WINE_EXECUTABLE, CARLA_DEFAULT_WINE_EXECUTABLE, str), 'executable' : settings.value(CARLA_KEY_WINE_EXECUTABLE, CARLA_DEFAULT_WINE_EXECUTABLE, str),


Loading…
Cancel
Save