X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=installer%2FMakefile;h=c5220aace14358994b31ba8b80a3976b08d7f6a2;hp=bf863d5e41bc344b0f3951d40d857540a62fd5a9;hb=f24703c3927ffb3dcf11da6e3a6df6fd0a26ad86;hpb=16371e9d6d4866a775c6871255c9841ffac3f55d

diff --git a/installer/Makefile b/installer/Makefile
index bf863d5..c5220aa 100644
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -2,35 +2,60 @@ CC=/opt/xmingw/bin/i386-mingw32msvc-gcc -DWIN32
 STRIP=/opt/xmingw/bin/i386-mingw32msvc-strip 
 WINDRES=/opt/xmingw/bin/i386-mingw32msvc-windres
 
-all: installer.exe
+LICENSE=gpl.c
 
-LIBS=-lgdi32 -lshlwapi -lcomctl32 -lshell32 -lole32
+all: files1.exe files2.exe mkarchive
 
-crnfiles.o: crnfiles.c
-	$(CC) -c crnfiles.c
+LIBS=-lgdi32 -lshlwapi -lcomctl32 -lshell32 -lole32 -luuid
 
-depack.o: depack.c depack.h Makefile
-	$(CC) -c depack.c -o depack.o
+files1.c: ../win32/*.exe mkarchive
+	CWD=`pwd`
+	cd ../win32;../installer/mkarchive `find`
+	mv ../win32/crnfiles.c ./files1.c
+
+files2.c: ../win32_gui/*.exe ../win32_gui/*.swf mkarchive
+	CWD=`pwd`
+	cd ../win32_gui;../installer/mkarchive `find`
+	mv ../win32_gui/crnfiles.c ./files2.c
+
+%.o: %.c
+	$(CC) -c $<
+
+mkarchive: mkarchive.c
+	gcc mkarchive.c -o mkarchive -lz
 
-archive.o: archive.c archive.c depack.h
+crnfiles1.o: crnfiles1.c
+crnfiles2.o: crnfiles2.c
+
+#depack.o: depack.c depack.h Makefile
+#	$(CC) -c depack.c -o depack.o
+
+archive.o: archive.c archive.c
 	$(CC) -c archive.c -o archive.o
 
-os.o: ../lib/os.c ../lib/os.h
-	$(CC) -c ../lib/os.c -o os.o
+license.o: $(LICENSE)
+	$(CC) -c $< -o license.o
+
+installer.o: installer.c installer.h archive.h ../lib/os.h
+	$(CC) -c installer.c -o installer.o
 
-installer.coff: installer.rc swftools.ico
+installer.coff: installer.rc swftools.ico installer.h
 	$(WINDRES) installer.rc -O coff -F pe-i386 -o installer.coff
 
-installer.exe: installer.c depack.o archive.o depack.h crnfiles.o os.o installer.coff Makefile
-	$(CC) installer.c depack.o archive.o crnfiles.o os.o installer.coff -o installer.exe $(LIBS)
-	$(STRIP) installer.exe
-	./makegui installer.exe
-	upx -9 --best installer.exe 2>/dev/null || true
+lzma/LzmaDecode.o: lzma/LzmaDecode.c lzma/LzmaDecode.h lzma/LzmaTypes.h
+	$(CC) -c lzma/LzmaDecode.c -o lzma/LzmaDecode.o
 
-crnfiles.c: ../win32/*.exe
-	CWD=`pwd`
-	cd ../win32;../installer/mkarchive `find`
-	mv ../win32/crnfiles.c ./
+%.exe: %.c installer.o license.o archive.o lzma/LzmaDecode.o installer.coff Makefile
+	$(CC) installer.o license.o archive.o lzma/LzmaDecode.o installer.coff $< -o $@ $(LIBS)
+	$(STRIP) $@
+	./makegui $@
+	#upx -9 --best $@ 2>/dev/null || true
+
+#installer.exe: installer.c depack.o archive.o depack.h crnfiles.o installer.coff Makefile
+#	$(CC) installer.c depack.o archive.o crnfiles.o installer.coff -o installer.exe $(LIBS)
+#	$(STRIP) installer.exe
+#	#./makegui installer.exe
+#	#upx -9 --best installer.exe 2>/dev/null || true
 
 clean:
-	rm -f installer.exe crnfiles.c *.o *.coff
+	rm -f installer.exe files*exe crnfiles.c *.o *.coff