Skip to content

M
mruby
Commit 6b2e0b21 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto
Browse files
Options

Merge pull request #418 from pbosetti/XCode 

Minor edits to Xcode project file to better support Xcode 4.4 and OS X 10.8
parents 8af5a999 aa0d2f91
Show whitespace changes
Inline Side-by-side
Showing with 152 additions and 1 deletion
xcode/mruby.xcodeproj/project.pbxproj
View file @ 6b2e0b21
...@@ -6,6 +6,26 @@ ...@@ -6,6 +6,26 @@
objectVersion = 46; objectVersion = 46;
objects = { objects = {
/* Begin PBXAggregateTarget section */
88D0984E15CFF54A002E0BE8 /* build all */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 88D0985115CFF54A002E0BE8 /* Build configuration list for PBXAggregateTarget "build all" */;
buildPhases = (
);
dependencies = (
88D0985415CFF561002E0BE8 /* PBXTargetDependency */,
88D0985615CFF561002E0BE8 /* PBXTargetDependency */,
88D0985815CFF561002E0BE8 /* PBXTargetDependency */,
88D0985A15CFF561002E0BE8 /* PBXTargetDependency */,
88D0985C15CFF561002E0BE8 /* PBXTargetDependency */,
88D0985E15CFF561002E0BE8 /* PBXTargetDependency */,
88D0986015CFF561002E0BE8 /* PBXTargetDependency */,
);
name = "build all";
productName = "make all";
};
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
8844359B157730E1007F95A4 /* mrbtest.c in Sources */ = {isa = PBXBuildFile; fileRef = 8844359A157730DB007F95A4 /* mrbtest.c */; }; 8844359B157730E1007F95A4 /* mrbtest.c in Sources */ = {isa = PBXBuildFile; fileRef = 8844359A157730DB007F95A4 /* mrbtest.c */; };
8844359C15773120007F95A4 /* libmruby.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8844353E1576F1A3007F95A4 /* libmruby.a */; }; 8844359C15773120007F95A4 /* libmruby.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8844353E1576F1A3007F95A4 /* libmruby.a */; };
...@@ -123,6 +143,55 @@ ...@@ -123,6 +143,55 @@
remoteGlobalIDString = 88760AA115759B4F00113BFB; remoteGlobalIDString = 88760AA115759B4F00113BFB;
remoteInfo = ruby_lib; remoteInfo = ruby_lib;
}; };
88D0985315CFF561002E0BE8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 88BF3371156C992100F12AC7 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 88760AE415759EFE00113BFB;
remoteInfo = mruby_core;
};
88D0985515CFF561002E0BE8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 88BF3371156C992100F12AC7 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 88760A8A157590F000113BFB;
remoteInfo = mrbc;
};
88D0985715CFF561002E0BE8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 88BF3371156C992100F12AC7 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 88760AA115759B4F00113BFB;
remoteInfo = ruby_lib;
};
88D0985915CFF561002E0BE8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 88BF3371156C992100F12AC7 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 88760B2315769E6100113BFB;
remoteInfo = mruby;
};
88D0985B15CFF561002E0BE8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 88BF3371156C992100F12AC7 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 88760B3215769F3000113BFB;
remoteInfo = mirb;
};
88D0985D15CFF561002E0BE8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 88BF3371156C992100F12AC7 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 8844358E1577301B007F95A4;
remoteInfo = mrbtest;
};
88D0985F15CFF561002E0BE8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 88BF3371156C992100F12AC7 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 88760B731576A33100113BFB;
remoteInfo = mruby_fw;
};
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
...@@ -786,7 +855,7 @@ ...@@ -786,7 +855,7 @@
88BF3371156C992100F12AC7 /* Project object */ = { 88BF3371156C992100F12AC7 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0430; LastUpgradeCheck = 0440;
}; };
buildConfigurationList = 88BF3374156C992100F12AC7 /* Build configuration list for PBXProject "mruby" */; buildConfigurationList = 88BF3374156C992100F12AC7 /* Build configuration list for PBXProject "mruby" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
...@@ -808,6 +877,7 @@ ...@@ -808,6 +877,7 @@
88760B3215769F3000113BFB /* mirb */, 88760B3215769F3000113BFB /* mirb */,
8844358E1577301B007F95A4 /* mrbtest */, 8844358E1577301B007F95A4 /* mrbtest */,
88760B731576A33100113BFB /* mruby_fw */, 88760B731576A33100113BFB /* mruby_fw */,
88D0984E15CFF54A002E0BE8 /* build all */,
); );
}; };
/* End PBXProject section */ /* End PBXProject section */
...@@ -1007,6 +1077,41 @@ ...@@ -1007,6 +1077,41 @@
target = 88760AA115759B4F00113BFB /* ruby_lib */; target = 88760AA115759B4F00113BFB /* ruby_lib */;
targetProxy = 88760B891576A35C00113BFB /* PBXContainerItemProxy */; targetProxy = 88760B891576A35C00113BFB /* PBXContainerItemProxy */;
}; };
88D0985415CFF561002E0BE8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 88760AE415759EFE00113BFB /* mruby_core */;
targetProxy = 88D0985315CFF561002E0BE8 /* PBXContainerItemProxy */;
};
88D0985615CFF561002E0BE8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 88760A8A157590F000113BFB /* mrbc */;
targetProxy = 88D0985515CFF561002E0BE8 /* PBXContainerItemProxy */;
};
88D0985815CFF561002E0BE8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 88760AA115759B4F00113BFB /* ruby_lib */;
targetProxy = 88D0985715CFF561002E0BE8 /* PBXContainerItemProxy */;
};
88D0985A15CFF561002E0BE8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 88760B2315769E6100113BFB /* mruby */;
targetProxy = 88D0985915CFF561002E0BE8 /* PBXContainerItemProxy */;
};
88D0985C15CFF561002E0BE8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 88760B3215769F3000113BFB /* mirb */;
targetProxy = 88D0985B15CFF561002E0BE8 /* PBXContainerItemProxy */;
};
88D0985E15CFF561002E0BE8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 8844358E1577301B007F95A4 /* mrbtest */;
targetProxy = 88D0985D15CFF561002E0BE8 /* PBXContainerItemProxy */;
};
88D0986015CFF561002E0BE8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 88760B731576A33100113BFB /* mruby_fw */;
targetProxy = 88D0985F15CFF561002E0BE8 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */ /* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */ /* Begin PBXVariantGroup section */
...@@ -1033,6 +1138,7 @@ ...@@ -1033,6 +1138,7 @@
); );
INSTALL_PATH = /; INSTALL_PATH = /;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = "";
}; };
name = Debug; name = Debug;
}; };
...@@ -1048,6 +1154,7 @@ ...@@ -1048,6 +1154,7 @@
); );
INSTALL_PATH = /; INSTALL_PATH = /;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = "";
}; };
name = Release; name = Release;
}; };
...@@ -1057,6 +1164,7 @@ ...@@ -1057,6 +1164,7 @@
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
INSTALL_PATH = /; INSTALL_PATH = /;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = "";
}; };
name = Debug; name = Debug;
}; };
...@@ -1066,12 +1174,14 @@ ...@@ -1066,12 +1174,14 @@
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
INSTALL_PATH = /; INSTALL_PATH = /;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = "";
}; };
name = Release; name = Release;
}; };
88760AA415759B4F00113BFB /* Debug */ = { 88760AA415759B4F00113BFB /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
EXECUTABLE_PREFIX = lib; EXECUTABLE_PREFIX = lib;
GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_C_LANGUAGE_STANDARD = "compiler-default";
...@@ -1081,12 +1191,14 @@ ...@@ -1081,12 +1191,14 @@
); );
INSTALL_PATH = /lib; INSTALL_PATH = /lib;
PRODUCT_NAME = mruby; PRODUCT_NAME = mruby;
SDKROOT = "";
}; };
name = Debug; name = Debug;
}; };
88760AA515759B4F00113BFB /* Release */ = { 88760AA515759B4F00113BFB /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
EXECUTABLE_PREFIX = lib; EXECUTABLE_PREFIX = lib;
GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_C_LANGUAGE_STANDARD = "compiler-default";
...@@ -1096,12 +1208,14 @@ ...@@ -1096,12 +1208,14 @@
); );
INSTALL_PATH = /lib; INSTALL_PATH = /lib;
PRODUCT_NAME = mruby; PRODUCT_NAME = mruby;
SDKROOT = "";
}; };
name = Release; name = Release;
}; };
88760AE715759EFE00113BFB /* Debug */ = { 88760AE715759EFE00113BFB /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
EXECUTABLE_PREFIX = lib; EXECUTABLE_PREFIX = lib;
GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_C_LANGUAGE_STANDARD = "compiler-default";
...@@ -1113,6 +1227,7 @@ ...@@ -1113,6 +1227,7 @@
INSTALL_PATH = /lib; INSTALL_PATH = /lib;
LIBRARY_STYLE = STATIC; LIBRARY_STYLE = STATIC;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = "";
USE_HEADERMAP = "$(inherited)"; USE_HEADERMAP = "$(inherited)";
}; };
name = Debug; name = Debug;
...@@ -1120,6 +1235,7 @@ ...@@ -1120,6 +1235,7 @@
88760AE815759EFE00113BFB /* Release */ = { 88760AE815759EFE00113BFB /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
EXECUTABLE_PREFIX = lib; EXECUTABLE_PREFIX = lib;
GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_C_LANGUAGE_STANDARD = "compiler-default";
...@@ -1130,6 +1246,7 @@ ...@@ -1130,6 +1246,7 @@
INSTALL_PATH = /lib; INSTALL_PATH = /lib;
LIBRARY_STYLE = STATIC; LIBRARY_STYLE = STATIC;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = "";
USE_HEADERMAP = "$(inherited)"; USE_HEADERMAP = "$(inherited)";
}; };
name = Release; name = Release;
...@@ -1145,6 +1262,7 @@ ...@@ -1145,6 +1262,7 @@
); );
INSTALL_PATH = /; INSTALL_PATH = /;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = "";
}; };
name = Debug; name = Debug;
}; };
...@@ -1159,6 +1277,7 @@ ...@@ -1159,6 +1277,7 @@
); );
INSTALL_PATH = /; INSTALL_PATH = /;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = "";
}; };
name = Release; name = Release;
}; };
...@@ -1169,6 +1288,7 @@ ...@@ -1169,6 +1288,7 @@
GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_C_LANGUAGE_STANDARD = "compiler-default";
INSTALL_PATH = /; INSTALL_PATH = /;
PRODUCT_NAME = mirb; PRODUCT_NAME = mirb;
SDKROOT = "";
}; };
name = Debug; name = Debug;
}; };
...@@ -1179,12 +1299,14 @@ ...@@ -1179,12 +1299,14 @@
GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_C_LANGUAGE_STANDARD = "compiler-default";
INSTALL_PATH = /; INSTALL_PATH = /;
PRODUCT_NAME = mirb; PRODUCT_NAME = mirb;
SDKROOT = "";
}; };
name = Release; name = Release;
}; };
88760B871576A33100113BFB /* Debug */ = { 88760B871576A33100113BFB /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 1;
...@@ -1199,6 +1321,7 @@ ...@@ -1199,6 +1321,7 @@
INFOPLIST_FILE = "mruby_fw/mruby_fw-Info.plist"; INFOPLIST_FILE = "mruby_fw/mruby_fw-Info.plist";
INSTALL_PATH = /; INSTALL_PATH = /;
PRODUCT_NAME = mruby; PRODUCT_NAME = mruby;
SDKROOT = "";
WRAPPER_EXTENSION = framework; WRAPPER_EXTENSION = framework;
}; };
name = Debug; name = Debug;
...@@ -1206,6 +1329,7 @@ ...@@ -1206,6 +1329,7 @@
88760B881576A33100113BFB /* Release */ = { 88760B881576A33100113BFB /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 1;
...@@ -1220,6 +1344,7 @@ ...@@ -1220,6 +1344,7 @@
INFOPLIST_FILE = "mruby_fw/mruby_fw-Info.plist"; INFOPLIST_FILE = "mruby_fw/mruby_fw-Info.plist";
INSTALL_PATH = /; INSTALL_PATH = /;
PRODUCT_NAME = mruby; PRODUCT_NAME = mruby;
SDKROOT = "";
WRAPPER_EXTENSION = framework; WRAPPER_EXTENSION = framework;
}; };
name = Release; name = Release;
...@@ -1285,6 +1410,7 @@ ...@@ -1285,6 +1410,7 @@
88BF3596156CA10D00F12AC7 /* Debug */ = { 88BF3596156CA10D00F12AC7 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DEBUGGING_SYMBOLS = YES; DEBUGGING_SYMBOLS = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -1297,12 +1423,29 @@ ...@@ -1297,12 +1423,29 @@
88BF3597156CA10D00F12AC7 /* Release */ = { 88BF3597156CA10D00F12AC7 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
OTHER_CFLAGS = ""; OTHER_CFLAGS = "";
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;
}; };
88D0984F15CFF54A002E0BE8 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = "";
};
name = Debug;
};
88D0985015CFF54A002E0BE8 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = "";
};
name = Release;
};
/* End XCBuildConfiguration section */ /* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */ /* Begin XCConfigurationList section */
...@@ -1387,6 +1530,14 @@ ...@@ -1387,6 +1530,14 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
88D0985115CFF54A002E0BE8 /* Build configuration list for PBXAggregateTarget "build all" */ = {
isa = XCConfigurationList;
buildConfigurations = (
88D0984F15CFF54A002E0BE8 /* Debug */,
88D0985015CFF54A002E0BE8 /* Release */,
);
defaultConfigurationIsVisible = 0;
};
/* End XCConfigurationList section */ /* End XCConfigurationList section */
}; };
rootObject = 88BF3371156C992100F12AC7 /* Project object */; rootObject = 88BF3371156C992100F12AC7 /* Project object */;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment