diff --git a/scripts/activate.sh b/scripts/activate.sh index 1fdd6ee93..58c01b229 100755 --- a/scripts/activate.sh +++ b/scripts/activate.sh @@ -59,17 +59,17 @@ print("{}{}.{}".format(platform.python_implementation().lower(), *sys.version_in ')" export PYAV_VENV="$PYAV_ROOT/venvs/$PYAV_VENV_NAME" - if [[ ! -e "$PYAV_VENV/bin/python" ]]; then + if [[ ! -e "$PYAV_VENV/Scripts/python" ]]; then mkdir -p "$PYAV_VENV" virtualenv -p "$PYAV_PYTHON" "$PYAV_VENV" - "$PYAV_VENV/bin/pip" install --upgrade pip setuptools + "$PYAV_VENV/Scripts/pip" install --upgrade pip setuptools fi - if [[ -e "$PYAV_VENV/bin/activate" ]]; then - source "$PYAV_VENV/bin/activate" + if [[ -e "$PYAV_VENV/Scripts/activate" ]]; then + source "$PYAV_VENV/Scripts/activate" else # Not a virtualenv (perhaps a debug Python); lets manually "activate" it. - PATH="$PYAV_VENV/bin:$PATH" + PATH="$PYAV_VENV/Scripts:$PATH" fi fi diff --git a/setup.py b/setup.py index e4135425f..24d8dc025 100644 --- a/setup.py +++ b/setup.py @@ -411,7 +411,8 @@ def run(self): for i, ext in enumerate(self.distribution.ext_modules): if any(s.endswith('.pyx') for s in ext.sources): if is_msvc(): - ext.define_macros.append(('inline', '__inline')) + if ('inline', '__inline') not in ext.define_macros: + ext.define_macros.append(('inline', '__inline')) new_ext = cythonize( ext, compiler_directives=dict(