diff --git a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj index 2cfe26d4d4..f725bd5346 100644 --- a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj +++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj @@ -1639,6 +1639,7 @@ SDKROOT_ppc = macosx10.5; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; ONLY_ACTIVE_ARCH = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -1657,6 +1658,7 @@ SDKROOT_ppc = macosx10.5; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1745,7 +1747,7 @@ C009859650B4628FDD068941, 84449D044096A03F2582904B, B8D802107FEE6AD60F5309A3 ); buildRules = ( ); dependencies = ( ); name = "The Introjucer"; productName = "The Introjucer"; productReference = 25F52316D256B4534BED16D1; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; }; - 74EA481348A24104E6ACE009 = { isa = PBXProject; buildConfigurationList = F90407F24422C589DA251604; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3CC531922CC2D398E283A845; projectDirPath = ""; projectRoot = ""; targets = ( FE688C03195D5E72123A75BF ); }; + 74EA481348A24104E6ACE009 = { isa = PBXProject; buildConfigurationList = F90407F24422C589DA251604; attributes = { LastUpgradeCheck = 0440; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3CC531922CC2D398E283A845; projectDirPath = ""; projectRoot = ""; targets = ( FE688C03195D5E72123A75BF ); }; }; rootObject = 74EA481348A24104E6ACE009; } diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h index 90a28d5c87..528d8f63a2 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h @@ -724,6 +724,8 @@ private: if (config.getCppLibType().isNotEmpty()) s.add ("CLANG_CXX_LIBRARY = " + config.getCppLibType().quoted()); + s.add ("COMBINE_HIDPI_IMAGES = YES"); + { StringArray linkerFlags, librarySearchPaths; getLinkerFlags (config, linkerFlags, librarySearchPaths); @@ -887,11 +889,11 @@ private: sourceIDs.add (fileID); ValueTree* v = new ValueTree (fileID); - v->setProperty ("isa", "PBXBuildFile", 0); - v->setProperty ("fileRef", fileRefID, 0); + v->setProperty ("isa", "PBXBuildFile", nullptr); + v->setProperty ("fileRef", fileRefID, nullptr); if (inhibitWarnings) - v->setProperty ("settings", "{COMPILER_FLAGS = \"-w\"; }", 0); + v->setProperty ("settings", "{COMPILER_FLAGS = \"-w\"; }", nullptr); pbxBuildFiles.add (v); return fileID; @@ -920,11 +922,11 @@ private: const String fileRefID (createFileRefID (pathString)); ScopedPointer v (new ValueTree (fileRefID)); - v->setProperty ("isa", "PBXFileReference", 0); - v->setProperty ("lastKnownFileType", getFileType (path), 0); - v->setProperty (Ids::name, pathString.fromLastOccurrenceOf ("/", false, false), 0); - v->setProperty ("path", sanitisePath (pathString), 0); - v->setProperty ("sourceTree", sourceTree, 0); + v->setProperty ("isa", "PBXFileReference", nullptr); + v->setProperty ("lastKnownFileType", getFileType (path), nullptr); + v->setProperty (Ids::name, pathString.fromLastOccurrenceOf ("/", false, false), nullptr); + v->setProperty ("path", sanitisePath (pathString), nullptr); + v->setProperty ("sourceTree", sourceTree, nullptr); const int existing = pbxFileReferences.indexOfSorted (*this, v); @@ -1035,10 +1037,10 @@ private: void addGroup (const String& groupID, const String& groupName, const StringArray& childIDs) const { ValueTree* v = new ValueTree (groupID); - v->setProperty ("isa", "PBXGroup", 0); - v->setProperty ("children", "(" + indentList (childIDs, ",") + " )", 0); - v->setProperty (Ids::name, groupName, 0); - v->setProperty ("sourceTree", "", 0); + v->setProperty ("isa", "PBXGroup", nullptr); + v->setProperty ("children", "(" + indentList (childIDs, ",") + " )", nullptr); + v->setProperty (Ids::name, groupName, nullptr); + v->setProperty ("sourceTree", "", nullptr); pbxGroups.add (v); } @@ -1067,29 +1069,29 @@ private: void addBuildProduct (const String& fileType, const String& binaryName) const { ValueTree* v = new ValueTree (createID ("__productFileID")); - v->setProperty ("isa", "PBXFileReference", 0); - v->setProperty ("explicitFileType", fileType, 0); - v->setProperty ("includeInIndex", (int) 0, 0); - v->setProperty ("path", sanitisePath (binaryName), 0); - v->setProperty ("sourceTree", "BUILT_PRODUCTS_DIR", 0); + v->setProperty ("isa", "PBXFileReference", nullptr); + v->setProperty ("explicitFileType", fileType, nullptr); + v->setProperty ("includeInIndex", (int) 0, nullptr); + v->setProperty ("path", sanitisePath (binaryName), nullptr); + v->setProperty ("sourceTree", "BUILT_PRODUCTS_DIR", nullptr); pbxFileReferences.add (v); } void addTargetConfig (const String& configName, const StringArray& buildSettings) const { ValueTree* v = new ValueTree (createID ("targetconfigid_" + configName)); - v->setProperty ("isa", "XCBuildConfiguration", 0); - v->setProperty ("buildSettings", "{" + indentList (buildSettings, ";") + " }", 0); - v->setProperty (Ids::name, configName, 0); + v->setProperty ("isa", "XCBuildConfiguration", nullptr); + v->setProperty ("buildSettings", "{" + indentList (buildSettings, ";") + " }", nullptr); + v->setProperty (Ids::name, configName, nullptr); targetConfigs.add (v); } void addProjectConfig (const String& configName, const StringArray& buildSettings) const { ValueTree* v = new ValueTree (createID ("projectconfigid_" + configName)); - v->setProperty ("isa", "XCBuildConfiguration", 0); - v->setProperty ("buildSettings", "{" + indentList (buildSettings, ";") + " }", 0); - v->setProperty (Ids::name, configName, 0); + v->setProperty ("isa", "XCBuildConfiguration", nullptr); + v->setProperty ("buildSettings", "{" + indentList (buildSettings, ";") + " }", nullptr); + v->setProperty (Ids::name, configName, nullptr); projectConfigs.add (v); } @@ -1101,12 +1103,12 @@ private: configIDs.add (configsToUse[i]->getType().toString()); ValueTree* v = new ValueTree (listID); - v->setProperty ("isa", "XCConfigurationList", 0); - v->setProperty ("buildConfigurations", "(" + indentList (configIDs, ",") + " )", 0); - v->setProperty ("defaultConfigurationIsVisible", (int) 0, 0); + v->setProperty ("isa", "XCConfigurationList", nullptr); + v->setProperty ("buildConfigurations", "(" + indentList (configIDs, ",") + " )", nullptr); + v->setProperty ("defaultConfigurationIsVisible", (int) 0, nullptr); if (configsToUse[0] != nullptr) - v->setProperty ("defaultConfigurationName", configsToUse[0]->getProperty (Ids::name), 0); + v->setProperty ("defaultConfigurationName", configsToUse[0]->getProperty (Ids::name), nullptr); misc.add (v); } @@ -1117,10 +1119,10 @@ private: buildPhaseIDs.add (phaseId); ValueTree* v = new ValueTree (phaseId); - v->setProperty ("isa", phaseType, 0); - v->setProperty ("buildActionMask", "2147483647", 0); - v->setProperty ("files", "(" + indentList (fileIds, ",") + " )", 0); - v->setProperty ("runOnlyForDeploymentPostprocessing", (int) 0, 0); + v->setProperty ("isa", phaseType, nullptr); + v->setProperty ("buildActionMask", "2147483647", nullptr); + v->setProperty ("files", "(" + indentList (fileIds, ",") + " )", nullptr); + v->setProperty ("runOnlyForDeploymentPostprocessing", (int) 0, nullptr); misc.add (v); return v; } @@ -1128,20 +1130,20 @@ private: void addTargetObject() const { ValueTree* const v = new ValueTree (createID ("__target")); - v->setProperty ("isa", "PBXNativeTarget", 0); - v->setProperty ("buildConfigurationList", createID ("__configList"), 0); - v->setProperty ("buildPhases", "(" + indentList (buildPhaseIDs, ",") + " )", 0); - v->setProperty ("buildRules", "( )", 0); - v->setProperty ("dependencies", "( )", 0); - v->setProperty (Ids::name, projectName, 0); - v->setProperty ("productName", projectName, 0); - v->setProperty ("productReference", createID ("__productFileID"), 0); + v->setProperty ("isa", "PBXNativeTarget", nullptr); + v->setProperty ("buildConfigurationList", createID ("__configList"), nullptr); + v->setProperty ("buildPhases", "(" + indentList (buildPhaseIDs, ",") + " )", nullptr); + v->setProperty ("buildRules", "( )", nullptr); + v->setProperty ("dependencies", "( )", nullptr); + v->setProperty (Ids::name, projectName, nullptr); + v->setProperty ("productName", projectName, nullptr); + v->setProperty ("productReference", createID ("__productFileID"), nullptr); if (xcodeProductInstallPath.isNotEmpty()) - v->setProperty ("productInstallPath", xcodeProductInstallPath, 0); + v->setProperty ("productInstallPath", xcodeProductInstallPath, nullptr); jassert (xcodeProductType.isNotEmpty()); - v->setProperty ("productType", xcodeProductType, 0); + v->setProperty ("productType", xcodeProductType, nullptr); misc.add (v); } @@ -1149,14 +1151,15 @@ private: void addProjectObject() const { ValueTree* const v = new ValueTree (createID ("__root")); - v->setProperty ("isa", "PBXProject", 0); - v->setProperty ("buildConfigurationList", createID ("__projList"), 0); - v->setProperty ("compatibilityVersion", "Xcode 3.2", 0); - v->setProperty ("hasScannedForEncodings", (int) 0, 0); - v->setProperty ("mainGroup", createID ("__mainsourcegroup"), 0); - v->setProperty ("projectDirPath", "\"\"", 0); - v->setProperty ("projectRoot", "\"\"", 0); - v->setProperty ("targets", "( " + createID ("__target") + " )", 0); + v->setProperty ("isa", "PBXProject", nullptr); + v->setProperty ("buildConfigurationList", createID ("__projList"), nullptr); + v->setProperty ("attributes", "{ LastUpgradeCheck = 0440; }", nullptr); + v->setProperty ("compatibilityVersion", "Xcode 3.2", nullptr); + v->setProperty ("hasScannedForEncodings", (int) 0, nullptr); + v->setProperty ("mainGroup", createID ("__mainsourcegroup"), nullptr); + v->setProperty ("projectDirPath", "\"\"", nullptr); + v->setProperty ("projectRoot", "\"\"", nullptr); + v->setProperty ("targets", "( " + createID ("__target") + " )", nullptr); misc.add (v); } @@ -1165,12 +1168,12 @@ private: if (getPostBuildScript().isNotEmpty()) { ValueTree* const v = addBuildPhase ("PBXShellScriptBuildPhase", StringArray()); - v->setProperty (Ids::name, "Post-build script", 0); - v->setProperty ("shellPath", "/bin/sh", 0); + v->setProperty (Ids::name, "Post-build script", nullptr); + v->setProperty ("shellPath", "/bin/sh", nullptr); v->setProperty ("shellScript", getPostBuildScript().replace ("\\", "\\\\") .replace ("\"", "\\\"") .replace ("\r\n", "\\n") - .replace ("\n", "\\n"), 0); + .replace ("\n", "\\n"), nullptr); } } diff --git a/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj b/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj index dcfdeddf4a..128c9d142a 100644 --- a/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj +++ b/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj @@ -2028,6 +2028,7 @@ SDKROOT_ppc = macosx10.5; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; ONLY_ACTIVE_ARCH = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -2047,6 +2048,7 @@ SDKROOT_ppc = macosx10.5; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -2147,7 +2149,7 @@ 2E115993E9743E9E60D96434, 8478974C956501F4EA996448, 8C6D93B7CB9CCF8025AA68EB ); buildRules = ( ); dependencies = ( ); name = "Juce Demo"; productName = "Juce Demo"; productReference = D119A3871626EC2B8EFCB0D4; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; }; - C1B2C620111BD898B338CCA1 = { isa = PBXProject; buildConfigurationList = C01737B8733CB01B27C1DF59; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 197E966E1B8F9DE1A6F9F0D4; projectDirPath = ""; projectRoot = ""; targets = ( 9A1F85020B3ADFBFE3D383F2 ); }; + C1B2C620111BD898B338CCA1 = { isa = PBXProject; buildConfigurationList = C01737B8733CB01B27C1DF59; attributes = { LastUpgradeCheck = 0440; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 197E966E1B8F9DE1A6F9F0D4; projectDirPath = ""; projectRoot = ""; targets = ( 9A1F85020B3ADFBFE3D383F2 ); }; }; rootObject = C1B2C620111BD898B338CCA1; } diff --git a/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj b/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj index ee3eb4b74c..53c992b8d4 100644 --- a/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj +++ b/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj @@ -2014,6 +2014,7 @@ INSTALL_PATH = "$(HOME)/Applications"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; ONLY_ACTIVE_ARCH = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -2030,6 +2031,7 @@ INSTALL_PATH = "$(HOME)/Applications"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -2132,7 +2134,7 @@ 2E115993E9743E9E60D96434, 8478974C956501F4EA996448, 8C6D93B7CB9CCF8025AA68EB ); buildRules = ( ); dependencies = ( ); name = "Juce Demo"; productName = "Juce Demo"; productReference = D119A3871626EC2B8EFCB0D4; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; }; - C1B2C620111BD898B338CCA1 = { isa = PBXProject; buildConfigurationList = C01737B8733CB01B27C1DF59; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 197E966E1B8F9DE1A6F9F0D4; projectDirPath = ""; projectRoot = ""; targets = ( 9A1F85020B3ADFBFE3D383F2 ); }; + C1B2C620111BD898B338CCA1 = { isa = PBXProject; buildConfigurationList = C01737B8733CB01B27C1DF59; attributes = { LastUpgradeCheck = 0440; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 197E966E1B8F9DE1A6F9F0D4; projectDirPath = ""; projectRoot = ""; targets = ( 9A1F85020B3ADFBFE3D383F2 ); }; }; rootObject = C1B2C620111BD898B338CCA1; } diff --git a/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj b/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj index 7442c9c6f1..0503ef5df8 100644 --- a/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj +++ b/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj @@ -1995,6 +1995,7 @@ EXCLUDED_SOURCE_FILE_NAMES_x86_64 = "*Carbon*.cpp"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; OTHER_LDFLAGS = "-bundle"; ONLY_ACTIVE_ARCH = YES; COPY_PHASE_STRIP = NO; @@ -2018,6 +2019,7 @@ EXCLUDED_SOURCE_FILE_NAMES_x86_64 = "*Carbon*.cpp"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; OTHER_LDFLAGS = "-bundle"; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; @@ -2129,7 +2131,7 @@ E032EB514708440DE9B7FF2A, 95E57A758351FE57067B605F, E277BCF6E051A6008DD74155 ); buildRules = ( ); dependencies = ( ); name = JuceDemoPlugin; productName = JuceDemoPlugin; productReference = 63F8022F081E22DFFFCAC998; productInstallPath = "$(HOME)/Library/Audio/Plug-Ins/Components/"; productType = "com.apple.product-type.bundle"; }; - 85250052F3E019894332668E = { isa = PBXProject; buildConfigurationList = 0720B453F376663EAB98BF9B; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4074359E1E7C4D54E87C3461; projectDirPath = ""; projectRoot = ""; targets = ( 27A65CD0B053616E226D4547 ); }; + 85250052F3E019894332668E = { isa = PBXProject; buildConfigurationList = 0720B453F376663EAB98BF9B; attributes = { LastUpgradeCheck = 0440; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4074359E1E7C4D54E87C3461; projectDirPath = ""; projectRoot = ""; targets = ( 27A65CD0B053616E226D4547 ); }; }; rootObject = 85250052F3E019894332668E; } diff --git a/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj b/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj index 59d5c3d9b3..a57c039df1 100644 --- a/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj +++ b/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj @@ -1949,6 +1949,7 @@ SDKROOT_ppc = macosx10.5; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; ONLY_ACTIVE_ARCH = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -1967,6 +1968,7 @@ SDKROOT_ppc = macosx10.5; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -2049,7 +2051,7 @@ 2309EA55A722EF4ED2D62447, 8915908C84EBB721DD5BF3C1, C1A9B94FBBEB8C8B72689262 ); buildRules = ( ); dependencies = ( ); name = "Plugin Host"; productName = "Plugin Host"; productReference = B2A7B6A8E3CCA7E2038E8EFF; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; }; - ADE6E539DB98A302483A82D0 = { isa = PBXProject; buildConfigurationList = 493C2C5E457692E5149C5525; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 65BEFC705A89E5C8A9E35C97; projectDirPath = ""; projectRoot = ""; targets = ( B5F8DFF64A83B053583709F0 ); }; + ADE6E539DB98A302483A82D0 = { isa = PBXProject; buildConfigurationList = 493C2C5E457692E5149C5525; attributes = { LastUpgradeCheck = 0440; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 65BEFC705A89E5C8A9E35C97; projectDirPath = ""; projectRoot = ""; targets = ( B5F8DFF64A83B053583709F0 ); }; }; rootObject = ADE6E539DB98A302483A82D0; } diff --git a/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj b/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj index d26a8ed308..533a81968a 100644 --- a/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj +++ b/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj @@ -440,6 +440,7 @@ SDKROOT_ppc = macosx10.5; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; ONLY_ACTIVE_ARCH = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -456,6 +457,7 @@ SDKROOT_ppc = macosx10.5; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -509,7 +511,7 @@ 7B52CBCC65AE087EEFB2C437, 77D79017A9F2C7F35DD55196, FA91AF2CE863567091E8A6B0 ); buildRules = ( ); dependencies = ( ); name = BinaryBuilder; productName = BinaryBuilder; productReference = E2EADDD364B6C6F37D8BBD7A; productInstallPath = /usr/bin; productType = "com.apple.product-type.tool"; }; - 36B6F402BC83F21646259DEF = { isa = PBXProject; buildConfigurationList = E4C85B0464A93027D035AA1F; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = C18D022743CF5BD14D6A6A9E; projectDirPath = ""; projectRoot = ""; targets = ( 3F86988238803AA6377D688E ); }; + 36B6F402BC83F21646259DEF = { isa = PBXProject; buildConfigurationList = E4C85B0464A93027D035AA1F; attributes = { LastUpgradeCheck = 0440; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = C18D022743CF5BD14D6A6A9E; projectDirPath = ""; projectRoot = ""; targets = ( 3F86988238803AA6377D688E ); }; }; rootObject = 36B6F402BC83F21646259DEF; } diff --git a/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj b/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj index 901fcc438f..fb952c520a 100644 --- a/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj +++ b/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj @@ -1403,6 +1403,7 @@ SDKROOT_ppc = macosx10.5; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; ONLY_ACTIVE_ARCH = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -1419,6 +1420,7 @@ SDKROOT_ppc = macosx10.5; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1481,7 +1483,7 @@ 7B2C68FAAB7FB794B44BA476, 5C249F77DD3C907CDA919026, A8FE28D8F12C03C93B8EAD1D ); buildRules = ( ); dependencies = ( ); name = HelloWorld; productName = HelloWorld; productReference = EA398D9C544440E06637C134; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; }; - E34D5B980741D93050D0BB6B = { isa = PBXProject; buildConfigurationList = D5495970AC0AFC78DD0ADE12; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = CB9C4DF3F11D65C6BF6B80AD; projectDirPath = ""; projectRoot = ""; targets = ( 9337F8263A94B688D61D5B68 ); }; + E34D5B980741D93050D0BB6B = { isa = PBXProject; buildConfigurationList = D5495970AC0AFC78DD0ADE12; attributes = { LastUpgradeCheck = 0440; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = CB9C4DF3F11D65C6BF6B80AD; projectDirPath = ""; projectRoot = ""; targets = ( 9337F8263A94B688D61D5B68 ); }; }; rootObject = E34D5B980741D93050D0BB6B; } diff --git a/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj b/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj index 73850db45e..741f8bc954 100644 --- a/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj +++ b/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj @@ -1401,6 +1401,7 @@ INSTALL_PATH = "$(HOME)/Applications"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; ONLY_ACTIVE_ARCH = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -1415,6 +1416,7 @@ INSTALL_PATH = "$(HOME)/Applications"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1483,7 +1485,7 @@ 7B2C68FAAB7FB794B44BA476, 5C249F77DD3C907CDA919026, A8FE28D8F12C03C93B8EAD1D ); buildRules = ( ); dependencies = ( ); name = HelloWorld; productName = HelloWorld; productReference = EA398D9C544440E06637C134; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; }; - E34D5B980741D93050D0BB6B = { isa = PBXProject; buildConfigurationList = D5495970AC0AFC78DD0ADE12; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = CB9C4DF3F11D65C6BF6B80AD; projectDirPath = ""; projectRoot = ""; targets = ( 9337F8263A94B688D61D5B68 ); }; + E34D5B980741D93050D0BB6B = { isa = PBXProject; buildConfigurationList = D5495970AC0AFC78DD0ADE12; attributes = { LastUpgradeCheck = 0440; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = CB9C4DF3F11D65C6BF6B80AD; projectDirPath = ""; projectRoot = ""; targets = ( 9337F8263A94B688D61D5B68 ); }; }; rootObject = E34D5B980741D93050D0BB6B; } diff --git a/extras/the jucer/Builds/MacOSX/Jucer.xcodeproj/project.pbxproj b/extras/the jucer/Builds/MacOSX/Jucer.xcodeproj/project.pbxproj index 64a102c719..284068aa2f 100644 --- a/extras/the jucer/Builds/MacOSX/Jucer.xcodeproj/project.pbxproj +++ b/extras/the jucer/Builds/MacOSX/Jucer.xcodeproj/project.pbxproj @@ -1666,6 +1666,7 @@ SDKROOT_ppc = macosx10.5; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; ONLY_ACTIVE_ARCH = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -1682,6 +1683,7 @@ SDKROOT_ppc = macosx10.5; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + COMBINE_HIDPI_IMAGES = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1775,7 +1777,7 @@ C06AC70106231834669512C5, 394C2D5A71955036D265B490, B11FA40C6130EB5EB185D0FF ); buildRules = ( ); dependencies = ( ); name = Jucer; productName = Jucer; productReference = C2070DE2D6C322FDEADA3835; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; }; - 67EDA91590B438C436662019 = { isa = PBXProject; buildConfigurationList = B01CF9105DD0717790C4738E; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = A7BE471011DB0F6646F53DC3; projectDirPath = ""; projectRoot = ""; targets = ( CC78C20B8F6159F24605BED8 ); }; + 67EDA91590B438C436662019 = { isa = PBXProject; buildConfigurationList = B01CF9105DD0717790C4738E; attributes = { LastUpgradeCheck = 0440; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = A7BE471011DB0F6646F53DC3; projectDirPath = ""; projectRoot = ""; targets = ( CC78C20B8F6159F24605BED8 ); }; }; rootObject = 67EDA91590B438C436662019; }