diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-09-28 18:57:25 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-09-28 18:57:25 (GMT) |
commit | d2edfcf2bd90298d02756daff2a473a3eebcd2ee (patch) | |
tree | 2cbba2917cd81a2d7a627fcff480ae2c6ae25adf /win/makefile.vc | |
parent | b4ae859604d0075ae30c40a35126efb600e3abc9 (diff) | |
parent | 3f2c2080ccdce8f6f42a62651cc0e53cb2d8dba9 (diff) | |
download | tcl-d2edfcf2bd90298d02756daff2a473a3eebcd2ee.zip tcl-d2edfcf2bd90298d02756daff2a473a3eebcd2ee.tar.gz tcl-d2edfcf2bd90298d02756daff2a473a3eebcd2ee.tar.bz2 |
Merge 8.7
Diffstat (limited to 'win/makefile.vc')
-rw-r--r-- | win/makefile.vc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 2ee6811..0e009bb 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -236,6 +236,7 @@ COREOBJS = \ $(TMP_DIR)\tclUtf.obj \
$(TMP_DIR)\tclUtil.obj \
$(TMP_DIR)\tclVar.obj \
+ $(TMP_DIR)\tclZipfs.obj \
$(TMP_DIR)\tclZlib.obj
ZLIBOBJS = \
@@ -686,6 +687,9 @@ $(TMP_DIR)\tclTestObj.obj: $(GENERICDIR)\tclTestObj.c $(TMP_DIR)\tclWinTest.obj: $(WINDIR)\tclWinTest.c
$(CCAPPCMD) $?
+$(TMP_DIR)\tclZipfs.obj: $(GENERICDIR)\tclZipfs.c
+ $(cc32) $(pkgcflags) -I$(COMPATDIR)\zlib -I$(COMPATDIR)\zlib\contrib\minizip -Fo$@ $?
+
$(TMP_DIR)\tclZlib.obj: $(GENERICDIR)\tclZlib.c
$(cc32) $(pkgcflags) -I$(COMPATDIR)\zlib -Fo$@ $?
@@ -701,6 +705,8 @@ $(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c -DCFG_RUNTIME_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \
-DCFG_RUNTIME_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \
-DCFG_RUNTIME_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\"" \
+ -DCFG_RUNTIME_DLLFILE="\"$(CFG_RUNTIME_DLLFILE:\=\\)\"" \
+ -DCFG_RUNTIME_ZIPFILE="\"$(CFG_RUNTIME_ZIPFILE:\=\\)\"" \
-Fo$@ $?
$(TMP_DIR)\tclAppInit.obj: $(WINDIR)\tclAppInit.c
|