Compiling again

1 files changed, 18 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index 0582435..7420f0b 100755
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,19 @@
 #!/usr/bin/make -f
 
-CPPFLAGS=-Wall -g -O3 -mcpu=i686 -Werror -Iincludes `sdl-config --cflags` -DHAVE_ZLIB
-LDFLAGS=-lz `sdl-config --libs`
+CPPFLAGS=-Wall -g -O3 -mcpu=i686 -pedantic -Iincludes `sdl-config --cflags` -DHAVE_ZLIB `baltisot-config --cflags`
+LDFLAGS=-lz `sdl-config --libs` `baltisot-config --libs`
 CXX=g++
 
-SUBDIRS = psxdev generic lib Xenogears VP MegamanX5 ToD
-TARGET = lzss dlzss cd-tool str-player crypto-search bgrep dte-tool tile-convert
+SUBDIRS = psxdev lib Xenogears VP MegamanX5
+TARGET = lzss dlzss cd-tool str-player crypto-search bgrep tile-convert
 
 all: subdirs ${TARGET}
 
 subdirs:
 	for d in ${SUBDIRS} ; do make -C $$d || exit -1 ; done
 
-lzss: includes/lzss.h includes/generic.h lzss-main.o generic/generic.a lib/lib.a Makefile
-	${CXX} -DLZSS_MAIN lzss-main.o lib/lib.a generic/generic.a -o lzss ${LDFLAGS}
+lzss: includes/lzss.h lzss-main.o lib/lib.a Makefile
+	${CXX} -DLZSS_MAIN lzss-main.o lib/lib.a -o lzss ${LDFLAGS}
 
 dlzss: lzss Makefile
 	ln -fs lzss dlzss
@@ -21,23 +21,23 @@ dlzss: lzss Makefile
 yazedc: yazedc-main.o lib/lib.a Makefile
 	${CXX} yazedc-main.o lib/lib.a -DYAZEDC_MAIN -o yazedc ${LDFLAGS}
 
-cd-tool: includes/cdutils.h includes/generic.h includes/yazedc.h cd-tool.o lib/lib.a generic/generic.a Makefile
-	${CXX} cd-tool.o lib/lib.a generic/generic.a -o cd-tool ${LDFLAGS}
+cd-tool: includes/cdutils.h includes/yazedc.h cd-tool.o lib/lib.a Makefile
+	${CXX} cd-tool.o lib/lib.a -o cd-tool ${LDFLAGS}
 
-dte-tool: includes/generic.h includes/dte.h dtemain.o lib/lib.a generic/generic.a Makefile
-	${CXX} dtemain.o lib/lib.a generic/generic.a -o dte-tool ${LDFLAGS}
+dte-tool: includes/dte.h dtemain.o lib/lib.a Makefile
+	${CXX} dtemain.o lib/lib.a -o dte-tool ${LDFLAGS}
 
-str-player: str-player.o includes/generic.h includes/cdutils.h includes/yazedc.h lib/lib.a generic/generic.a psxdev/psxdev.a Makefile
-	${CXX} str-player.o psxdev/psxdev.a lib/lib.a generic/generic.a -o str-player ${LDFLAGS}
+str-player: str-player.o includes/cdutils.h includes/yazedc.h lib/lib.a psxdev/psxdev.a Makefile
+	${CXX} str-player.o psxdev/psxdev.a lib/lib.a -o str-player ${LDFLAGS}
 
-crypto-search: crypto-search.o includes/generic.h lib/lib.a generic/generic.a Makefile
-	${CXX} crypto-search.o lib/lib.a generic/generic.a -o crypto-search ${LDFLAGS}
+crypto-search: crypto-search.o lib/lib.a Makefile
+	${CXX} crypto-search.o lib/lib.a -o crypto-search ${LDFLAGS}
 
-bgrep: bgrep.o includes/generic.h generic/generic.a Makefile
-	${CXX} bgrep.o generic/generic.a -o bgrep ${LDFLAGS}
+bgrep: bgrep.o Makefile
+	${CXX} bgrep.o -o bgrep ${LDFLAGS}
 
-tile-convert: tile-convert.o generic/generic.a Makefile
-	${CXX} tile-convert.o generic/generic.a -o tile-convert ${LDFLAGS}
+tile-convert: tile-convert.o Makefile
+	${CXX} tile-convert.o -o tile-convert ${LDFLAGS}
 
 clean:
 	for d in ${SUBDIRS} ; do make -C $$d clean || exit -1 ; done