Use cross-compile cpp, not system cpp, to find libs.

This commit is contained in:
Simon Howard 2016-12-29 18:58:03 +01:00
parent d75abef070
commit 9fd14604e5

View file

@ -252,7 +252,7 @@ autogen_module() {
have_header() { have_header() {
headerfile=$1 headerfile=$1
echo "#include <$headerfile>" | cpp $SDL_CFLAGS $CPPFLAGS > /dev/null echo "#include <$headerfile>" | $CPP $SDL_CFLAGS $CPPFLAGS > /dev/null
result=$? result=$?
@ -315,6 +315,7 @@ build_libpng=false
INSTALL_DIR=$CHOCOLATE_DOOM_DIR/install INSTALL_DIR=$CHOCOLATE_DOOM_DIR/install
INSTALL_COMMAND= INSTALL_COMMAND=
INSTALL_MESSAGE="Installing..." INSTALL_MESSAGE="Installing..."
CPP=cpp
GIT_CO_NAME=chocolate-doom-git GIT_CO_NAME=chocolate-doom-git
HOST_ARG= HOST_ARG=
@ -332,6 +333,7 @@ for arg in "$@"; do
;; ;;
-host=*) -host=*)
HOST_ARG="-$arg" HOST_ARG="-$arg"
CPP=${arg/-host=/}-cpp
# Build libraries from scratch when cross compiling: # Build libraries from scratch when cross compiling:
force_build_sdl=true force_build_sdl=true
;; ;;