Makefile tweaks and fix wrapper so we really can find libvldp2.so in …

…$PWD.
DavidGriffith · Sep 26, 2015 · adefd9f · adefd9f
1 parent 6f12146
commit adefd9f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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