Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Mac: update for compatibility (fix compile breaks) with Apple LLVM 5.0 compiler under Xcode 5.

This commit is contained in:
Charlie Fenton 2014-08-11 04:09:12 -07:00
parent d83ebf4476
commit 9ca8330aae
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clientgui/mac/config.h
View File

@ -214,6 +214,9 @@
/* Define to 1 if you have the `strcasestr' function. */ /* Define to 1 if you have the `strcasestr' function. */
#define HAVE_STRCASESTR 1 #define HAVE_STRCASESTR 1
/* Define to 1 if you have the `strcasecmp' function. */
#define HAVE_STRCASECMP 1
/* Define to 1 if you have the `strtoull' function. */ /* Define to 1 if you have the `strtoull' function. */
#define HAVE_STRTOULL 1 #define HAVE_STRTOULL 1

24
mac_build/boinc.xcodeproj/project.pbxproj
View File

@ -3561,7 +3561,6 @@
"-D__WXMAC__", "-D__WXMAC__",
"-DSANDBOX", "-DSANDBOX",
"-D_DEBUG", "-D_DEBUG",
"-DHAVE_STRCASECMP_IN_STRING_H",
"-DMAC_OS_X_VERSION_MAX_ALLOWED=1050", "-DMAC_OS_X_VERSION_MAX_ALLOWED=1050",
); );
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
@ -3619,7 +3618,6 @@
"-D__WXMAC__", "-D__WXMAC__",
"-DSANDBOX", "-DSANDBOX",
"-D_NDEBUG", "-D_NDEBUG",
"-DHAVE_STRCASECMP_IN_STRING_H",
"-DBUILDING_MANAGER", "-DBUILDING_MANAGER",
"-DMAC_OS_X_VERSION_MAX_ALLOWED=1050", "-DMAC_OS_X_VERSION_MAX_ALLOWED=1050",
); );
@ -3695,8 +3693,7 @@
DD81C79C144D8DA9000BE61A /* Development */ = { DD81C79C144D8DA9000BE61A /* Development */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
EXECUTABLE_PREFIX = lib; EXECUTABLE_PREFIX = lib;
PRODUCT_NAME = jpeg; PRODUCT_NAME = jpeg;
WARNING_CFLAGS = ( WARNING_CFLAGS = (
@ -3994,8 +3991,7 @@
DD9E2352091CBDAE0048316E /* Development */ = { DD9E2352091CBDAE0048316E /* Development */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
HEADER_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = "";
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
PRODUCT_NAME = boinc; PRODUCT_NAME = boinc;
@ -4005,8 +4001,7 @@
DD9E235A091CBDAE0048316E /* Development */ = { DD9E235A091CBDAE0048316E /* Development */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
HEADER_SEARCH_PATHS = ../lib; HEADER_SEARCH_PATHS = ../lib;
LIBRARY_SEARCH_PATHS = ../lib; LIBRARY_SEARCH_PATHS = ../lib;
PRODUCT_NAME = boinc_api; PRODUCT_NAME = boinc_api;
@ -4042,8 +4037,7 @@
DD9E2366091CBDAE0048316E /* Development */ = { DD9E2366091CBDAE0048316E /* Development */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; ARCHS = "$(ARCHS_STANDARD_32_BIT)";
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
@ -4124,8 +4118,7 @@
DD9E2382091CBDAE0048316E /* Development */ = { DD9E2382091CBDAE0048316E /* Development */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; ARCHS = "$(ARCHS_STANDARD_32_BIT)";
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEPLOYMENT_POSTPROCESSING = NO; DEPLOYMENT_POSTPROCESSING = NO;
@ -4207,8 +4200,7 @@
DDB873FD0C850BC800E0DE1F /* Development */ = { DDB873FD0C850BC800E0DE1F /* Development */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
HEADER_SEARCH_PATHS = ../samples/jpeglib; HEADER_SEARCH_PATHS = ../samples/jpeglib;
PRODUCT_NAME = boinc_graphics2; PRODUCT_NAME = boinc_graphics2;
}; };
@ -4273,9 +4265,9 @@
DDF9EC04144EB14B005D6144 /* Development */ = { DDF9EC04144EB14B005D6144 /* Development */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)"; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
EXECUTABLE_PREFIX = lib; EXECUTABLE_PREFIX = lib;
ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)"; ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Development; name = Development;