diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-10 12:56:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-10 12:56:47 (GMT) |
| commit | 8b33d96e332e6b6f4fdf21b5e2d63b77882427c0 (patch) | |
| tree | 9c39978681530a1166dcad1aab6e6606f6108a54 /win | |
| parent | 4b09c8069342a28c88f72b12d9d128e80c848081 (diff) | |
| download | tcl-8b33d96e332e6b6f4fdf21b5e2d63b77882427c0.zip tcl-8b33d96e332e6b6f4fdf21b5e2d63b77882427c0.tar.gz tcl-8b33d96e332e6b6f4fdf21b5e2d63b77882427c0.tar.bz2 | |
Make TIP #430 work on cygwin. Simplify some makefiles
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 4 | ||||
| -rw-r--r-- | win/makefile.vc | 11 |
2 files changed, 0 insertions, 15 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index b5b4f26..cdaeec4 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -654,10 +654,6 @@ tclMainW.${OBJEXT}: tclMain.c # TIP #430, ZipFS Support tclZipfs.${OBJEXT}: $(GENERIC_DIR)/tclZipfs.c $(CC) -c $(CC_SWITCHES) -DBUILD_tcl \ - -DCFG_RUNTIME_PATH="\"$(bindir_native)\"" \ - -DCFG_RUNTIME_DLLFILE="\"$(TCL_DLL_FILE)\"" \ - -DCFG_RUNTIME_LIBDIR="\"$(bindir_native)\"" \ - -DCFG_RUNTIME_SCRDIR="\"$(TCL_LIBRARY_NATIVE)\"" \ $(ZLIB_INCLUDE) -I$(MINIZIP_DIR_NATIVE) @DEPARG@ $(CC_OBJNAME) diff --git a/win/makefile.vc b/win/makefile.vc index a124b34..49a82d2 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -807,19 +807,8 @@ $(TMP_DIR)\tclTestObj.obj: $(GENERICDIR)\tclTestObj.c $(TMP_DIR)\tclWinTest.obj: $(WIN_DIR)\tclWinTest.c
$(CCAPPCMD) $?
-# Following the lead of the autoconf based make, we define the
-# CFG_RUNTIME_DLLFILE flag specifically for tclZipfs and tclPkgConfig
-# and not as part of the global defines. Moreover, for tclZipfs,
-# we define only CFG_RUNTIME_DLLFILE to force use of //zipfs:
-# as the zip fs root. However it is defined as empty. See tclPkgConfig.obj
-# comments as to why.
-# We do not define other CFG_RUNTIME_ZIPFILE at all because
-# that causes the zipfs code to go looking at directories that existed
-# on the *build* system as opposed to the target runtime system. This
-# is the case even if the value is defined as an empty string.
$(TMP_DIR)\tclZipfs.obj: $(GENERICDIR)\tclZipfs.c
$(cc32) $(pkgcflags) \
- -DCFG_RUNTIME_DLLFILE="\"\"" \
-I$(COMPATDIR)\zlib -I$(COMPATDIR)\zlib\contrib\minizip \
-Fo$@ $?
|