about summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2000-08-16 13:23:37 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2000-08-16 13:23:37 +0000
commitc0ab630768a09d54d15d2f4af026049fe46f3b90 (patch)
tree62d71e5765177fd5d260225f8548bad466919e3f /Src
parent505a3e3a30cf660f6b1d719915444a590b7a7ed2 (diff)
downloadzsh-c0ab630768a09d54d15d2f4af026049fe46f3b90.tar.gz
zsh-c0ab630768a09d54d15d2f4af026049fe46f3b90.tar.xz
zsh-c0ab630768a09d54d15d2f4af026049fe46f3b90.zip
pws/Andrej: 12594, 12661: Windows resources and icon
Diffstat (limited to 'Src')
-rw-r--r--Src/Makefile.in9
-rw-r--r--Src/zsh.icobin0 -> 766 bytes
-rw-r--r--Src/zsh.rc8
3 files changed, 15 insertions, 2 deletions
diff --git a/Src/Makefile.in b/Src/Makefile.in
index 7ddddeb9b..440254005 100644
--- a/Src/Makefile.in
+++ b/Src/Makefile.in
@@ -78,14 +78,19 @@ NNTRYOBJ   =
 LDRUNPATH = LD_RUN_PATH=$(libdir)/$(tzsh)
 NDRUNPATH =
 
-zsh$(EXEEXT): $(@L@IBZSH) $(@L@STMP) $(MAIN_OBJS) zsh.export
+EXTRAZSHOBJS = @EXTRAZSHOBJS@
+
+zsh$(EXEEXT): $(@L@IBZSH) $(@L@STMP) $(MAIN_OBJS) zsh.export $(EXTRAZSHOBJS)
 	rm -f $@
-	$(@L@DRUNPATH) $(LINK) $(MAIN_OBJS) $(@L@LIST) $(ZSH_@E@XPORT) $(@L@IBZSH) $(LIBS)
+	$(@L@DRUNPATH) $(LINK) $(MAIN_OBJS) $(EXTRAZSHOBJS) $(@L@LIST) $(ZSH_@E@XPORT) $(@L@IBZSH) $(LIBS)
 
 $(LIBZSH): $(LIBOBJS) $(NSTMP)
 	rm -f $@
 	$(DLLINK) $(LIBOBJS) $(NLIST) $(LIBS)
 
+zsh.res.o: $(sdir)/zsh.rc $(sdir)/zsh.ico
+	windres -O coff --include-dir $(sdir) -i $(sdir)/zsh.rc -o zsh.res.o
+
 stamp-modobjs: modobjs
 	@if cmp -s stamp-modobjs.tmp stamp-modobjs; then \
 	    rm -f stamp-modobjs.tmp; \
diff --git a/Src/zsh.ico b/Src/zsh.ico
new file mode 100644
index 000000000..64d822211
--- /dev/null
+++ b/Src/zsh.ico
Binary files differdiff --git a/Src/zsh.rc b/Src/zsh.rc
new file mode 100644
index 000000000..93c82ba1f
--- /dev/null
+++ b/Src/zsh.rc
@@ -0,0 +1,8 @@
+// Use this file as follows
+//
+// myapp.exe : myapp.o myapp.res
+// 	   gcc -mwindows myapp.o myapp.res -o $@
+// 
+// myapp.res : myapp.rc resource.h
+// 	   windres $< -O coff -o $@
+IDR_MAINFRAME           ICON    DISCARDABLE     "zsh.ico"