Browse Source

Use libPrefix on carla-database/settings scripts, closes #193

tags/1.9.6
falkTX 9 years ago
parent
commit
fae2da4444
4 changed files with 20 additions and 6 deletions
  1. +1
    -1
      data/carla-database
  2. +1
    -1
      data/carla-settings
  3. +9
    -2
      source/carla_database.py
  4. +9
    -2
      source/carla_settings.py

+ 1
- 1
data/carla-database View File

@@ -8,4 +8,4 @@ fi

INSTALL_PREFIX="X-PREFIX-X"
export PATH="$INSTALL_PREFIX"/lib/carla:$PATH
exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla_database.py
exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla_database.py --with-libprefix="$INSTALL_PREFIX" "$@"

+ 1
- 1
data/carla-settings View File

@@ -8,4 +8,4 @@ fi

INSTALL_PREFIX="X-PREFIX-X"
export PATH="$INSTALL_PREFIX"/lib/carla:$PATH
exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla_settings.py
exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla_settings.py --with-libprefix="$INSTALL_PREFIX" "$@"

+ 9
- 2
source/carla_database.py View File

@@ -1689,8 +1689,15 @@ if __name__ == '__main__':
from carla_app import CarlaApplication
from carla_host import initHost, loadHostSettings

app = CarlaApplication()
host = initHost("Database", None, False, False, False)
libPrefix = None

for arg in sys.argv:
if arg.startswith("--with-libprefix="):
libPrefix = arg.replace("--with-libprefix=", "")
break

app = CarlaApplication("Carla2-Database", libPrefix)
host = initHost("Carla2-Database", libPrefix, False, False, False)
loadHostSettings(host)

gui = PluginDatabaseW(None, host)


+ 9
- 2
source/carla_settings.py View File

@@ -855,8 +855,15 @@ if __name__ == '__main__':
from carla_app import CarlaApplication
from carla_host import initHost, loadHostSettings

app = CarlaApplication()
host = initHost("Settings", None, False, False, False)
libPrefix = None

for arg in sys.argv:
if arg.startswith("--with-libprefix="):
libPrefix = arg.replace("--with-libprefix=", "")
break

app = CarlaApplication("Carla2-Settings", libPrefix)
host = initHost("Carla2-Settings", libPrefix, False, False, False)
loadHostSettings(host)

gui = CarlaSettingsW(None, host, True, True)


Loading…
Cancel
Save