Commits

Tuukka Norri  committed 33a02b3

Fixed configuration files for subprojects, removed the use of a Mac OS X 10.6 -specific API

  • Participants
  • Parent commits be7d995

Comments (0)

Files changed (10)

File BaseTenAppKit/Sources/BXMultipleChoicePredicateEditorRowTemplate.mm

 	NSPopUpButton *optionsButton = [retval objectAtIndex: 2];
 	NSMenu *optionsMenu = [optionsButton menu];
 	
-	[optionsMenu removeAllItems];
+	for (NSInteger i = 0, count = [optionsMenu numberOfItems]; i < count; i++)
+		[optionsMenu removeItemAtIndex: 0];
+	
 	if ([mOptions count])
 	{
 		for (NSExpression *currentExp in mRightExpressions)

File BaseTenAppKit/xcconfig/common.xcconfig

-#include "../../common-xcconfig/MacOSX10.5-6.xcconfig"
 #include "../../common-xcconfig/common.xcconfig"
 #include "../../common-xcconfig/framework.xcconfig"
 
+ARCHS = ppc ppc64 i386 x86_64
 DYLIB_COMPATIBILITY_VERSION = 1
 DYLIB_CURRENT_VERSION = 1
+FRAMEWORK_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR) ../build/$(BUILD_STYLE)
 FRAMEWORK_VERSION = A
+GCC_PREFIX_HEADER = Sources/BaseTenAppKit_Prefix.pch
+HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)
 INFOPLIST_FILE = Info.plist
+LIBRARY_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)
 PRODUCT_NAME = BaseTenAppKit
-FRAMEWORK_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR) ../build/$(BUILD_STYLE)
-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)
-LIBRARY_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)
 USER_HEADER_SEARCH_PATHS = $(PROJECT_DIR)
-GCC_PREFIX_HEADER = Sources/BaseTenAppKit_Prefix.pch
-ARCHS = ppc ppc64 i386 x86_64

File BaseTenAppKit/xcconfig/debug-gc.xcconfig

 #include "../../common-xcconfig/gc.xcconfig"
 #include "../../common-xcconfig/debug.xcconfig"
+#include "../../common-xcconfig/MacOSX10.5-6-gcc.xcconfig"
 #include "common.xcconfig"

File BaseTenAppKit/xcconfig/debug-non-gc.xcconfig

 #include "../../common-xcconfig/non-gc.xcconfig"
 #include "../../common-xcconfig/debug.xcconfig"
+#include "../../common-xcconfig/MacOSX10.5-6-gcc.xcconfig"
 #include "common.xcconfig"

File BaseTenAppKit/xcconfig/release-gc.xcconfig

 #include "../../common-xcconfig/gc.xcconfig"
 #include "../../common-xcconfig/release.xcconfig"
+#include "../../common-xcconfig/MacOSX10.5-6-gcc.xcconfig"
 #include "common.xcconfig"
 
 INSTALL_PATH = @executable_path/../Frameworks

File BaseTenAppKit/xcconfig/release-non-gc.xcconfig

 #include "../../common-xcconfig/non-gc.xcconfig"
 #include "../../common-xcconfig/release.xcconfig"
+#include "../../common-xcconfig/MacOSX10.5-6-gcc.xcconfig"
 #include "common.xcconfig"
 
 INSTALL_PATH = @executable_path/../Frameworks

File InterfaceBuilderPlugin/xcconfig/common.xcconfig

 #include "../../common-xcconfig/common.xcconfig"
-#include "../../common-xcconfig/MacOSX10.5.xcconfig"
-#include "../../common-xcconfig/gc.xcconfig"
 
+ARCHS = ppc i386 x86_64
+FRAMEWORK_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR) ../build/$(BUILD_STYLE) $(DEVELOPER_FRAMEWORKS_DIR_QUOTED)
+GCC_PREFIX_HEADER = Sources/InterfaceBuilderPlugin_Prefix.pch
+HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)
 INFOPLIST_FILE = Info.plist
