diff options
| author | das <das> | 2004-11-19 06:50:49 (GMT) |
|---|---|---|
| committer | das <das> | 2004-11-19 06:50:49 (GMT) |
| commit | dc2613890d0253f195b0dccf6af059eee96868cc (patch) | |
| tree | f527d63b0fc695b8f1407227286bc2317b60bbaf | |
| parent | add1aca2f48860b05af5ee9e0edf5eb152e17899 (diff) | |
| download | tk-dc2613890d0253f195b0dccf6af059eee96868cc.zip tk-dc2613890d0253f195b0dccf6af059eee96868cc.tar.gz tk-dc2613890d0253f195b0dccf6af059eee96868cc.tar.bz2 | |
* macosx/Wish.pbproj/project.pbxproj: reverted earlier changes for
tclConfig.h changes to tcl, since those have been reverted for now.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | macosx/Wish.pbproj/project.pbxproj | 9 |
2 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2004-11-19 Daniel Steffen <das@users.sourceforge.net> + + * macosx/Wish.pbproj/project.pbxproj: reverted earlier changes for + tclConfig.h changes to tcl, since those have been reverted for now. + + Note that newly added macosx/Wish.xcode will not work without + tclConfig.h, this project has not been removed again. + 2004-11-18 Reinhard Max <max@suse.de> * unix/tcl.m4 (SC_CONFIG_MANPAGES): Applied an improved version of diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj index 5b26acd..e2c1bc3 100644 --- a/macosx/Wish.pbproj/project.pbxproj +++ b/macosx/Wish.pbproj/project.pbxproj @@ -1874,11 +1874,12 @@ DYLIB_INSTALL_PATH = /Library/Frameworks; FRAMEWORK_SEARCH_PATHS = "\"$(TCL_FRAMEWORK_DIR)\""; FRAMEWORK_VERSION = 8.5; + GLOBAL_CFLAGS = "`source \"${TCL_FRAMEWORK_DIR}/Tcl.framework/tclConfig.sh\"; echo $${}{TCL_EXTRA_CFLAGS} $${}{TCL_DEFS} | sed -e 's|\\\\\\\\\\\\\\\"|\\\"|g' | sed -e 's| -DTCL_WIDE_INT_TYPE=long. long||'` -U_REENTRANT"; HEADER_SEARCH_PATHS = "\"$(TCL_FRAMEWORK_DIR)/Tcl.framework/Headers\" \"$(TCL_FRAMEWORK_DIR)/Tcl.framework/PrivateHeaders\" . ../bitmaps ../generic ../xlib"; INSTALL_PATH = "${DYLIB_INSTALL_PATH}"; LIBRARY_SEARCH_PATHS = ""; OPTIMIZATION_CFLAGS = "-O0"; - OTHER_CFLAGS = "-DMAC_OSX_TK -DHAVE_TCL_CONFIG_H"; + OTHER_CFLAGS = "-DMAC_OSX_TK -DTCL_WIDE_INT_TYPE=\"long long\""; OTHER_LDFLAGS = "-seg1addr 0xb000000"; OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = "-i \"$(TCL_FRAMEWORK_DIR)/Tcl.framework/Headers\" -i \"../generic\""; @@ -3276,11 +3277,12 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright  DYLIB_INSTALL_PATH = /Library/Frameworks; FRAMEWORK_SEARCH_PATHS = "\"$(TCL_FRAMEWORK_DIR)\" \"$(SYMROOT)\""; FRAMEWORK_VERSION = 8.5; + GLOBAL_CFLAGS = "`source \"${TCL_FRAMEWORK_DIR}/Tcl.framework/tclConfig.sh\"; echo $${}{TCL_EXTRA_CFLAGS} $${}{TCL_DEFS} | sed -e 's|\\\\\\\\\\\\\\\"|\\\"|g' | sed -e 's| -DTCL_WIDE_INT_TYPE=long. long||'` -U_REENTRANT"; HEADER_SEARCH_PATHS = "\"$(TCL_FRAMEWORK_DIR)/Tcl.framework/Headers\" \"$(TCL_FRAMEWORK_DIR)/Tcl.framework/PrivateHeaders\" . ../generic ../xlib"; INSTALL_PATH = "${APPLICATION_INSTALL_PATH}"; LIBRARY_SEARCH_PATHS = ""; OPTIMIZATION_CFLAGS = "-O0"; - OTHER_CFLAGS = "-DMAC_OSX_TK -DHAVE_TCL_CONFIG_H"; + OTHER_CFLAGS = "-DMAC_OSX_TK -DTCL_WIDE_INT_TYPE=\"long long\""; OTHER_LDFLAGS = "-sectcreate __TEXT __info_plist \"$TEMP_DIR/Info.plist\" -headerpad_max_install_names"; OTHER_REZFLAGS = "-i \"$(TCL_FRAMEWORK_DIR)/Tcl.framework/Headers\" -i \"../generic\""; PRODUCT_NAME = "Wish Shell"; @@ -3467,10 +3469,11 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright  F59D847903390D7E016F146B, ); buildSettings = { + GLOBAL_CFLAGS = "`source \"${TCL_FRAMEWORK_DIR}/Tcl.framework/tclConfig.sh\"; echo $${}{TCL_EXTRA_CFLAGS} $${}{TCL_DEFS} | sed -e 's|\\\\\\\\\\\\\\\"|\\\"|g' | sed -e 's| -DTCL_WIDE_INT_TYPE=long. long||'` -U_REENTRANT"; HEADER_SEARCH_PATHS = "\"$(TCL_FRAMEWORK_DIR)/Tcl.framework/Headers\" \"$(TCL_FRAMEWORK_DIR)/Tcl.framework/PrivateHeaders\" . ../generic ../xlib"; LIBRARY_STYLE = STATIC; OPTIMIZATION_CFLAGS = "-O0"; - OTHER_CFLAGS = "-DMAC_OSX_TK -DHAVE_TCL_CONFIG_H"; + OTHER_CFLAGS = "-DMAC_OSX_TK -DTCL_WIDE_INT_TYPE=\"long long\""; OTHER_LDFLAGS = ""; OTHER_LIBTOOL_FLAGS = ""; PRODUCT_NAME = libtkstub8.5.a; |