make cleanup, remove wrapper script no longer needed, ignore more stuff

Author: Jeffrey Clark

.gitignore

@@ -1,9 +1,10 @@
 *.o
-daphne.bin
+/daphne*
+/testvldp*
 .deps
 *.d
 *.so
 *.a
 *.res
-roms/*.zip
+roms
 src/Makefile.vars

daphne

@@ -37,7 +37,7 @@ endif
 # send these to all the sub-Makefiles
 
 # name of the executable and dynamic libraries
-EXE_BASE = daphne.bin
+EXE_BASE = daphne
 ifeq ($(OS),Windows_NT)
   EXE_EXT = .exe
 endif
@@ -97,7 +97,7 @@ clean:	clean_deps
 	$(SILENT)rm -f ${LIB_SINGE}
 
 testvldp:	testvldp.c
-	${CC} ${CFLAGS} -DSHOW_FRAMES -DUSE_OVERLAY testvldp.c ${VLDP_OBJS} ${LIBS} -o ../testvldp
+	${CC} ${CFLAGS} -DSHOW_FRAMES -DUSE_OVERLAY testvldp.c ${VLDP_OBJS} ${LIBS} -o ../testvldp$(EXE_EXT)
 
 %.d : %.cpp
 	$(GEN_MSG)

src/Makefile

@@ -5,12 +5,12 @@ export CXX=g++
 export CC=gcc 
 
 # debugging version 
-DFLAGS = -ggdb -DDEBUG -DVLDP_DEBUG # -DCPU_DEBUG 
+#DFLAGS = -ggdb -DDEBUG -DVLDP_DEBUG # -DCPU_DEBUG 
 
 # optimized version 
 # NOTE : gcc 3.x has a bug that causes compilation to choke on m80.cpp 
 # If you want to -DGCC_X86_ASM for extra speed, you have to use g++ 3.0 or earlier 
-#DFLAGS = -O3 -fexpensive-optimizations -funroll-loops -fPIC 
+DFLAGS = -O3 -fexpensive-optimizations -funroll-loops -fomit-frame-pointer
 
 # this is to be exported for MMX assembly optimization 
 #export USE_MMX = 1 

src/Makefile.vars.linux_x64

@@ -18,13 +18,12 @@ DFLAGS = -O3 -march=i686 -fomit-frame-pointer \
 export USE_MMX = 1
 
 # uncomment these to link VLDP statically instead of dynamically
-#export STATIC_SINGE = 1
+export BUILD_SINGE = 1
 
 # platform-specific compile flags
-# Add -DBUILD_SINGE to enable SINGE
-PFLAGS = ${DFLAGS} `sdl-config --cflags` -DUNIX -DLINUX -DNATIVE_CPU_X86 \
-	-DUSE_MMX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DUSE_OPENGL -DBUILD_SINGE
+PFLAGS = ${DFLAGS} $(shell sdl-config --cflags) -DUNIX -DLINUX -DNATIVE_CPU_X86 \
+	-DUSE_MMX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DUSE_OPENGL
 
 
 # platform-specific lib flags
-LIBS = `sdl-config --libs` -ldl -lz -logg -lvorbis -lvorbisfile -lGLEW
+LIBS = $(shell sdl-config --libs) -ldl -lz -logg -lvorbis -lvorbisfile -lGLEW

src/Makefile.vars.linux_x86

@@ -11,13 +11,13 @@ export CROSS=1
 # optimized version 
 # NOTE : gcc 3.x has a bug that causes compilation to choke on m80.cpp 
 # If you want to -DGCC_X86_ASM for extra speed, you have to use g++ 3.0 or earlier 
-DFLAGS = -O3 -fexpensive-optimizations -funroll-loops
+DFLAGS = -O3 -fexpensive-optimizations -funroll-loops -fomit-frame-pointer
 
 # this is to be exported for MMX assembly optimization 
 #export USE_MMX = 1 
 
 # uncomment to include singe support
-#export BUILD_SINGE = 1
+export BUILD_SINGE = 1
 
 # platform-specific compile flags 
 PFLAGS = ${DFLAGS} $(shell $(TOOLCHAIN)-sdl-config --cflags) -DWIN32 -DNATIVE_CPU_X86 \

src/Makefile.vars.mingw_x64

@@ -1,4 +1,4 @@
-#include "vldp3/vldp.h"	// VLDP stuff
+#include "vldp/vldp.h"	// VLDP stuff
 #include "io/dll.h"	// for DLL stuff
 #include "video/yuv2rgb.h"	// to bypass SDL's yuv overlay and do it ourselves ...