Browse Source

Fix some paths

tags/1.9.4
falkTX 10 years ago
parent
commit
3c779f018a
2 changed files with 5 additions and 6 deletions
  1. +2
    -2
      source/carla_shared.py
  2. +3
    -4
      source/carla_style.py

+ 2
- 2
source/carla_shared.py View File

@@ -527,8 +527,8 @@ def initHost(initName, libPrefix = None, failError = True):
elif CWDl.endswith("resources"):
if CWDl.endswith("native-plugins%sresources" % os.sep):
gCarla.pathBinaries = os.path.abspath(os.path.join(CWD, "..", "..", "..", "..", "bin"))
elif "carla-native.lv2" in sys.argv[0]:
gCarla.pathBinaries = os.path.abspath(os.path.join(CWD, "..", "..", "..", "lib", "lv2", "carla-native.lv2"))
elif "carla-native.lv2" in sys.argv[0].lower():
gCarla.pathBinaries = os.path.abspath(os.path.join(CWD, "..", "..", "..", "lv2", "carla-native.lv2"))
else:
gCarla.pathBinaries = os.path.abspath(os.path.join(CWD, ".."))



+ 3
- 4
source/carla_style.py View File

@@ -62,6 +62,9 @@ class CarlaApplication(object):
elif CWDl.endswith("source"):
stylesDir = os.path.abspath(os.path.join(CWD, "..", "bin"))

elif CWDl.endswith("bin") or os.path.isfile(sys.path[0]):
stylesDir = CWD

if stylesDir and os.path.exists(stylesDir):
QApplication.addLibraryPath(stylesDir)

@@ -77,10 +80,6 @@ class CarlaApplication(object):
self._createApp(appName)
return

# fix Qt5 not finding plarform dir on Mac and Windows
if MACOS or WINDOWS:
QApplication.addLibraryPath(CWD)

# set style
QApplication.setStyle("carla" if stylesDir else "fusion")



Loading…
Cancel
Save