1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00

Introjucer: tweaked Xcode project structure to avoid warning about architectures.

This commit is contained in:
jules 2014-04-18 12:05:15 +01:00
parent 99024f0405
commit 65f01eb6f7
9 changed files with 15 additions and 17 deletions

View file

@ -2181,7 +2181,6 @@
9439CB46EE08D16AAA26A203,
9EB09FCC1FD3F263F24203C5, ); name = Source; sourceTree = "<group>"; };
D0259E85380471FB442A4B44 = {isa = XCBuildConfiguration; buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_LINK_OBJC_RUNTIME = NO;
COMBINE_HIDPI_IMAGES = YES;
@ -2204,7 +2203,6 @@
OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter";
SDKROOT_ppc = macosx10.5; }; name = Debug; };
80E4DBEBE0CE7D218C89F78C = {isa = XCBuildConfiguration; buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_LINK_OBJC_RUNTIME = NO;
COMBINE_HIDPI_IMAGES = YES;
@ -2240,6 +2238,7 @@
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "JuceDemo";
WARNING_CFLAGS = -Wreorder;
ZERO_LINK = NO; }; name = Debug; };

View file

@ -2183,8 +2183,7 @@
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)");
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
ONLY_ACTIVE_ARCH = YES; }; name = Debug; };
INSTALL_PATH = "$(HOME)/Applications"; }; name = Debug; };
80E4DBEBE0CE7D218C89F78C = {isa = XCBuildConfiguration; buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_LINK_OBJC_RUNTIME = NO;
@ -2218,6 +2217,7 @@
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "JuceDemo";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";

View file

@ -14,10 +14,10 @@
objCExtraSuffix="hZh0GG" bigIcon="BvyE0d" extraCompilerFlags="-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="JuceDemo"
osxSDK="default" osxCompatibility="default" osxArchitecture="Native"
osxSDK="default" osxCompatibility="default" osxArchitecture="default"
defines=""/>
<CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="JuceDemo"
osxSDK="default" osxCompatibility="10.6 SDK" osxArchitecture="Native"
osxSDK="default" osxCompatibility="10.6 SDK" osxArchitecture="default"
defines=""/>
</CONFIGURATIONS>
<MODULEPATHS>

View file

@ -680,6 +680,10 @@ private:
s.add ("GCC_INLINES_ARE_PRIVATE_EXTERN = YES");
}
if (config.isDebug())
if (config.getMacArchitecture() == osxArch_Default || config.getMacArchitecture().isEmpty())
s.add ("ONLY_ACTIVE_ARCH = YES");
if (iOS)
{
s.add ("\"CODE_SIGN_IDENTITY[sdk=iphoneos*]\" = \"iPhone Developer\"");
@ -812,11 +816,6 @@ private:
{
defines.set ("_DEBUG", "1");
defines.set ("DEBUG", "1");
if (config.getMacArchitecture() == osxArch_Default
|| config.getMacArchitecture().isEmpty())
s.add ("ONLY_ACTIVE_ARCH = YES");
s.add ("COPY_PHASE_STRIP = NO");
s.add ("GCC_DYNAMIC_NO_PIC = NO");
}

View file

@ -2105,7 +2105,6 @@
INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/Components/";
LIBRARY_STYLE = Bundle;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-bundle";
OTHER_REZFLAGS = "-d ppc_$ppc -d i386_$i386 -d ppc64_$ppc64 -d x86_64_$x86_64 -I /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Versions/A/Headers -I \"$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase\"";
SDKROOT_ppc = macosx10.5;
@ -2150,6 +2149,7 @@
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "JuceDemoPlugin";
WARNING_CFLAGS = -Wreorder;
ZERO_LINK = NO; }; name = Debug; };

View file

@ -2045,7 +2045,6 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
ONLY_ACTIVE_ARCH = YES;
SDKROOT_ppc = macosx10.5; }; name = Debug; };
20F59BC9E9ACBDF56007CE03 = {isa = XCBuildConfiguration; buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
@ -2081,6 +2080,7 @@
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "Plugin Host";
WARNING_CFLAGS = -Wreorder;
ZERO_LINK = NO; }; name = Debug; };

View file

@ -481,7 +481,6 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "/usr/bin";
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
ONLY_ACTIVE_ARCH = YES;
SDKROOT_ppc = macosx10.5; }; name = Debug; };
145C0C90E41D8DECE4DD66AD = {isa = XCBuildConfiguration; buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
@ -516,6 +515,7 @@
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "BinaryBuilder";
WARNING_CFLAGS = -Wreorder;
ZERO_LINK = NO; }; name = Debug; };

View file

@ -1468,7 +1468,6 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
ONLY_ACTIVE_ARCH = YES;
SDKROOT_ppc = macosx10.5; }; name = Debug; };
339C95D5B2E96DD37B176D75 = {isa = XCBuildConfiguration; buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
@ -1503,6 +1502,7 @@
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "HelloWorld";
WARNING_CFLAGS = -Wreorder;
ZERO_LINK = NO; }; name = Debug; };

View file

@ -1463,8 +1463,7 @@
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)");
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
ONLY_ACTIVE_ARCH = YES; }; name = Debug; };
INSTALL_PATH = "$(HOME)/Applications"; }; name = Debug; };
339C95D5B2E96DD37B176D75 = {isa = XCBuildConfiguration; buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_LINK_OBJC_RUNTIME = NO;
@ -1497,6 +1496,7 @@
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "HelloWorld";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";