summaryrefslogtreecommitdiffstats
path: root/macosx/Wish-Common.xcconfig
diff options
context:
space:
mode:
authordas <das>2008-03-11 22:33:21 (GMT)
committerdas <das>2008-03-11 22:33:21 (GMT)
commit1e1e566f937cdb6742040e51aa3a1f1f07518d86 (patch)
treeaf4a8a514a1fc2b14f82b0edd272568f0bbe444d /macosx/Wish-Common.xcconfig
parentde5c5f505cb34caac65e24f2f9b9f62e8982f440 (diff)
downloadtk-1e1e566f937cdb6742040e51aa3a1f1f07518d86.zip
tk-1e1e566f937cdb6742040e51aa3a1f1f07518d86.tar.gz
tk-1e1e566f937cdb6742040e51aa3a1f1f07518d86.tar.bz2
* macosx/GNUmakefile: fix quoting to allow paths to
* macosx/Wish-Common.xcconfig: ${builddir}, ${INSTALL_ROOT} * unix/Makefile.in: and ${TCL_BIN_DIR} to contain * unix/configure.in: spaces. * unix/install-sh: * unix/tcl.m4: * unix/Makefile.in (install-strip): strip non-global symbols from dynamic library.
Diffstat (limited to 'macosx/Wish-Common.xcconfig')
-rw-r--r--macosx/Wish-Common.xcconfig13
1 files changed, 7 insertions, 6 deletions
diff --git a/macosx/Wish-Common.xcconfig b/macosx/Wish-Common.xcconfig
index 59f9812..4736c2c 100644
--- a/macosx/Wish-Common.xcconfig
+++ b/macosx/Wish-Common.xcconfig
@@ -4,27 +4,28 @@
// This file contains the Xcode build settings comon to all
// project configurations in Wish.xcodeproj.
//
-// Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net>
+// Copyright (c) 2007-2008 Daniel A. Steffen <das@users.sourceforge.net>
//
// See the file "license.terms" for information on usage and redistribution
// of this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
-// RCS: @(#) $Id: Wish-Common.xcconfig,v 1.8 2007/12/13 15:27:08 dgp Exp $
+// RCS: @(#) $Id: Wish-Common.xcconfig,v 1.9 2008/03/11 22:33:22 das Exp $
//
-HEADER_SEARCH_PATHS = $(TK_SRCROOT)/generic $(TK_SRCROOT)/xlib $(DERIVED_FILE_DIR)/tcl $(DERIVED_FILE_DIR)/tk $(HEADER_SEARCH_PATHS)
+HEADER_SEARCH_PATHS = $(TK_SRCROOT)/generic $(TK_SRCROOT)/xlib "$(DERIVED_FILE_DIR)/tcl" "$(DERIVED_FILE_DIR)/tk" $(HEADER_SEARCH_PATHS)
REZ_SEARCH_PATHS = $(TK_SRCROOT)/generic $(TCL_SRCROOT)/generic $(REZ_SEARCH_PATHS)
-OTHER_LDFLAGS = -headerpad_max_install_names -sectcreate __TEXT __info_plist $(DERIVED_FILE_DIR)/tk/Wish-Info.plist $(OTHER_LDFLAGS)
-OTHER_LDFLAGS_AQUA = -sectcreate __TEXT __tk_rsrc $(REZ_COLLECTOR_DIR)/$(PRODUCT_NAME).rsrc
+OTHER_LDFLAGS = -headerpad_max_install_names -sectcreate __TEXT __info_plist "$(DERIVED_FILE_DIR)/tk/Wish-Info.plist" $(OTHER_LDFLAGS)
+OTHER_LDFLAGS_AQUA = -sectcreate __TEXT __tk_rsrc "$(REZ_COLLECTOR_DIR)/$(PRODUCT_NAME).rsrc"
INSTALL_PATH = "$(BINDIR)"
GCC_PREFIX_HEADER = $(DERIVED_FILE_DIR)/tk/tkConfig.h
-OTHER_CFLAGS = -imacros $(DERIVED_FILE_DIR)/tcl/tclConfig.h $(OTHER_CFLAGS)
+OTHER_CFLAGS = -imacros "$(DERIVED_FILE_DIR)/tcl/tclConfig.h" $(OTHER_CFLAGS)
GCC_GENERATE_DEBUGGING_SYMBOLS = YES
GCC_NO_COMMON_BLOCKS = YES
GCC_DYNAMIC_NO_PIC = YES
GCC = $(DEVELOPER_DIR)/usr/bin/gcc
GCC_VERSION = 4.0
CC = $(GCC)-$(GCC_VERSION)
+LD = $(CC)
WARNING_CFLAGS_GCC3 = -Wall -Wno-implicit-int -Wno-unused-parameter -Wno-deprecated-declarations
WARNING_CFLAGS = -Wextra -Wno-missing-field-initializers -Winit-self -Wpointer-arith -Wcast-align -Wdisabled-optimization -Winline $(WARNING_CFLAGS_GCC3) $(WARNING_CFLAGS)
REZ_RESOURCE_MAP_READ_ONLY = YES