X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=installer%2FMakefile;h=73725f2b402961c04eadac77207829986c1be53e;hb=71161b31b57fe6863ce8e43cd481ed105520c32e;hp=2f67a59d7bb8ed37bc7f37b83832d23fa488b8cb;hpb=efb080322ba506eaf050bab5b48bddd9d1c9fec2;p=swftools.git

diff --git a/installer/Makefile b/installer/Makefile
index 2f67a59..73725f2 100644
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -9,11 +9,13 @@ all: files1.exe files2.exe uninstall.exe mkarchive
 LIBS=-lgdi32 -lshlwapi -lcomctl32 -lshell32 -lole32 -luuid
 
 files1.c: ../win32/*.exe mkarchive
+	cp uninstall.exe ../win32/
 	CWD=`pwd`
 	cd ../win32;../installer/mkarchive `find`
 	mv ../win32/crnfiles.c ./files1.c
 
 files2.c: ../win32_gui/*.exe ../win32_gui/*.swf mkarchive
+	cp uninstall.exe ../win32_gui/
 	CWD=`pwd`
 	cd ../win32_gui;../installer/mkarchive `find`
 	mv ../win32_gui/crnfiles.c ./files2.c
@@ -54,13 +56,13 @@ lzma/LzmaDecode.o: lzma/LzmaDecode.c lzma/LzmaDecode.h lzma/LzmaTypes.h
 uninstall.exe: uninstaller.o utils.o installer.coff Makefile
 	$(CC) uninstaller.o utils.o installer.coff -o $@ $(LIBS)
 	$(STRIP) $@
-	#./makegui $@
+	./makegui $@
+	#upx -9 --best $@ 2>/dev/null || true
 
 %.exe: %.o installer.o license.o archive.o utils.o lzma/LzmaDecode.o installer.coff Makefile
 	$(CC) installer.o license.o utils.o archive.o lzma/LzmaDecode.o installer.coff $< -o $@ $(LIBS)
 	$(STRIP) $@
-	#./makegui $@
-	#upx -9 --best $@ 2>/dev/null || true
+	./makegui $@
 
 #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)