git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b573148
)
added uninstaller
author
kramm
<kramm>
Tue, 10 Jun 2008 10:46:38 +0000
(10:46 +0000)
committer
kramm
<kramm>
Tue, 10 Jun 2008 10:46:38 +0000
(10:46 +0000)
installer/Makefile
patch
|
blob
|
history
installer/installer.h
patch
|
blob
|
history
diff --git
a/installer/Makefile
b/installer/Makefile
index
c5220aa
..
2f67a59
100644
(file)
--- 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
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
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
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
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
$(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
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) $@
$(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
#upx -9 --best $@ 2>/dev/null || true
#installer.exe: installer.c depack.o archive.o depack.h crnfiles.o installer.coff Makefile
diff --git
a/installer/installer.h
b/installer/installer.h
index
13dba0f
..
efe5ad4
100644
(file)
--- a/
installer/installer.h
+++ b/
installer/installer.h
@@
-6,16
+6,16
@@
#define IDD_EXTRAFILES 1106
#define IDD_DEINSTALLED 1107
#define IDD_EXTRAFILES 1106
#define IDD_DEINSTALLED 1107
-#define IDC_ALLUSERS 1201
-#define IDC_CURRENTUSER 1202
+#define IDC_ALLUSERS 1012
+#define IDC_CURRENTUSER 1013
-#define IDC_SPACE1 1301
-#define IDC_SPACE2 1302
+#define IDC_SPACE1 1032
+#define IDC_SPACE2 1033
#define IDC_TITLE 1002
#define IDC_LICENSE 1003
#define IDC_TITLE 1002
#define IDC_LICENSE 1003
-#define IDC_FILELIST 1004
-#define IDC_BITMAP 1005
+#define IDC_FILELIST 1003
+#define IDC_BITMAP 1004
#define IDC_PATH 1006
#define IDC_INSTALL_PATH 1007
#define IDC_PROGRESS 1008
#define IDC_PATH 1006
#define IDC_INSTALL_PATH 1007
#define IDC_PROGRESS 1008