Arrange to build the tclkit resources for windows.

git-svn-id: svn://svn.equi4.com/kitgen/trunk@1736 9e558909-932a-0410-a563-af77432da1eb

diff --git a/Makefile b/Makefile
index 21ca2d813c560b2fe3bd580090c84692d9065e41..93913a58697161364b00384b40858691007f8ac1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ configs:
        sh config.sh 8.4/kit-small cli dyn
        sh config.sh 8.5/base-std thread
        sh config.sh 8.5/kit-large aqua univ thread allenc allmsgs tzdata
-       
+
 small: configs
        cd 8.4/kit-small && $(MAKE) && $(MAKE) clean
 

diff --git a/config.sh b/config.sh
index 5ecdcb9492a3cf2c24c89113df110f2b644093c4..4a9f302013aef1b1684e35ed2416fdf6bf1effb1 100755 (executable)
--- a/config.sh
+++ b/config.sh
@@ -88,8 +88,9 @@ case $cli-$dyn-$gui in 0-0-0) cli=1 dyn=1 gui=1 ;; esac
       echo 'GUI_OPTS   = -lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32'
       echo 'GUI_OPTS  += -lole32 -loleaut32 -luuid'
       echo 'GUI_OPTS  += build/tk/wish.res.o -mwindows'
-      echo 'DYNOBJ     = $(CLIOBJ) $(OUTDIR)/tk/wish.res.o'
-      echo 'GUIOBJ     = $(OBJ) $(OUTDIR)/winMain.o $(OUTDIR)/tk/wish.res.o'
+      echo 'CLIOBJ     = $(OBJ) $(OUTDIR)/tclAppInit.o $(OUTDIR)/tclkitsh.res.o'
+      echo 'DYNOBJ     = $(CLIOBJ) $(OUTDIR)/tkdyn/wish.res.o'
+      echo 'GUIOBJ     = $(OBJ) $(OUTDIR)/winMain.o $(OUTDIR)/tclkit.res.o'
       echo 'PRIV       = install-private-headers'
       echo 'EXE        = .exe'
       plat=win

diff --git a/makefile.include b/makefile.include
index 386d6cdf218b2ec6ab1519f4408637cf478234ab..b0738294a545a0366d341ec245be05eabbc10b16 100644 (file)
--- a/makefile.include
+++ b/makefile.include
@@ -15,43 +15,47 @@
 EXTDIR = ../../../../8.x
 STATIC = --disable-shared
 OUTDIR = $(shell pwd)/build
-OBJ    = $(OUTDIR)/pwb.o $(OUTDIR)/rechan.o $(OUTDIR)/zlib.o
-CLIOBJ = $(OBJ) $(OUTDIR)/tclAppInit.o
+OBJ    = $(OUTDIR)/pwb$O $(OUTDIR)/rechan$O $(OUTDIR)/zlib$O
+CLIOBJ ?= $(OBJ) $(OUTDIR)/tclAppInit$O
 DYNOBJ ?= $(CLIOBJ)
 GUIOBJ ?= $(CLIOBJ)
 TCLDIR = --with-tcl=../lib --prefix=$(OUTDIR) --exec-prefix=$(OUTDIR)
 STRIP ?= strip
+UPX   ?= :
+O     ?=.o
+A     ?=.a
+SO    ?=.so
 
 tclkit-cli$(EXE): kit-cli$(EXE) ../../setupvfs.tcl build/files
-       cp kit-cli$(EXE) $@ && $(STRIP) $@
+       cp kit-cli$(EXE) $@ && $(STRIP) $@ && $(UPX) $@
        ./kit-cli -init- ../../setupvfs.tcl $(KIT_OPTS) $@ cli
 
-tclkit-dyn$(EXE): kit-dyn$(EXE) build/tkdyn ../../setupvfs.tcl build/files
-       cp kit-dyn$(EXE) $@ && $(STRIP) $@
+tclkit-dyn$(EXE): kit-dyn$(EXE) ../../setupvfs.tcl build/files
+       cp kit-dyn$(EXE) $@ && $(STRIP) $@ $@ && $(UPX) $@
        ./kit-cli -init- ../../setupvfs.tcl $(KIT_OPTS) $@ dyn
 
 tclkit-gui$(EXE): kit-cli$(EXE) kit-gui$(EXE) ../../setupvfs.tcl build/files
-       cp kit-gui$(EXE) $@ && $(STRIP) $@
+       cp kit-gui$(EXE) $@ && $(STRIP) $@ && $(UPX) $@
        ./kit-cli -init- ../../setupvfs.tcl $(KIT_OPTS) $@ gui
 
 kit-cli$(EXE): build/tcl build/tclvfs build/vqtcl build/zlib $(CLIOBJ)
        $(CC) -o $@ $(CFLAGS) ../../kitInit.c $(CLIOBJ) \
          -Ibuild/include -DKIT_LITE -DSTATIC_BUILD \
