Added a built-in cd-tool.lua feature.

1 files changed, 14 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index a76fd9d..050208f 100755
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 #!/usr/bin/make -f
 
 CPPFLAGS=-Wall -g -O3 -mcpu=i686 -Iincludes `sdl-config --cflags` -DHAVE_ZLIB `baltisot-config --cflags` `lua-config --include` -DCHATTING
-LDFLAGS=-lz `sdl-config --libs` `baltisot-config --libs` -lefence
+LDFLAGS=-lz `sdl-config --libs` `baltisot-config --libs`
 CDTOOL_LDFLAGS=`baltisot-config --libs` -lreadline
 CXX=g++
 
 #SUBDIRS = psxdev lib Xenogears VP MegamanX5
 SUBDIRS = psxdev lib PE Xenogears
-TARGET = lzss dlzss cd-tool str-player crypto-search bgrep tile-convert mipspoke
+TARGET = lzss dlzss cd-tool str-player crypto-search bgrep tile-convert mipspoke bin2c
 
 all: subdirs ${TARGET}
 
@@ -23,7 +23,15 @@ 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/yazedc.h cd-tool.o lib/lib.a  psxdev/psxdev.a Makefile
+cd-tool.o: cd-tool.cpp cd-tool-hc.h
+
+cd-tool-hc.h: bin2c cd-tool.bin
+	./bin2c cd-tool.bin cd-tool-hc.h cd_tool_lua
+
+cd-tool.bin: cd-tool.lua
+	luac -s -o cd-tool.bin cd-tool.lua
+
+cd-tool: includes/cdutils.h includes/yazedc.h cd-tool.o lib/lib.a psxdev/psxdev.a Makefile
 	${CXX} cd-tool.o lib/lib.a psxdev/psxdev.a -o cd-tool ${CDTOOL_LDFLAGS}
 
 dte-tool: includes/dte.h dtemain.o lib/lib.a Makefile
@@ -44,6 +52,9 @@ bgrep: bgrep.o Makefile
 tile-convert: tile-convert.o Makefile
 	${CXX} tile-convert.o -o tile-convert ${LDFLAGS}
 
+bin2c: bin2c.o Makefile
+	${CXX} bin2c.o -o bin2c ${LDFLAGS}
+
 clean:
 	for d in ${SUBDIRS} ; do make -C $$d clean || exit -1 ; done
 	rm -f *.o ${TARGET} compil.c