+LIBRARY_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)
 PRODUCT_NAME = BaseTen
+USER_HEADER_SEARCH_PATHS = $(PROJECT_DIR)
 WRAPPER_EXTENSION = ibplugin
-FRAMEWORK_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR) ../build/$(BUILD_STYLE) $(DEVELOPER_FRAMEWORKS_DIR_QUOTED)
-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)
-LIBRARY_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)
-USER_HEADER_SEARCH_PATHS = $(PROJECT_DIR)
-GCC_PREFIX_HEADER = Sources/InterfaceBuilderPlugin_Prefix.pch
-ARCHS = ppc i386 x86_64

File InterfaceBuilderPlugin/xcconfig/debug.xcconfig

+#include "../../common-xcconfig/gc.xcconfig"
 #include "../../common-xcconfig/debug.xcconfig"
+#include "../../common-xcconfig/MacOSX10.5-6-gcc.xcconfig"
 #include "common.xcconfig"

File InterfaceBuilderPlugin/xcconfig/release.xcconfig

+#include "../../common-xcconfig/gc.xcconfig"
 #include "../../common-xcconfig/release.xcconfig"
+#include "../../common-xcconfig/MacOSX10.5-6-gcc.xcconfig"
 #include "common.xcconfig"

File xcconfig/common.xcconfig

 FRAMEWORK_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR) $(BUILD_DIR)/Release
 FRAMEWORK_VERSION = A
 GCC_PREFIX_HEADER = Sources/BaseTen_Prefix.pch
+HEADER_SEARCH_PATHS  = $(BUILT_PRODUCTS_DIR) $(BUILD_DIR)/Release/BaseTen-PostgreSQL/universal/postgresql $(BUILD_DIR)/Release/BaseTen-PostgreSQL/universql/postgresql/internal $(BUILD_DIR)/Release/BaseTen-PostgreSQL/universal/postgresql/server $(BUILD_DIR)/Release/BaseTen-PostgreSQL/universal/postgresql/server/libpq $(BUILD_DIR)/Release/BaseTen-PostgreSQL/universal/postgresql/postgresql $(BUILD_DIR)/Release/BaseTen-PostgreSQL/universal/postgresql/postgresql/internal $(BUILD_DIR)/Release/BaseTen-PostgreSQL/universal/postgresql/postgresql/server $(BUILD_DIR)/Release/BaseTen-PostgreSQL/universal/postgresql/postgresql/server/libpq .
 INFOPLIST_FILE = Resources/Info.plist
-HEADER_SEARCH_PATHS  = $(BUILT_PRODUCTS_DIR) $(BUILD_DIR)/Release/BaseTen-PostgreSQL/universal/postgresql $(BUILD_DIR)/Release/BaseTen-PostgreSQL/universql/postgresql/internal $(BUILD_DIR)/Release/BaseTen-PostgreSQL/universal/postgresql/server $(BUILD_DIR)/Release/BaseTen-PostgreSQL/universal/postgresql/server/libpq $(BUILD_DIR)/Release/BaseTen-PostgreSQL/universal/postgresql/postgresql $(BUILD_DIR)/Release/BaseTen-PostgreSQL/universal/postgresql/postgresql/internal $(BUILD_DIR)/Release/BaseTen-PostgreSQL/universal/postgresql/postgresql/server $(BUILD_DIR)/Release/BaseTen-PostgreSQL/universal/postgresql/postgresql/server/libpq .
 LIBRARY_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR) $(BUILD_DIR)/Release/BaseTen-pcre/universal/lib $(BUILD_DIR)/Release/BaseTen-PostgreSQL/universal/lib .
 OTHER_LDFLAGS = $(COVERAGE_LDFLAGS) -ObjC -headerpad_max_install_names
 PRODUCT_NAME = BaseTen