-         build/lib/vfs1*/*vfs1*.a build/lib/vqtcl4*/*vqtcl4*.a \
-         build/lib/libz.a build/lib/libtcl8*.a $(LDFLAGS)
+         build/lib/vfs1*/*vfs1*$A build/lib/vqtcl4*/*vqtcl4*$A \
+         build/lib/libz$A build/lib/*tcl8*$A $(LDFLAGS)
 
-kit-dyn$(EXE): build/tcl build/tclvfs build/vqtcl build/zlib $(CLIOBJ)
+kit-dyn$(EXE): build/tcl build/tclvfs build/vqtcl build/zlib build/tkdyn $(CLIOBJ)
        $(CC) -o $@ $(CFLAGS) ../../kitInit.c $(DYNOBJ) \
          -Ibuild/include -DKIT_LITE -DSTATIC_BUILD \
-         build/lib/vfs1*/*vfs1*.a build/lib/vqtcl4*/*vqtcl4*.a \
-         build/lib/libz.a build/lib/libtcl8*.a $(LDFLAGS)
+         build/lib/vfs1*/*vfs1*$A build/lib/vqtcl4*/*vqtcl4*$A \
+         build/lib/libz$A build/lib/*tcl8*$A $(LDFLAGS)
 
 kit-gui$(EXE): build/tcl build/tk build/tclvfs build/vqtcl build/zlib $(GUIOBJ)
        $(CC) -o $@ $(CFLAGS) ../../kitInit.c $(GUIOBJ) \
          -Ibuild/include -DKIT_LITE -DSTATIC_BUILD \
-         build/lib/vfs1*/*vfs1*.a build/lib/vqtcl4*/*vqtcl4*.a \
-         -DKIT_INCLUDES_TK build/lib/libtk8*.a \
-         build/lib/libz.a build/lib/libtcl8*.a $(LDFLAGS) $(GUI_OPTS)
+         build/lib/vfs1*/*vfs1*$A build/lib/vqtcl4*/*vqtcl4*$A \
+         -DKIT_INCLUDES_TK build/lib/libtk8*$A \
+         build/lib/libz$A build/lib/*tcl8*$A $(LDFLAGS) $(GUI_OPTS)
 
 build/files:
        mkdir -p $@ && cd $@ && ln -s ../../../../files/* .
@@ -76,7 +80,7 @@ build/tk: build/tcl
 build/tkdyn: build/tcl
        mkdir -p $@ && cd $@ && CFLAGS="$(CFLAGS)" && export CFLAGS && \
          sh ../../../tk/$(PLAT)/configure $(TCLDIR) $(TKDYN_OPTS) && \
-         $(MAKE) binaries && $(STRIP) $(LDSTRIP) libtk8.* && \
+         $(MAKE) binaries && $(STRIP) $(LDSTRIP) *tk8*$(SO) && \
          $(MAKE) install-binaries install-libraries
 
 build/tclvfs: build/tcl
@@ -111,19 +115,30 @@ distclean: clean
 
 .PHONY: all base clean distclean threaded tidy
 
-$(OUTDIR)/pwb.o:  ../../pwb.c
+$(OUTDIR)/pwb$O:  ../../pwb.c
        $(CC) -o $@ $(CFLAGS) -DSTATIC_BUILD -Ibuild/include -c $<
 
-$(OUTDIR)/rechan.o: ../../rechan.c
+$(OUTDIR)/rechan$O: ../../rechan.c
        $(CC) -o $@ $(CFLAGS) -DSTATIC_BUILD -Ibuild/include -c $<
 
-$(OUTDIR)/zlib.o: ../../zlib.c
+$(OUTDIR)/zlib$O: ../../zlib.c
        $(CC) -o $@ $(CFLAGS) -DSTATIC_BUILD -Ibuild/include -c $<
 
-$(OUTDIR)/tclAppInit.o: ../tcl/$(PLAT)/tclAppInit.c
+$(OUTDIR)/tclAppInit$O: ../tcl/$(PLAT)/tclAppInit.c
        $(CC) -o $@ $(CFLAGS) -DSTATIC_BUILD -Ibuild/include \
          -DTCL_LOCAL_APPINIT=TclKit_AppInit -c $<
 
-$(OUTDIR)/winMain.o: ../tk/$(PLAT)/winMain.c
+$(OUTDIR)/winMain$O: ../tk/$(PLAT)/winMain.c
        $(CC) -o $@ $(CFLAGS) -DSTATIC_BUILD -Ibuild/include \
          -DTK_LOCAL_APPINIT=TclKit_AppInit -c $<
+
+$(OUTDIR)/tclkit.res.o: ../../tclkit.rc
+       cp $< build/tk/tclkit.rc
+       windres -o $@ --define STATIC_BUILD --define TCLKIT_WITH_TK \
+         --define BASE_NO_TK_ICON --include build/include \
+         --include build/tk --include ../../files --include ../tk/win/rc \
+         build/tk/tclkit.rc
+
+$(OUTDIR)/tclkitsh.res.o: ../../tclkit.rc
+       windres -o $@ --define STATIC_BUILD --include build/include \
+         --include ../../files $<