From adefd9f83608e732cd1e01912dc72bf4d2a1d1e3 Mon Sep 17 00:00:00 2001
From: David Griffith <dave@661.org>
Date: Sat, 26 Sep 2015 01:58:36 -0700
Subject: [PATCH] Makefile tweaks and fix wrapper so we really can find
 libvldp2.so in $PWD.

---
 daphne                      | 2 +-
 src/Makefile                | 3 ++-
 src/Makefile.vars.linux_x64 | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/daphne b/daphne
index c71b447..fe84009 100755
--- a/daphne
+++ b/daphne
@@ -5,7 +5,7 @@ echo "Daphne Launcher : Script dir is $SCRIPT_DIR"
 cd "$SCRIPT_DIR"
 
 # point to our linked libs that user may not have
-export LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH
 
 # try to run daphne
 ./daphne.bin "$@"
diff --git a/src/Makefile b/src/Makefile
index 1905de2..c0d0302 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -54,7 +54,8 @@ endif
 
 
 # Platform specific cflags defined in the Makefile.vars file
-export CFLAGS = ${PFLAGS} ${DEFINE_STATIC_VLDP} ${DEFINE_STATIC_SINGE} -Wall -Werror
+#export CFLAGS = ${PFLAGS} ${DEFINE_STATIC_VLDP} ${DEFINE_STATIC_SINGE} -Wall -Werror
+export CFLAGS = ${PFLAGS} ${DEFINE_STATIC_VLDP} ${DEFINE_STATIC_SINGE} -Wall
 
 OBJS = ldp-out/*.o cpu/*.o game/*.o io/*.o timer/*.o ldp-in/*.o video/*.o \
 	sound/*.o daphne.o cpu/x86/*.o scoreboard/*.o ${SINGE_OBJS} ${VLDP_OBJS} 
diff --git a/src/Makefile.vars.linux_x64 b/src/Makefile.vars.linux_x64
index f4558f2..bf8ebca 100644
--- a/src/Makefile.vars.linux_x64
+++ b/src/Makefile.vars.linux_x64
@@ -22,8 +22,8 @@ DFLAGS = -O3 -fexpensive-optimizations -funroll-loops -fPIC
 
 # platform-specific compile flags 
 # Add -DBUILD_SINGE to enable SINGE
-PFLAGS = ${DFLAGS} `sdl-config --cflags` -DUNIX -DLINUX \ 
-        -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DUSE_OPENGL -DBUILD_SINGE
+PFLAGS = ${DFLAGS} `sdl-config --cflags` -DUNIX -DLINUX \
+	-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DUSE_OPENGL -DBUILD_SINGE
 
 # platform-specific lib flags 
-LIBS = `sdl-config --libs` -ldl -lz -logg -lvorbis -lvorbisfile -lGLEW
+LIBS = `sdl-config --libs` -ldl -lz -logg -lvorbis -lvorbisfile -lGLEW -lGL