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

diff --git a/installer/Makefile b/installer/Makefile
index c5220aa..2f67a59 100644
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -1,10 +1,10 @@
-CC=/opt/xmingw/bin/i386-mingw32msvc-gcc -DWIN32
+CC=/opt/xmingw/bin/i386-mingw32msvc-gcc -DWIN32 -Wno-trigraphs
 STRIP=/opt/xmingw/bin/i386-mingw32msvc-strip 
 WINDRES=/opt/xmingw/bin/i386-mingw32msvc-windres
 
 LICENSE=gpl.c
 
-all: files1.exe files2.exe mkarchive
+all: files1.exe files2.exe uninstall.exe mkarchive
 
 LIBS=-lgdi32 -lshlwapi -lcomctl32 -lshell32 -lole32 -luuid
 
@@ -33,22 +33,33 @@ crnfiles2.o: crnfiles2.c
 archive.o: archive.c archive.c
 	$(CC) -c archive.c -o archive.o
 
+utils.o: utils.c utils.c
+	$(CC) -c utils.c -o utils.o
+
 license.o: $(LICENSE)
 	$(CC) -c $< -o license.o
 
-installer.o: installer.c installer.h archive.h ../lib/os.h
+installer.o: installer.c installer.h archive.h
 	$(CC) -c installer.c -o installer.o
 
+uninstaller.o: installer.c installer.h
+	$(CC) -DDEINSTALL -c installer.c -o uninstaller.o
+
 installer.coff: installer.rc swftools.ico installer.h
 	$(WINDRES) installer.rc -O coff -F pe-i386 -o installer.coff
 
 lzma/LzmaDecode.o: lzma/LzmaDecode.c lzma/LzmaDecode.h lzma/LzmaTypes.h
 	$(CC) -c lzma/LzmaDecode.c -o lzma/LzmaDecode.o
 
-%.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)
+uninstall.exe: uninstaller.o utils.o installer.coff Makefile
+	$(CC) uninstaller.o utils.o installer.coff -o $@ $(LIBS)
+	$(STRIP) $@
+	#./makegui $@
+
+%.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 $@
+	#./makegui $@
 	#upx -9 --best $@ 2>/dev/null || true
 
 #installer.exe: installer.c depack.o archive.o depack.h crnfiles.o installer.coff Makefile