Commit b1d41af8 authored by Thomas Guillem's avatar Thomas Guillem

build: simplify windows handling

parent 9acfd02e
...@@ -111,14 +111,12 @@ NDK_TOOLCHAIN_PATH=${NDK_TOOLCHAIN_DIR}/bin ...@@ -111,14 +111,12 @@ NDK_TOOLCHAIN_PATH=${NDK_TOOLCHAIN_DIR}/bin
CROSS_TOOLS=${NDK_TOOLCHAIN_PATH}/${TARGET_TUPLE}- CROSS_TOOLS=${NDK_TOOLCHAIN_PATH}/${TARGET_TUPLE}-
export PATH="${NDK_TOOLCHAIN_PATH}:${PATH}" export PATH="${NDK_TOOLCHAIN_PATH}:${PATH}"
ON_WINDOWS=0 NDK_BUILD=$ANDROID_NDK/ndk-build
if [ ! -z "$MSYSTEM_PREFIX" ] ; then if [ ! -z "$MSYSTEM_PREFIX" ] ; then
# The make.exe and awk.exe from the toolchain don't work in msys # The make.exe and awk.exe from the toolchain don't work in msys
export PATH="$MSYSTEM_PREFIX/bin:/usr/bin:${NDK_TOOLCHAIN_PATH}:${PATH}" export PATH="$MSYSTEM_PREFIX/bin:/usr/bin:${NDK_TOOLCHAIN_PATH}:${PATH}"
ON_WINDOWS=1 NDK_BUILD=$NDK_BUILD.cmd
OSCMD=.cmd
fi fi
NDK_BUILD=$ANDROID_NDK/ndk-build$OSCMD
########## ##########
# CFLAGS # # CFLAGS #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment