77 lines
2.0 KiB
Diff
77 lines
2.0 KiB
Diff
Makefile | 2 +-
|
|
Makefile.in | 2 +-
|
|
configure | 6 +++---
|
|
configure.in | 6 +++---
|
|
4 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff -Naur a/configure b/configure
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -2219,7 +2219,7 @@
|
|
fi
|
|
done
|
|
|
|
-LIBS="$LIBS -L/usr/local/lib -L/usr/X11R6/lib"
|
|
+#LIBS="$LIBS -L/usr/local/lib -L/usr/X11R6/lib"
|
|
|
|
# Check whether --with-fb or --without-fb was given.
|
|
if test "${with_fb+set}" = set; then
|
|
@@ -2658,8 +2658,8 @@
|
|
fi
|
|
|
|
if test "$SDL_CONFIG" ; then
|
|
-SDL_LIBS="`sdl-config --libs` -lSDL_image -lSDL_ttf"
|
|
-SDL_CFLAGS="`sdl-config --cflags` -lSDL -lSDL_image -lSDL_ttf"
|
|
+SDL_LIBS="`$SDL_CONFIG --libs` -lSDL_image -lSDL_ttf"
|
|
+SDL_CFLAGS="`$SDL_CONFIG --cflags` -lSDL -lSDL_image -lSDL_ttf"
|
|
old_incs="$INCS"
|
|
INCS="$INCS $SDL_CFLAGS"
|
|
echo "$as_me:2662: checking for SDL_Init in -lSDL" >&5
|
|
diff -Naur a/configure.in b/configure.in
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -21,7 +21,7 @@
|
|
|
|
|
|
|
|
-LIBS="$LIBS -L/usr/local/lib -L/usr/X11R6/lib"
|
|
+#LIBS="$LIBS -L/usr/local/lib -L/usr/X11R6/lib"
|
|
|
|
|
|
|
|
@@ -79,8 +79,8 @@
|
|
if test "$with_sdl" != "no" ; then
|
|
AC_CHECK_PROG(SDL_CONFIG, sdl-config, yes)
|
|
if test "$SDL_CONFIG" ; then
|
|
-SDL_LIBS="`sdl-config --libs`"
|
|
-SDL_CFLAGS="`sdl-config --cflags`"
|
|
+SDL_LIBS="`$SDL_CONFIG --libs`"
|
|
+SDL_CFLAGS="`$SDL_CONFIG --cflags`"
|
|
old_incs="$INCS"
|
|
INCS="$INCS $SDL_CFLAGS"
|
|
AC_CHECK_LIB(SDL, SDL_Init, [
|
|
diff -Naur a/Makefile b/Makefile
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -18,7 +18,7 @@
|
|
|
|
SYS_DEFS = -DHAVE_CONFIG_H -DIS_LITTLE_ENDIAN -DIS_LINUX
|
|
SYS_OBJS = sys/nix/nix.o $(ASM_OBJS)
|
|
-SYS_INCS = -I/usr/local/include -I./sys/nix
|
|
+SYS_INCS = -I./sys/nix
|
|
|
|
FB_OBJS = sys/linux/joy.o sys/oss/oss.o
|
|
FB_LIBS =
|
|
diff -Naur a/Makefile.in b/Makefile.in
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -18,7 +18,7 @@
|
|
|
|
SYS_DEFS = @DEFS@ @ENDIAN@ @ASM@ @SYS_DEFS@
|
|
SYS_OBJS = sys/nix/nix.o $(ASM_OBJS)
|
|
-SYS_INCS = -I/usr/local/include @XINCS@ -I./sys/nix
|
|
+SYS_INCS = @XINCS@ -I./sys/nix
|
|
|
|
FB_OBJS = @FB_OBJS@ @JOY@ @SOUND@
|
|
FB_LIBS =
|