summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2005-05-29 07:53:55 (GMT)
committerdas <das>2005-05-29 07:53:55 (GMT)
commitd0e3916a80fb9b1e26c29121e4333cf7693ad6f2 (patch)
treee75abf859755910e00b497cac5fbd4ce8b635ec7
parent33d32ec4878523f43393ac96f5adc9f950fa3d4b (diff)
downloadtk-d0e3916a80fb9b1e26c29121e4333cf7693ad6f2.zip
tk-d0e3916a80fb9b1e26c29121e4333cf7693ad6f2.tar.gz
tk-d0e3916a80fb9b1e26c29121e4333cf7693ad6f2.tar.bz2
* macosx/Wish.pbproj/project.pbxproj: added missing FRAMEWORK defines
introduced with configure/make based build.
-rw-r--r--ChangeLog3
-rw-r--r--macosx/Wish.pbproj/project.pbxproj2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b25ba6..2dd8f91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2005-05-29 Daniel Steffen <das@users.sourceforge.net>
+ * macosx/Wish.pbproj/project.pbxproj: added missing FRAMEWORK defines
+ introduced with configure/make based build.
+
* macosx/tkMacOSXInit.c:
* macosx/tkMacOSXNotify.c: fixed warnings.
diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj
index 8534f1b..c28375d 100644
--- a/macosx/Wish.pbproj/project.pbxproj
+++ b/macosx/Wish.pbproj/project.pbxproj
@@ -1892,7 +1892,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}${TCL_DBGX} -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\"";