diff options
| author | andreas_kupries <akupries@shaw.ca> | 2009-11-10 23:36:19 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2009-11-10 23:36:19 (GMT) |
| commit | 952725c4a425e417260213b7400343a0f4a891e4 (patch) | |
| tree | ad1faa4d16b81d6e6a1785df13bfdfe624f49e5c /win | |
| parent | 55f7e0cf3aa4d25e8c0b84f1eb98b514a7160818 (diff) | |
| download | tk-952725c4a425e417260213b7400343a0f4a891e4.zip tk-952725c4a425e417260213b7400343a0f4a891e4.tar.gz tk-952725c4a425e417260213b7400343a0f4a891e4.tar.bz2 | |
* unix/Makefile.in: Partially reverted Don Porter's 2009-10-20
* win/Makefile.in: commit. The OSX Cocoa code branch still needs
tclInt.h and the internal headers, thus the TCL_PLATFORM
directory. See tclMacOSXNotify.c for example.
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 919ad26..c9c71c2 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.85 2009/10/21 20:28:52 nijtmans Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.86 2009/11/10 23:36:19 andreas_kupries Exp $ TCLVERSION = @TCL_VERSION@ TCLPATCHL = @TCL_PATCH_LEVEL@ @@ -96,6 +96,10 @@ TCL_BIN_DIR = @TCL_BIN_DIR@ # been replaced by the configure script): TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic +# The directory containing the platform specific Tcl sources and headers +# appropriate for this version of Tk: +TCL_PLATFORM_DIR = @TCL_SRC_DIR@/win + TCL_TOOL_DIR = @TCL_SRC_DIR@/tools # Converts a POSIX path to a Windows native path. @@ -122,6 +126,7 @@ BITMAP_DIR_NATIVE = $(ROOT_DIR_NATIVE)/bitmaps XLIB_DIR_NATIVE = $(ROOT_DIR_NATIVE)/xlib RC_DIR_NATIVE = $(WIN_DIR_NATIVE)/rc TCL_GENERIC_NATIVE = $(shell $(CYGPATH) '$(TCL_GENERIC_DIR)' | sed 's!\\!/!g') +TCL_PLATFORM_NATIVE = $(shell $(CYGPATH) '$(TCL_PLATFORM_DIR)' | sed 's!\\!/!g') TCL_SRC_DIR_NATIVE = $(shell $(CYGPATH) '$(TCL_SRC_DIR)' | sed 's!\\!/!g') DLLSUFFIX = @DLLSUFFIX@ @@ -208,7 +213,7 @@ TCL_EXE = @TCLSH_PROG@ CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ -I"${GENERIC_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \ -I"${XLIB_DIR_NATIVE}" -I"${BITMAP_DIR_NATIVE}" \ --I"${TCL_GENERIC_NATIVE}" ${AC_FLAGS} -DUSE_TCL_STUBS +-I"${TCL_GENERIC_NATIVE}" -I"${TCL_PLATFORM_NATIVE}" ${AC_FLAGS} -DUSE_TCL_STUBS CC_OBJNAME = @CC_OBJNAME@ CC_EXENAME = @CC_EXENAME@ @@ -666,7 +671,7 @@ tkWindow.$(OBJEXT): configure Makefile $(CC) -c $(CC_SWITCHES) -DBUILD_tk -DBUILD_ttk @DEPARG@ $(CC_OBJNAME) .rc.$(RES): - $(RC) @RC_OUT@ $@ @RC_TYPE@ @RC_DEFINES@ @RC_INCLUDE@ "$(GENERIC_DIR_NATIVE)" @RC_INCLUDE@ "$(TCL_GENERIC_NATIVE)" @RC_INCLUDE@ "$(RC_DIR_NATIVE)" @DEPARG@ + $(RC) @RC_OUT@ $@ @RC_TYPE@ @RC_DEFINES@ @RC_INCLUDE@ "$(GENERIC_DIR_NATIVE)" @RC_INCLUDE@ "$(TCL_GENERIC_NATIVE)" @RC_INCLUDE@ "$(TCL_PLATFORM_NATIVE)" @RC_INCLUDE@ "$(RC_DIR_NATIVE)" @DEPARG@ depend: |