Updating makefiles to add luapatch, and updating things a bit for PS2 target.

4 files changed, 10 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 2d71ef1..8da1790 100755
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-CPPFLAGS=-Wall -g -O3 -mcpu=i686 -Iincludes `sdl-config --cflags` -DHAVE_ZLIB `baltisot-config --cflags` `lua-config --include` -DCHATTING
+CPPFLAGS=-Wall -g -O3 -mcpu=i686 -Iincludes -Ipsxdev `sdl-config --cflags` -DHAVE_ZLIB `baltisot-config --cflags` `lua-config --include` -DCHATTING
 LDFLAGS=-lz `sdl-config --libs` `baltisot-config --libs` -lefence
 CDTOOL_LDFLAGS=`baltisot-config --libs` -lreadline -g
 CXX=g++
diff --git a/compile/Makefile b/compile/Makefile
index cf0364e..31a2883 100644
--- a/compile/Makefile
+++ b/compile/Makefile
@@ -11,7 +11,10 @@ rebuild: clean all
 
 release: all
 	-ssh sumarit rm /var/www/cd-tool/*
+	-ssh sumarit rm /var/www/luapatch/*
 	scp cd-tool*.zip sumarit:/var/www/cd-tool
 	scp ../FAQ-cd.txt sumarit:/var/www/cd-tool/README.txt
 	scp ../COPYING sumarit:/var/www/cd-tool
 	scp *.lua sumarit:/var/www/cd-tool
+	scp luapatch* sumarit:/var/www/luapatch
+	scp ../README-LuaPatch.txt sumarit:/var/www/luapatch/README.txt
diff --git a/compile/win32/Makefile b/compile/win32/Makefile
index f64d651..09a4eb1 100644
--- a/compile/win32/Makefile
+++ b/compile/win32/Makefile
@@ -104,15 +104,15 @@ LUAPATCH_OBJECTS = $(addsuffix .o, $(notdir $(basename $(COMMON_SOURCES)))) luap
 
 LUAPATCH_DEP = $(addsuffix .dep, $(notdir $(basename $(COMMON_SOURCES)))) luapatch.dep
 
-all: dep cd-tool.exe Dalos.exe luapatch.exe
+all: cd-tool.exe luapatch.exe
 
 stats:
 	@wc $(WHOLE_SOURCES)
 
-dist: all README-SDL.txt SDL.dll ../../cd-tool.lua ../../COPYING ../../FAQ-cd.txt
+dist: all ../../cd-tool.lua ../../COPYING ../../FAQ-cd.txt ../../README-LuaPatch.txt # README-SDL.txt SDL.dll
 	zip -j9 ../cd-tool-`date +%Y%m%d`-win32.zip cd-tool.exe ../../cd-tool.lua ../../FAQ-cd.txt ../../COPYING
-	zip -j9 ../Dalos-`date +%Y%m%d`-win32.zip Dalos.exe ../../COPYING README-SDL.txt SDL.dll
-	zip -j9 ../luapatch-`date +%Y%m%d`.zip luapatch.exe ../../FAQ-cd.txt ../../COPYING
+	#zip -j9 ../Dalos-`date +%Y%m%d`-win32.zip Dalos.exe ../../COPYING README-SDL.txt SDL.dll
+	zip -j9 ../luapatch-`date +%Y%m%d`.zip luapatch.exe ../../FAQ-cd.txt ../../COPYING ../../README-LuaPatch.txt
 
 Dalos.exe: $(DALOS_OBJECTS)
 	$(LD) $(LDFLAGS) -o Dalos.exe $(DALOS_OBJECTS) -lmingw32 -L/usr/local/cross-tools/i386-mingw32msvc/lib -lmingw32 -lSDLmain -lSDL -mwindows -lopengl32 -lglu32 ../../libreadline-static.a
@@ -127,15 +127,13 @@ cd-tool.exe: $(CD_TOOL_OBJECTS)
 
 luapatch.exe: $(LUAPATCH_OBJECTS)
 	i586-mingw32msvc-windres -I ../../ ../../luapatch.rc luapatch-res.o
-	$(LD) $(LDFLAGS) -o luapatch.exe $(LUAPATCH_OBJECTS) luapatch-res.o -mwindows
+	$(LD) $(LDFLAGS) -o luapatch.exe $(LUAPATCH_OBJECTS) luapatch-res.o -mconsole -lcomdlg32
 	$(STRIP) luapatch.exe
 	upx-nrv -9 luapatch.exe
 
 clean:
 	rm -f *.exe *.o *.dep
 
-dep: $(ALL_DEP)
-
 source: dep $(COMMON_SOURCES) ../../cd-tool.cpp
 	for s in $(COMMON_SOURCES) ../../cd-tool.cpp ; do \
 	    depfile=$${s/*\//} ; \
@@ -152,17 +150,11 @@ source: dep $(COMMON_SOURCES) ../../cd-tool.cpp
 define OBJECT_C_template
  $(addsuffix .o, $(notdir $(basename $(1)))): $(src)
 	$$(CC) $$(CPPFLAGS) $$(CFLAGS) -c $(src)
-
- $(addsuffix .dep, $(notdir $(basename $(1)))): $(src)
-	$$(CC) $$(CPPFLAGS) $$(CFLAGS) -MM $(src) -o $$@
 endef
 
 define OBJECT_CXX_template
  $(addsuffix .o, $(notdir $(basename $(1)))): $(src)
 	$$(CXX) $$(CPPFLAGS) $$(CXXFLAGS) -c $(src)
-
- $(addsuffix .dep, $(notdir $(basename $(1)))): $(src)
-	$$(CXX) $$(CPPFLAGS) $$(CXXFLAGS) -MM $(src) -o $$@
 endef
 
 $(foreach src, $(WHOLE_SOURCES), $(if $(filter %.c, $(src)), $(eval $(call OBJECT_C_template, $(src))), $(eval $(call OBJECT_CXX_template, $(src)))))
diff --git a/luapatch.rc b/luapatch.rc
index 406c3ec..467ec6b 100644
--- a/luapatch.rc
+++ b/luapatch.rc
@@ -141,9 +141,7 @@ END
 

 IDD_FILESELECT DLGINIT

 BEGIN

-    IDC_SOURCETYPE, 0x403, 6, 0

-0x7771, 0x2065, 0x002e, 

-    0

+    IDC_SOURCETYPE, 0x403, 6, 0, 0x7771, 0x2065, 0x002e, 0

 END

 

 #endif    // Neutral resources