Changeset 3762

Show
Ignore:
Timestamp:
10/15/07 08:48:52 (1 year ago)
Author:
timothy
Message:

Fix the build for Xcode 2.4

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Colloquy.xcodeproj/project.pbxproj

    r3760 r3762  
    44        classes = { 
    55        }; 
    6         objectVersion = 44; 
     6        objectVersion = 42; 
    77        objects = { 
    88 
    …… 
    31133113                                OTHER_LDFLAGS = "-lxml2"; 
    31143114                                PRODUCT_NAME = Colloquy; 
    3115                                 SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; 
    3116                                 "SDKROOT[arch=i386]" = /Developer/SDKs/MacOSX10.4u.sdk; 
    3117                                 "SDKROOT[arch=ppc]" = /Developer/SDKs/MacOSX10.4u.sdk; 
     3115                                SDKROOT_ = /Developer/SDKs/MacOSX10.4u.sdk; 
     3116                                SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk; 
     3117                                SDKROOT_ppc7400 = /Developer/SDKs/MacOSX10.4u.sdk; 
     3118                                SDKROOT_ppc970 = /Developer/SDKs/MacOSX10.4u.sdk; 
    31183119                                WRAPPER_EXTENSION = mdimporter; 
    31193120                        }; 
    …… 
    31283129                                OTHER_LDFLAGS = "-lxml2"; 
    31293130                                PRODUCT_NAME = Colloquy; 
    3130                                 SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; 
    3131                                 "SDKROOT[arch=i386]" = /Developer/SDKs/MacOSX10.4u.sdk; 
    3132                                 "SDKROOT[arch=ppc]" = /Developer/SDKs/MacOSX10.4u.sdk; 
     3131                                SDKROOT_ = /Developer/SDKs/MacOSX10.4u.sdk; 
     3132                                SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk; 
     3133                                SDKROOT_ppc7400 = /Developer/SDKs/MacOSX10.4u.sdk; 
     3134                                SDKROOT_ppc970 = /Developer/SDKs/MacOSX10.4u.sdk; 
    31333135                                WRAPPER_EXTENSION = mdimporter; 
    31343136                        }; 
    …… 
    32083210                                OTHER_LDFLAGS = "-lxml2"; 
    32093211                                PRODUCT_NAME = Colloquy; 
    3210                                 SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; 
    3211                                 "SDKROOT[arch=i386]" = /Developer/SDKs/MacOSX10.4u.sdk; 
    3212                                 "SDKROOT[arch=ppc]" = /Developer/SDKs/MacOSX10.4u.sdk; 
     3212                                SDKROOT_ = /Developer/SDKs/MacOSX10.4u.sdk; 
     3213                                SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk; 
     3214                                SDKROOT_ppc7400 = /Developer/SDKs/MacOSX10.4u.sdk; 
     3215                                SDKROOT_ppc970 = /Developer/SDKs/MacOSX10.4u.sdk; 
    32133216                                WRAPPER_EXTENSION = mdimporter; 
    32143217                        }; 

  • trunk/Settings/Common Settings.xcconfig

    r3755 r3762  
    1313GCC_ENABLE_OBJC_EXCEPTIONS = YES 
    1414GCC_FAST_MATH = YES 
    15 GCC_FAST_OBJC_DISPATCH = $(GCC_FAST_OBJC_DISPATCH[arch=$(CURRENT_ARCH)]) 
    16 GCC_FAST_OBJC_DISPATCH[arch=] = NO 
    17 GCC_FAST_OBJC_DISPATCH[arch=i386] = YES 
    18 GCC_FAST_OBJC_DISPATCH[arch=ppc64] = YES 
    19 GCC_FAST_OBJC_DISPATCH[arch=ppc7400] = NO 
    20 GCC_FAST_OBJC_DISPATCH[arch=ppc970] = NO 
    21 GCC_FAST_OBJC_DISPATCH[arch=ppc] = NO 
    22 GCC_FAST_OBJC_DISPATCH[arch=x86_64] = YES 
     15GCC_FAST_OBJC_DISPATCH = $(GCC_FAST_OBJC_DISPATCH_$(CURRENT_ARCH)) 
     16GCC_FAST_OBJC_DISPATCH_ = NO 
     17GCC_FAST_OBJC_DISPATCH_i386 = YES 
     18GCC_FAST_OBJC_DISPATCH_ppc64 = YES 
     19GCC_FAST_OBJC_DISPATCH_ppc7400 = NO 
     20GCC_FAST_OBJC_DISPATCH_ppc970 = NO 
     21GCC_FAST_OBJC_DISPATCH_ppc = NO 
     22GCC_FAST_OBJC_DISPATCH_x86_64 = YES 
    2323GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES 
    2424GCC_MODEL_TUNING = G5 
    …… 
    3737HEADER_SEARCH_PATHS = "$(SRCROOT)/Frameworks" 
    3838LIBRARY_SEARCH_PATHS = "$(SRCROOT)/Frameworks" 
    39 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET[arch=$(CURRENT_ARCH)]) 
    40 MACOSX_DEPLOYMENT_TARGET[arch=] = 10.3 
    41 MACOSX_DEPLOYMENT_TARGET[arch=i386] = 10.4 
    42 MACOSX_DEPLOYMENT_TARGET[arch=ppc64] = 10.5 
    43 MACOSX_DEPLOYMENT_TARGET[arch=ppc7400] = 10.3 
    44 MACOSX_DEPLOYMENT_TARGET[arch=ppc970] = 10.3 
    45 MACOSX_DEPLOYMENT_TARGET[arch=ppc] = 10.3 
    46 MACOSX_DEPLOYMENT_TARGET[arch=x86_64] = 10.5 
     39MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(CURRENT_ARCH)) 
     40MACOSX_DEPLOYMENT_TARGET_ = 10.3 
     41MACOSX_DEPLOYMENT_TARGET_i386 = 10.4 
     42MACOSX_DEPLOYMENT_TARGET_ppc64 = 10.5 
     43MACOSX_DEPLOYMENT_TARGET_ppc7400 = 10.3 
     44MACOSX_DEPLOYMENT_TARGET_ppc970 = 10.3 
     45MACOSX_DEPLOYMENT_TARGET_ppc = 10.3 
     46MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5 
    4747ONLY_LINK_ESSENTIAL_SYMBOLS = YES 
    4848OTHER_CFLAGS = -fconstant-cfstrings 
    4949PREBINDING = NO 
    5050PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO 
    51 SDKROOT = $(SDKROOT[arch=$(CURRENT_ARCH)]) 
    52 SDKROOT[arch=] = /Developer/SDKs/MacOSX10.3.9.sdk 
    53 SDKROOT[arch=i386] = /Developer/SDKs/MacOSX10.4u.sdk 
    54 SDKROOT[arch=ppc64] = /Developer/SDKs/MacOSX10.5.sdk 
    55 SDKROOT[arch=ppc7400] = /Developer/SDKs/MacOSX10.3.9.sdk 
    56 SDKROOT[arch=ppc970] = /Developer/SDKs/MacOSX10.3.9.sdk 
    57 SDKROOT[arch=ppc] = /Developer/SDKs/MacOSX10.3.9.sdk 
    58 SDKROOT[arch=x86_64] = /Developer/SDKs/MacOSX10.5.sdk 
     51SDKROOT = $(SDKROOT_$(CURRENT_ARCH)) 
     52SDKROOT_ = /Developer/SDKs/MacOSX10.3.9.sdk 
     53SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk 
     54SDKROOT_ppc64 = /Developer/SDKs/MacOSX10.5.sdk 
     55SDKROOT_ppc7400 = /Developer/SDKs/MacOSX10.3.9.sdk 
     56SDKROOT_ppc970 = /Developer/SDKs/MacOSX10.3.9.sdk 
     57SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk 
     58SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.5.sdk 
    5959STRIP_INSTALLED_PRODUCT = NO 
    6060VALID_ARCHS = i386 ppc ppc970 ppc7400