From 7a613e6b7b03072168f790858cb83dd9fd38f0f6 Mon Sep 17 00:00:00 2001 From: Tom Rothamel Date: Wed, 4 Jul 2018 12:44:58 -0400 Subject: [PATCH] Use os.pathsep to split RENPY_DEPS_INSTALL. (If :: is not given.) Fixes #1499. --- README.rst | 7 ++++--- module/setuplib.py | 7 ++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index b817f13220..3dc0589e2e 100644 --- a/README.rst +++ b/README.rst @@ -76,10 +76,11 @@ Then, install pygame_sdl2 by running the following commands:: python setup.py install_headers popd -Next, set RENPY_DEPS_INSTALL To a \::-separated list of paths containing the -dependencies, and RENPY_CYTHON to the name of the cython command:: +Next, set RENPY_DEPS_INSTALL To a \:-separated (\;-separated on Windows) +list of paths containing the dependencies, and RENPY_CYTHON to the name +of the cython command:: - export RENPY_DEPS_INSTALL="/usr::/usr/lib/x86_64-linux-gnu/" + export RENPY_DEPS_INSTALL="/usr:/usr/lib/x86_64-linux-gnu/" export RENPY_CYTHON=cython Finally, use setup.py in the Ren'Py ``module`` directory to compile and diff --git a/module/setuplib.py b/module/setuplib.py index 348e6e70be..d070e917e7 100644 --- a/module/setuplib.py +++ b/module/setuplib.py @@ -58,7 +58,12 @@ # dependencies installed in them. if not (android or ios): install = os.environ.get("RENPY_DEPS_INSTALL", "/usr") - install = install.split("::") + + if "::" in install: + install = install.split("::") + else: + install = install.split(os.pathsep) + install = [ os.path.abspath(i) for i in install ] if "VIRTUAL_ENV" in os.environ: