diff options
| author | das <das> | 2005-05-29 07:53:08 (GMT) |
|---|---|---|
| committer | das <das> | 2005-05-29 07:53:08 (GMT) |
| commit | 3333c6e5dcc9efdbd2a192b2a9a73717c30df453 (patch) | |
| tree | 44e527d3bdae31462b59624e1cc3f0d2f359b18b /macosx | |
| parent | 5fb9c2a1687f6f791b6ffe0fcb35456248bc0fdc (diff) | |
| download | tk-3333c6e5dcc9efdbd2a192b2a9a73717c30df453.zip tk-3333c6e5dcc9efdbd2a192b2a9a73717c30df453.tar.gz tk-3333c6e5dcc9efdbd2a192b2a9a73717c30df453.tar.bz2 | |
* unix/configure.in: added description of HAVE_XSS for autoheader.
* unix/configure: autoconf-2.59
* unix/tkConfig.h.in: autoheader-2.59
* macosx/Wish.pbproj/project.pbxproj:
* macosx/Wish.xcode/project.pbxproj: added missing FRAMEWORK defines
introduced with configure/make based build.
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/Wish.pbproj/project.pbxproj | 2 | ||||
| -rw-r--r-- | macosx/Wish.xcode/project.pbxproj | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj index fb758e1..c389ba3 100644 --- a/macosx/Wish.pbproj/project.pbxproj +++ b/macosx/Wish.pbproj/project.pbxproj @@ -1938,7 +1938,7 @@ INSTALL_PATH = "${DYLIB_INSTALL_PATH}"; LIBRARY_SEARCH_PATHS = "\"$(TCL_FRAMEWORK_DIR)/Tcl.framework\""; OPTIMIZATION_CFLAGS = "-O0"; - OTHER_CFLAGS = "-DMAC_OSX_TK -DUSE_TCL_STUBS -DTCL_WIDE_INT_TYPE=\"long long\""; + OTHER_CFLAGS = "-DMAC_OSX_TK -DUSE_TCL_STUBS -DTCL_WIDE_INT_TYPE=\"long long\" -DTK_FRAMEWORK -DTK_FRAMEWORK_VERSION=\\\\\\\"$(FRAMEWORK_VERSION)\\\\\\\""; OTHER_LDFLAGS = "-ltclstub${FRAMEWORK_VERSION} -seg1addr 0xb000000 -Wl,-search_paths_first -Wl,-unexported_symbols_list \"${TEMP_DIR}/tclstub.exp\""; OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = "-i \"$(TCL_FRAMEWORK_DIR)/Tcl.framework/Headers\" -i \"../generic\""; diff --git a/macosx/Wish.xcode/project.pbxproj b/macosx/Wish.xcode/project.pbxproj index fae189b..ce5d9ab 100644 --- a/macosx/Wish.xcode/project.pbxproj +++ b/macosx/Wish.xcode/project.pbxproj @@ -2475,7 +2475,7 @@ FRAMEWORK_SEARCH_PATHS = "$(TCL_FRAMEWORK_DIR)"; FRAMEWORK_VERSION = 8.5; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = "MAC_OSX_TK USE_TCL_STUBS HAVE_TCL_CONFIG_H"; + GCC_PREPROCESSOR_DEFINITIONS = "MAC_OSX_TK USE_TCL_STUBS HAVE_TCL_CONFIG_H TK_FRAMEWORK TK_FRAMEWORK_VERSION=\\\"$(FRAMEWORK_VERSION)\\\""; HEADER_SEARCH_PATHS = "$(TCL_FRAMEWORK_DIR)/Tcl.framework/Headers $(TCL_FRAMEWORK_DIR)/Tcl.framework/PrivateHeaders . ../bitmaps ../generic ../xlib"; INFOPLIST_FILE = "Tk-Info.plist"; INSTALL_PATH = "${DYLIB_INSTALL_PATH}"; |