From c58180f016f9ed2826af11b2ba6ef3eeffdc043a Mon Sep 17 00:00:00 2001 From: Jonathan Campbell Date: Sat, 21 Nov 2020 22:31:30 -0800 Subject: [PATCH] configure.ac uses the system FreeType, forcing CFLAGS to include our internal copy will only cause problems --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 5d22e1c15..33117b56f 100644 --- a/configure.ac +++ b/configure.ac @@ -400,10 +400,10 @@ fi pwd=`realpath $srcdir` if [[ -z "$pwd" ]]; then pwd=`pwd`; fi -CFLAGS="$CFLAGS -I$pwd -I$pwd/vs2015/sdlnet/linux-host/include -I$pwd/vs2015/sdlnet/linux-host/include/SDL -I$pwd/vs2015/freetype/include" +CFLAGS="$CFLAGS -I$pwd -I$pwd/vs2015/sdlnet/linux-host/include -I$pwd/vs2015/sdlnet/linux-host/include/SDL" LDFLAGS="$LDFLAGS -L$pwd/vs2015/sdlnet/linux-host/lib" -CPPFLAGS="$CPPFLAGS -I$pwd -I$pwd/vs2015/sdlnet/linux-host/include -I$pwd/vs2015/sdlnet/linux-host/include/SDL -I$pwd/vs2015/freetype/include" -CXXFLAGS="$CXXFLAGS -I$pwd -I$pwd/vs2015/sdlnet/linux-host/include -I$pwd/vs2015/sdlnet/linux-host/include/SDL -I$pwd/vs2015/freetype/include" +CPPFLAGS="$CPPFLAGS -I$pwd -I$pwd/vs2015/sdlnet/linux-host/include -I$pwd/vs2015/sdlnet/linux-host/include/SDL" +CXXFLAGS="$CXXFLAGS -I$pwd -I$pwd/vs2015/sdlnet/linux-host/include -I$pwd/vs2015/sdlnet/linux-host/include/SDL" dnl LIBRARY TEST: SDLnet initial test AC_CHECK_HEADER(SDL_net.h,have_sdl_net_h=yes,)