joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 19:08:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

configure.ac uses the system FreeType, forcing CFLAGS to include our internal copy will only cause problems

Browse Source
This commit is contained in:
Jonathan Campbell
2020-11-21 22:31:30 -08:00
parent 90c981c4b8
commit c58180f016
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -400,10 +400,10 @@ fi
pwd=`realpath $srcdir` pwd=`realpath $srcdir`
if [[ -z "$pwd" ]]; then pwd=`pwd`; fi 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" 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" 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 -I$pwd/vs2015/freetype/include" 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 dnl LIBRARY TEST: SDLnet initial test
AC_CHECK_HEADER(SDL_net.h,have_sdl_net_h=yes,) AC_CHECK_HEADER(SDL_net.h,have_sdl_net_h=yes,)