Browse Source

Fix for copying NamedValueSets, removed some win32 DC warnings. Removed the obj-C suffix setting from the jucer's global settings. Updated the Jucer to generate correct iPhone/iPad apps for iOS4. Renamed some of the demo build folders from "iPhone" to "iOS".

tags/2021-05-28
Julian Storer 14 years ago
parent
commit
e17dfb559f
46 changed files with 194 additions and 157 deletions
  1. +4
    -2
      Builds/MacOSX/Juce.xcodeproj/project.pbxproj
  2. +12
    -6
      Builds/iOS/Juce.xcodeproj/project.pbxproj
  3. +3
    -3
      Juce.jucer
  4. +4
    -2
      extras/Jucer (experimental)/Builds/MacOSX/The Jucer.xcodeproj/project.pbxproj
  5. +1
    -1
      extras/Jucer (experimental)/Jucer.jucer
  6. +0
    -1
      extras/Jucer (experimental)/Source/Project/jucer_NewProjectWizard.cpp
  7. +0
    -3
      extras/Jucer (experimental)/Source/Project/jucer_Project.cpp
  8. +0
    -2
      extras/Jucer (experimental)/Source/Project/jucer_Project.h
  9. +0
    -10
      extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_MSVC.h
  10. +0
    -4
      extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_Make.h
  11. +16
    -12
      extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_XCode.h
  12. +0
    -3
      extras/Jucer (experimental)/Source/Project/jucer_ProjectSaver.h
  13. +3
    -1
      extras/Jucer (experimental)/Source/Utility/jucer_MiscUtilities.cpp
  14. +1
    -1
      extras/amalgamator/Amalgamator.jucer
  15. +4
    -2
      extras/amalgamator/Builds/MacOSX/Amalgamator.xcodeproj/project.pbxproj
  16. +4
    -2
      extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj
  17. +1
    -1
      extras/audio plugin host/Plugin Host.jucer
  18. +2
    -2
      extras/audio plugins/demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj
  19. +1
    -1
      extras/binarybuilder/BinaryBuilder.jucer
  20. +4
    -2
      extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj
  21. +4
    -2
      extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj
  22. +12
    -6
      extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj
  23. +0
    -0
      extras/example projects/Builds/iOS/Info.plist
  24. +3
    -3
      extras/example projects/HelloWorld.jucer
  25. BIN
      extras/juce demo/Builds/MacOSX/Icon.icns
  26. +4
    -2
      extras/juce demo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj
  27. BIN
      extras/juce demo/Builds/VisualStudio2005/icon.ico
  28. BIN
      extras/juce demo/Builds/VisualStudio2008/icon.ico
  29. BIN
      extras/juce demo/Builds/VisualStudio2010/icon.ico
  30. BIN
      extras/juce demo/Builds/iOS/Icon.icns
  31. +0
    -0
      extras/juce demo/Builds/iOS/Info.plist
  32. +12
    -6
      extras/juce demo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj
  33. BIN
      extras/juce demo/Builds/iPhone/Icon.icns
  34. +3
    -3
      extras/juce demo/Juce Demo.jucer
  35. +40
    -27
      juce_amalgamated.cpp
  36. +8
    -10
      juce_amalgamated.h
  37. +5
    -3
      src/containers/juce_LinkedListPointer.h
  38. +12
    -0
      src/containers/juce_NamedValueSet.cpp
  39. +2
    -0
      src/containers/juce_NamedValueSet.h
  40. +1
    -1
      src/core/juce_StandardHeader.h
  41. +0
    -1
      src/gui/components/mouse/juce_MouseEvent.h
  42. +1
    -1
      src/maths/juce_Expression.cpp
  43. +23
    -24
      src/native/windows/juce_win32_Fonts.cpp
  44. +3
    -1
      src/native/windows/juce_win32_Windowing.cpp
  45. +1
    -1
      src/text/juce_XmlElement.cpp
  46. +0
    -5
      src/utilities/juce_SelectedItemSet.h

+ 4
- 2
Builds/MacOSX/Juce.xcodeproj/project.pbxproj View File

@@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 44;
objectVersion = 45;
objects = { objects = {


0F4BA87762766B98D5B58AD0 = { isa = PBXBuildFile; fileRef = 144F56FCF3DF9EC922765901; }; 0F4BA87762766B98D5B58AD0 = { isa = PBXBuildFile; fileRef = 144F56FCF3DF9EC922765901; };
@@ -1897,6 +1897,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_DEBUG=1", "_DEBUG=1",
"DEBUG=1", "DEBUG=1",
"JUCE_ObjCExtraSuffix=JSlRKlNBb5",
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; };
9DE19CD5BB8E12A153385ADD = { isa = XCBuildConfiguration; buildSettings = { 9DE19CD5BB8E12A153385ADD = { isa = XCBuildConfiguration; buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_BIT)";
@@ -1914,6 +1915,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_NDEBUG=1", "_NDEBUG=1",
"NDEBUG=1", "NDEBUG=1",
"JUCE_ObjCExtraSuffix=JSlRKlNBb5",
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; };
8E935B9E7F2982A06CD7EF99 = { isa = XCBuildConfiguration; buildSettings = { 8E935B9E7F2982A06CD7EF99 = { isa = XCBuildConfiguration; buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
@@ -2294,7 +2296,7 @@
55EDB4D9B702B469DB4655C3 ); runOnlyForDeploymentPostprocessing = 0; }; 55EDB4D9B702B469DB4655C3 ); runOnlyForDeploymentPostprocessing = 0; };
01555BA382FAED280FF5F58A = { isa = PBXNativeTarget; buildConfigurationList = D14EC3F0DC5861E37D35E15A; buildPhases = ( 01555BA382FAED280FF5F58A = { isa = PBXNativeTarget; buildConfigurationList = D14EC3F0DC5861E37D35E15A; buildPhases = (
8914D147048B9EE245989ACB ); buildRules = ( ); dependencies = ( ); name = Juce; productName = Juce; productReference = 389351359BA78C682E1931A6; productType = "com.apple.product-type.library.static"; }; 8914D147048B9EE245989ACB ); buildRules = ( ); dependencies = ( ); name = Juce; productName = Juce; productReference = 389351359BA78C682E1931A6; productType = "com.apple.product-type.library.static"; };
FCFFEDFC83101B196BFA2AE2 = { isa = PBXProject; buildConfigurationList = 3A1CB6B5ECF4A79CDE35CC66; compatibilityVersion = "Xcode 3.0"; hasScannedForEncodings = 0; mainGroup = 992526B83B6AA618A4FAECEB; projectDirPath = ""; projectRoot = ""; targets = ( 01555BA382FAED280FF5F58A ); };
FCFFEDFC83101B196BFA2AE2 = { isa = PBXProject; buildConfigurationList = 3A1CB6B5ECF4A79CDE35CC66; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 992526B83B6AA618A4FAECEB; projectDirPath = ""; projectRoot = ""; targets = ( 01555BA382FAED280FF5F58A ); };
}; };
rootObject = FCFFEDFC83101B196BFA2AE2; rootObject = FCFFEDFC83101B196BFA2AE2;
} }

Builds/iPhone/Juce.xcodeproj/project.pbxproj → Builds/iOS/Juce.xcodeproj/project.pbxproj View File

@@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 44;
objectVersion = 45;
objects = { objects = {


0F4BA87762766B98D5B58AD0 = { isa = PBXBuildFile; fileRef = 144F56FCF3DF9EC922765901; }; 0F4BA87762766B98D5B58AD0 = { isa = PBXBuildFile; fileRef = 144F56FCF3DF9EC922765901; };
@@ -1889,7 +1889,6 @@
SYMROOT = ../../bin; SYMROOT = ../../bin;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)"; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)";
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
SDKROOT = iphonesimulator3.2;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
@@ -1897,7 +1896,8 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_DEBUG=1", "_DEBUG=1",
"DEBUG=1", "DEBUG=1",
"JUCER_XCODE_IPHONE_25ADD7EF=1"); }; name = Debug; };
"JUCE_ObjCExtraSuffix=JSlRKlNBb5",
"JUCER_XCODE_IPHONE_5BC26AE3=1"); }; name = Debug; };
9DE19CD5BB8E12A153385ADD = { isa = XCBuildConfiguration; buildSettings = { 9DE19CD5BB8E12A153385ADD = { isa = XCBuildConfiguration; buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_BIT)";
PREBINDING = NO; PREBINDING = NO;
@@ -1908,13 +1908,13 @@
SYMROOT = ../../bin; SYMROOT = ../../bin;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)"; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)";
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
SDKROOT = iphonesimulator3.2;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_NDEBUG=1", "_NDEBUG=1",
"NDEBUG=1", "NDEBUG=1",
"JUCER_XCODE_IPHONE_25ADD7EF=1"); }; name = Release; };
"JUCE_ObjCExtraSuffix=JSlRKlNBb5",
"JUCER_XCODE_IPHONE_5BC26AE3=1"); }; name = Release; };
8E935B9E7F2982A06CD7EF99 = { isa = XCBuildConfiguration; buildSettings = { 8E935B9E7F2982A06CD7EF99 = { isa = XCBuildConfiguration; buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
GCC_C_LANGUAGE_STANDARD = c99; GCC_C_LANGUAGE_STANDARD = c99;
@@ -1928,6 +1928,9 @@
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
ZERO_LINK = NO; ZERO_LINK = NO;
DEBUG_INFORMATION_FORMAT = "dwarf"; DEBUG_INFORMATION_FORMAT = "dwarf";
PRODUCT_NAME = "jucedebug"; }; name = Debug; }; PRODUCT_NAME = "jucedebug"; }; name = Debug; };
@@ -1944,6 +1947,9 @@
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
ZERO_LINK = NO; ZERO_LINK = NO;
DEBUG_INFORMATION_FORMAT = "dwarf"; DEBUG_INFORMATION_FORMAT = "dwarf";
PRODUCT_NAME = "juce"; }; name = Release; }; PRODUCT_NAME = "juce"; }; name = Release; };
@@ -2294,7 +2300,7 @@
55EDB4D9B702B469DB4655C3 ); runOnlyForDeploymentPostprocessing = 0; }; 55EDB4D9B702B469DB4655C3 ); runOnlyForDeploymentPostprocessing = 0; };
01555BA382FAED280FF5F58A = { isa = PBXNativeTarget; buildConfigurationList = D14EC3F0DC5861E37D35E15A; buildPhases = ( 01555BA382FAED280FF5F58A = { isa = PBXNativeTarget; buildConfigurationList = D14EC3F0DC5861E37D35E15A; buildPhases = (
8914D147048B9EE245989ACB ); buildRules = ( ); dependencies = ( ); name = Juce; productName = Juce; productReference = 389351359BA78C682E1931A6; productType = "com.apple.product-type.library.static"; }; 8914D147048B9EE245989ACB ); buildRules = ( ); dependencies = ( ); name = Juce; productName = Juce; productReference = 389351359BA78C682E1931A6; productType = "com.apple.product-type.library.static"; };
FCFFEDFC83101B196BFA2AE2 = { isa = PBXProject; buildConfigurationList = 3A1CB6B5ECF4A79CDE35CC66; compatibilityVersion = "Xcode 3.0"; hasScannedForEncodings = 0; mainGroup = 992526B83B6AA618A4FAECEB; projectDirPath = ""; projectRoot = ""; targets = ( 01555BA382FAED280FF5F58A ); };
FCFFEDFC83101B196BFA2AE2 = { isa = PBXProject; buildConfigurationList = 3A1CB6B5ECF4A79CDE35CC66; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 992526B83B6AA618A4FAECEB; projectDirPath = ""; projectRoot = ""; targets = ( 01555BA382FAED280FF5F58A ); };
}; };
rootObject = FCFFEDFC83101B196BFA2AE2; rootObject = FCFFEDFC83101B196BFA2AE2;
} }

+ 3
- 3
Juce.jucer View File

@@ -10,9 +10,9 @@
jucerVersion="3.0.0"> jucerVersion="3.0.0">
<EXPORTFORMATS> <EXPORTFORMATS>
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK" <XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
juceFolder="."/>
<XCODE_IPHONE targetFolder="Builds/iPhone" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
juceFolder="."/>
juceFolder="." objCExtraSuffix="JSlRKlNBb5"/>
<XCODE_IPHONE targetFolder="Builds/iOS" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
juceFolder="." objCExtraSuffix="JSlRKlNBb5"/>
<VS2005 targetFolder="Builds/VisualStudio2005" vstFolder="c:\SDKs\vstsdk2.4" <VS2005 targetFolder="Builds/VisualStudio2005" vstFolder="c:\SDKs\vstsdk2.4"
rtasFolder="c:\SDKs\PT_80_SDK" juceFolder="." libraryType="1" rtasFolder="c:\SDKs\PT_80_SDK" juceFolder="." libraryType="1"
libraryName_Debug="jucelib_static_Win32_debug.lib" libraryName_Release="jucelib_static_Win32.lib"/> libraryName_Debug="jucelib_static_Win32_debug.lib" libraryName_Release="jucelib_static_Win32.lib"/>


+ 4
- 2
extras/Jucer (experimental)/Builds/MacOSX/The Jucer.xcodeproj/project.pbxproj View File

@@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 44;
objectVersion = 45;
objects = { objects = {


7BDFF9F0E16DF33A980F46DC = { isa = PBXBuildFile; fileRef = 046FA2877C08618339161EE2; }; 7BDFF9F0E16DF33A980F46DC = { isa = PBXBuildFile; fileRef = 046FA2877C08618339161EE2; };
@@ -256,6 +256,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_DEBUG=1", "_DEBUG=1",
"DEBUG=1", "DEBUG=1",
"JUCE_ObjCExtraSuffix=zNNCr",
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; };
673FACB8969ADED17ACEFF7C = { isa = XCBuildConfiguration; buildSettings = { 673FACB8969ADED17ACEFF7C = { isa = XCBuildConfiguration; buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_BIT)";
@@ -270,6 +271,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_NDEBUG=1", "_NDEBUG=1",
"NDEBUG=1", "NDEBUG=1",
"JUCE_ObjCExtraSuffix=zNNCr",
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; };
69D26A715A354ED1735D8438 = { isa = XCBuildConfiguration; buildSettings = { 69D26A715A354ED1735D8438 = { isa = XCBuildConfiguration; buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
@@ -352,7 +354,7 @@
87CCE4CB1FAB40B6F21DEACE, 87CCE4CB1FAB40B6F21DEACE,
5362E03ADF975A126C1F2F7B, 5362E03ADF975A126C1F2F7B,
08881173C882953BE5F11D6C ); buildRules = ( ); dependencies = ( ); name = "The Jucer"; productName = "The Jucer"; productReference = 12E1601866B3489844AFD645; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; }; 08881173C882953BE5F11D6C ); buildRules = ( ); dependencies = ( ); name = "The Jucer"; productName = "The Jucer"; productReference = 12E1601866B3489844AFD645; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; };
D64DFDDF5D2CD74A8171CF81 = { isa = PBXProject; buildConfigurationList = 045AC698C60073CCF5CC6116; compatibilityVersion = "Xcode 3.0"; hasScannedForEncodings = 0; mainGroup = B01AA6CC1327A5DBCB35B7BF; projectDirPath = ""; projectRoot = ""; targets = ( EB946A866C16B958168C9A39 ); };
D64DFDDF5D2CD74A8171CF81 = { isa = PBXProject; buildConfigurationList = 045AC698C60073CCF5CC6116; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = B01AA6CC1327A5DBCB35B7BF; projectDirPath = ""; projectRoot = ""; targets = ( EB946A866C16B958168C9A39 ); };
}; };
rootObject = D64DFDDF5D2CD74A8171CF81; rootObject = D64DFDDF5D2CD74A8171CF81;
} }

+ 1
- 1
extras/Jucer (experimental)/Jucer.jucer View File

@@ -12,7 +12,7 @@
pluginAUViewClass="TheJucerAU_V1" pluginRTASCategory="" bundleIdentifier="com.rawmaterialsoftware.thejucer"> pluginAUViewClass="TheJucerAU_V1" pluginRTASCategory="" bundleIdentifier="com.rawmaterialsoftware.thejucer">
<EXPORTFORMATS> <EXPORTFORMATS>
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK" <XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
juceFolder="../.." documentExtensions=".jucer"/>
juceFolder="../.." documentExtensions=".jucer" objCExtraSuffix="zNNCr"/>
<VS2005 targetFolder="Builds/VisualStudio2005" vstFolder="c:\SDKs\vstsdk2.4" <VS2005 targetFolder="Builds/VisualStudio2005" vstFolder="c:\SDKs\vstsdk2.4"
rtasFolder="c:\SDKs\PT_80_SDK" juceFolder="../.." libraryType="1"/> rtasFolder="c:\SDKs\PT_80_SDK" juceFolder="../.." libraryType="1"/>
<VS2008 targetFolder="Builds/VisualStudio2008" vstFolder="c:\SDKs\vstsdk2.4" <VS2008 targetFolder="Builds/VisualStudio2008" vstFolder="c:\SDKs\vstsdk2.4"


+ 0
- 1
extras/Jucer (experimental)/Source/Project/jucer_NewProjectWizard.cpp View File

@@ -237,7 +237,6 @@ public:
File editorHFile = editorCppFile.withFileExtension (".h"); File editorHFile = editorCppFile.withFileExtension (".h");
project.getProjectType() = Project::audioPlugin; project.getProjectType() = Project::audioPlugin;
project.getObjectiveCClassSuffix() = project.getProjectUID();
Project::Item group (project.createNewGroup()); Project::Item group (project.createNewGroup());
project.getMainGroup().addChild (group, 0); project.getMainGroup().addChild (group, 0);


+ 0
- 3
extras/Jucer (experimental)/Source/Project/jucer_Project.cpp View File

@@ -350,9 +350,6 @@ void Project::createPropertyEditors (Array <PropertyComponent*>& props)
props.getLast()->setTooltip ("Sets an icon to use for the executable."); props.getLast()->setTooltip ("Sets an icon to use for the executable.");
} }
props.add (new TextPropertyComponent (getObjectiveCClassSuffix(), "Objective-C Name Suffix", 256, false));
props.getLast()->setTooltip ("An optional string which will be appended to objective-C class names. If you're building a plugin, it's important to define this, to avoid name clashes between multiple plugin modules that are dynamically loaded into the same address space.");
if (isAudioPlugin()) if (isAudioPlugin())
{ {
props.add (new BooleanPropertyComponent (shouldBuildVST(), "Build VST", "Enabled")); props.add (new BooleanPropertyComponent (shouldBuildVST(), "Build VST", "Enabled"));


+ 0
- 2
extras/Jucer (experimental)/Source/Project/jucer_Project.h View File

@@ -110,8 +110,6 @@ public:
const Image getBigIcon(); const Image getBigIcon();
const Image getSmallIcon(); const Image getSmallIcon();
Value getObjectiveCClassSuffix() const { return getProjectValue ("objCSuffix"); }
Value shouldBuildVST() const { return getProjectValue ("buildVST"); } Value shouldBuildVST() const { return getProjectValue ("buildVST"); }
Value shouldBuildRTAS() const { return getProjectValue ("buildRTAS"); } Value shouldBuildRTAS() const { return getProjectValue ("buildRTAS"); }
Value shouldBuildAU() const { return getProjectValue ("buildAU"); } Value shouldBuildAU() const { return getProjectValue ("buildAU"); }


+ 0
- 10
extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_MSVC.h View File

@@ -52,8 +52,6 @@ public:
projectGUID = createGUID (project.getProjectUID()); projectGUID = createGUID (project.getProjectUID());
} }
~MSVCProjectExporterBase() {}
//============================================================================== //==============================================================================
bool isPossibleForCurrentProject() { return true; } bool isPossibleForCurrentProject() { return true; }
bool usesMMFiles() const { return false; } bool usesMMFiles() const { return false; }
@@ -464,8 +462,6 @@ public:
name = getName(); name = getName();
} }
~MSVCProjectExporterVC2008() {}
static const char* getName() { return "Visual Studio 2008"; } static const char* getName() { return "Visual Studio 2008"; }
static const char* getValueTreeTypeName() { return "VS2008"; } static const char* getValueTreeTypeName() { return "VS2008"; }
@@ -830,8 +826,6 @@ public:
name = getName(); name = getName();
} }
~MSVCProjectExporterVC2005() {}
static const char* getName() { return "Visual Studio 2005"; } static const char* getName() { return "Visual Studio 2005"; }
static const char* getValueTreeTypeName() { return "VS2005"; } static const char* getValueTreeTypeName() { return "VS2005"; }
@@ -864,8 +858,6 @@ public:
name = getName(); name = getName();
} }
~MSVCProjectExporterVC6() {}
static const char* getName() { return "Visual C++ 6.0"; } static const char* getName() { return "Visual C++ 6.0"; }
static const char* getValueTreeTypeName() { return "MSVC6"; } static const char* getValueTreeTypeName() { return "MSVC6"; }
@@ -1133,8 +1125,6 @@ public:
name = getName(); name = getName();
} }
~MSVCProjectExporterVC2010() {}
static const char* getName() { return "Visual Studio 2010"; } static const char* getName() { return "Visual Studio 2010"; }
static const char* getValueTreeTypeName() { return "VS2010"; } static const char* getValueTreeTypeName() { return "VS2010"; }


+ 0
- 4
extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_Make.h View File

@@ -59,10 +59,6 @@ public:
getVSTFolder() = "~/SDKs/vstsdk2.4"; getVSTFolder() = "~/SDKs/vstsdk2.4";
} }
~MakefileProjectExporter()
{
}
//============================================================================== //==============================================================================
bool isDefaultFormatForCurrentOS() bool isDefaultFormatForCurrentOS()
{ {


+ 16
- 12
extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_XCode.h View File

@@ -55,10 +55,9 @@ public:
if (getRTASFolder().toString().isEmpty()) if (getRTASFolder().toString().isEmpty())
getRTASFolder() = "~/SDKs/PT_80_SDK"; getRTASFolder() = "~/SDKs/PT_80_SDK";
}
~XCodeProjectExporter()
{
if (getSettings() ["objCExtraSuffix"].isVoid())
getObjCSuffix() = createAlphaNumericUID();
} }
static XCodeProjectExporter* createForSettings (Project& project, const ValueTree& settings) static XCodeProjectExporter* createForSettings (Project& project, const ValueTree& settings)
@@ -72,6 +71,8 @@ public:
} }
//============================================================================== //==============================================================================
Value getObjCSuffix() { return getSetting ("objCExtraSuffix"); }
bool isDefaultFormatForCurrentOS() bool isDefaultFormatForCurrentOS()
{ {
#if JUCE_MAC #if JUCE_MAC
@@ -88,7 +89,7 @@ public:
{ {
ProjectExporter::createPropertyEditors (props); ProjectExporter::createPropertyEditors (props);
props.add (new TextPropertyComponent (getSetting ("objCExtraSuffix"), "Objective-C class name suffix", 64, false));
props.add (new TextPropertyComponent (getObjCSuffix(), "Objective-C class name suffix", 64, false));
props.getLast()->setTooltip ("Because objective-C linkage is done by string-matching, you can get horrible linkage mix-ups when different modules containing the " props.getLast()->setTooltip ("Because objective-C linkage is done by string-matching, you can get horrible linkage mix-ups when different modules containing the "
"same class-names are loaded simultaneously. This setting lets you provide a unique string that will be used in naming the obj-C classes in your executable to avoid this."); "same class-names are loaded simultaneously. This setting lets you provide a unique string that will be used in naming the obj-C classes in your executable to avoid this.");
@@ -504,6 +505,13 @@ private:
s.add ("GCC_INLINES_ARE_PRIVATE_EXTERN = YES"); s.add ("GCC_INLINES_ARE_PRIVATE_EXTERN = YES");
} }
if (iPhone)
{
s.add ("\"CODE_SIGN_IDENTITY[sdk=iphoneos*]\" = \"iPhone Developer\"");
s.add ("SDKROOT = iphoneos");
s.add ("TARGETED_DEVICE_FAMILY = \"1,2\"");
}
s.add ("ZERO_LINK = NO"); s.add ("ZERO_LINK = NO");
if (! isRTAS()) // (dwarf seems to be incompatible with the RTAS libs) if (! isRTAS()) // (dwarf seems to be incompatible with the RTAS libs)
@@ -567,11 +575,7 @@ private:
jassertfalse; jassertfalse;
} }
if (iPhone)
{
s.add ("SDKROOT = iphonesimulator3.2");
}
else
if (! iPhone)
{ {
const String sdk (config.getMacSDKVersion().toString()); const String sdk (config.getMacSDKVersion().toString());
const String sdkCompat (config.getMacCompatibilityVersion().toString()); const String sdkCompat (config.getMacCompatibilityVersion().toString());
@@ -638,7 +642,7 @@ private:
} }
{ {
const String objCSuffix (getSetting ("objCExtraSuffix").toString().trim());
const String objCSuffix (getObjCSuffix().toString().trim());
if (objCSuffix.isNotEmpty()) if (objCSuffix.isNotEmpty())
defines.set ("JUCE_ObjCExtraSuffix", replacePreprocessorTokens (config, objCSuffix)); defines.set ("JUCE_ObjCExtraSuffix", replacePreprocessorTokens (config, objCSuffix));
} }
@@ -692,7 +696,7 @@ private:
output << "// !$*UTF8*$!\n{\n" output << "// !$*UTF8*$!\n{\n"
"\tarchiveVersion = 1;\n" "\tarchiveVersion = 1;\n"
"\tclasses = {\n\t};\n" "\tclasses = {\n\t};\n"
"\tobjectVersion = 44;\n"
"\tobjectVersion = 45;\n"
"\tobjects = {\n\n"; "\tobjects = {\n\n";
Array <ValueTree*> objects; Array <ValueTree*> objects;
@@ -1019,7 +1023,7 @@ private:
ValueTree* v = new ValueTree (createID ("__root")); ValueTree* v = new ValueTree (createID ("__root"));
v->setProperty ("isa", "PBXProject", 0); v->setProperty ("isa", "PBXProject", 0);
v->setProperty ("buildConfigurationList", createID ("__projList"), 0); v->setProperty ("buildConfigurationList", createID ("__projList"), 0);
v->setProperty ("compatibilityVersion", "Xcode 3.0", 0);
v->setProperty ("compatibilityVersion", "Xcode 3.1", 0);
v->setProperty ("hasScannedForEncodings", (int) 0, 0); v->setProperty ("hasScannedForEncodings", (int) 0, 0);
v->setProperty ("mainGroup", getIDForGroup (project.getMainGroup()), 0); v->setProperty ("mainGroup", getIDForGroup (project.getMainGroup()), 0);
v->setProperty ("projectDirPath", "\"\"", 0); v->setProperty ("projectDirPath", "\"\"", 0);


+ 0
- 3
extras/Jucer (experimental)/Source/Project/jucer_ProjectSaver.h View File

@@ -364,9 +364,6 @@ private:
<< "#define JucePlugin_RTASManufacturerCode JucePlugin_ManufacturerCode" << newLine << "#define JucePlugin_RTASManufacturerCode JucePlugin_ManufacturerCode" << newLine
<< "#define JucePlugin_RTASProductId JucePlugin_PluginCode" << newLine; << "#define JucePlugin_RTASProductId JucePlugin_PluginCode" << newLine;
if (project.getObjectiveCClassSuffix().toString().isNotEmpty())
out << "#define JUCE_ObjCExtraSuffix " << project.getObjectiveCClassSuffix().toString() << newLine;
out << "#define JUCE_USE_VSTSDK_2_4 1" << newLine out << "#define JUCE_USE_VSTSDK_2_4 1" << newLine
<< newLine << newLine
<< "#endif // " << headerGuard << newLine; << "#endif // " << headerGuard << newLine;


+ 3
- 1
extras/Jucer (experimental)/Source/Utility/jucer_MiscUtilities.cpp View File

@@ -38,7 +38,9 @@ const String createAlphaNumericUID()
static const char chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; static const char chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
Random r (Random::getSystemRandom().nextInt64()); Random r (Random::getSystemRandom().nextInt64());
for (int i = 7; --i >= 0;)
uid << chars [r.nextInt (52)]; // make sure the first character is always a letter
for (int i = 5; --i >= 0;)
{ {
r.setSeedRandomly(); r.setSeedRandomly();
uid << chars [r.nextInt (numElementsInArray (chars))]; uid << chars [r.nextInt (numElementsInArray (chars))];


+ 1
- 1
extras/amalgamator/Amalgamator.jucer View File

@@ -10,7 +10,7 @@
pluginAUViewClass="AmalgamatorAU_V1" pluginRTASCategory="" bundleIdentifier="com.rawmaterialsoftware.amalgamator"> pluginAUViewClass="AmalgamatorAU_V1" pluginRTASCategory="" bundleIdentifier="com.rawmaterialsoftware.amalgamator">
<EXPORTFORMATS> <EXPORTFORMATS>
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK" <XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
juceFolder="../../../juce"/>
juceFolder="../../../juce" objCExtraSuffix="OTDGfH"/>
<VS2005 targetFolder="Builds/VisualStudio2005" vstFolder="c:\SDKs\vstsdk2.4" <VS2005 targetFolder="Builds/VisualStudio2005" vstFolder="c:\SDKs\vstsdk2.4"
rtasFolder="c:\SDKs\PT_80_SDK" juceFolder="../../../juce" libraryType="1"/> rtasFolder="c:\SDKs\PT_80_SDK" juceFolder="../../../juce" libraryType="1"/>
<VS2008 targetFolder="Builds/VisualStudio2008" vstFolder="c:\SDKs\vstsdk2.4" <VS2008 targetFolder="Builds/VisualStudio2008" vstFolder="c:\SDKs\vstsdk2.4"


+ 4
- 2
extras/amalgamator/Builds/MacOSX/Amalgamator.xcodeproj/project.pbxproj View File

@@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 44;
objectVersion = 45;
objects = { objects = {


519A1FD5D107BA064C820D19 = { isa = PBXBuildFile; fileRef = EA2AB86C7C92284FED89D52F; }; 519A1FD5D107BA064C820D19 = { isa = PBXBuildFile; fileRef = EA2AB86C7C92284FED89D52F; };
@@ -76,6 +76,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_DEBUG=1", "_DEBUG=1",
"DEBUG=1", "DEBUG=1",
"JUCE_ObjCExtraSuffix=OTDGfH",
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; };
4DFAC29D863495AD1E31B6B9 = { isa = XCBuildConfiguration; buildSettings = { 4DFAC29D863495AD1E31B6B9 = { isa = XCBuildConfiguration; buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_BIT)";
@@ -89,6 +90,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_NDEBUG=1", "_NDEBUG=1",
"NDEBUG=1", "NDEBUG=1",
"JUCE_ObjCExtraSuffix=OTDGfH",
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; };
4EAD81574ACF05AC27D04B76 = { isa = XCBuildConfiguration; buildSettings = { 4EAD81574ACF05AC27D04B76 = { isa = XCBuildConfiguration; buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
@@ -146,7 +148,7 @@
6D960AB00F450781A680A10C, 6D960AB00F450781A680A10C,
492D061FDF3111EE0092E6B8, 492D061FDF3111EE0092E6B8,
ED422768B82C5C079964D4A9 ); buildRules = ( ); dependencies = ( ); name = Amalgamator; productName = Amalgamator; productReference = F8AC870D665D0F64E9129D83; productInstallPath = /usr/bin; productType = "com.apple.product-type.tool"; }; ED422768B82C5C079964D4A9 ); buildRules = ( ); dependencies = ( ); name = Amalgamator; productName = Amalgamator; productReference = F8AC870D665D0F64E9129D83; productInstallPath = /usr/bin; productType = "com.apple.product-type.tool"; };
BC0813C44DC69E1626F486CE = { isa = PBXProject; buildConfigurationList = FA25EC7DB69A3A88993F2853; compatibilityVersion = "Xcode 3.0"; hasScannedForEncodings = 0; mainGroup = 5DCB99F3A59154C29483AE9B; projectDirPath = ""; projectRoot = ""; targets = ( C15E717C5DA07024CAFE5177 ); };
BC0813C44DC69E1626F486CE = { isa = PBXProject; buildConfigurationList = FA25EC7DB69A3A88993F2853; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 5DCB99F3A59154C29483AE9B; projectDirPath = ""; projectRoot = ""; targets = ( C15E717C5DA07024CAFE5177 ); };
}; };
rootObject = BC0813C44DC69E1626F486CE; rootObject = BC0813C44DC69E1626F486CE;
} }

+ 4
- 2
extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj View File

@@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 44;
objectVersion = 45;
objects = { objects = {


A43062AA3FCA13D950980A9D = { isa = PBXBuildFile; fileRef = 3DC11B31DA65802201AFD1A3; }; A43062AA3FCA13D950980A9D = { isa = PBXBuildFile; fileRef = 3DC11B31DA65802201AFD1A3; };
@@ -114,6 +114,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_DEBUG=1", "_DEBUG=1",
"DEBUG=1", "DEBUG=1",
"JUCE_ObjCExtraSuffix=M73TRi",
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; };
90901561E3F7FD713257B23D = { isa = XCBuildConfiguration; buildSettings = { 90901561E3F7FD713257B23D = { isa = XCBuildConfiguration; buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_BIT)";
@@ -128,6 +129,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_NDEBUG=1", "_NDEBUG=1",
"NDEBUG=1", "NDEBUG=1",
"JUCE_ObjCExtraSuffix=M73TRi",
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; };
8133D32BA8816D704BF648FA = { isa = XCBuildConfiguration; buildSettings = { 8133D32BA8816D704BF648FA = { isa = XCBuildConfiguration; buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
@@ -194,7 +196,7 @@
B02D5D856D086055BAA5AE80, B02D5D856D086055BAA5AE80,
8CC459E43DF37AB224B7E23C, 8CC459E43DF37AB224B7E23C,
30E98A3D15EFB4DAAD89D12D ); buildRules = ( ); dependencies = ( ); name = "Plugin Host"; productName = "Plugin Host"; productReference = 3B43D9C2C41077380D379A07; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; }; 30E98A3D15EFB4DAAD89D12D ); buildRules = ( ); dependencies = ( ); name = "Plugin Host"; productName = "Plugin Host"; productReference = 3B43D9C2C41077380D379A07; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; };
FFAE6699AB89F7E949098342 = { isa = PBXProject; buildConfigurationList = 3DBB3F42145D936BBD5425D7; compatibilityVersion = "Xcode 3.0"; hasScannedForEncodings = 0; mainGroup = E1B7497DFD48F160861E53A2; projectDirPath = ""; projectRoot = ""; targets = ( 04F5D340BA63D9F8DE145DFB ); };
FFAE6699AB89F7E949098342 = { isa = PBXProject; buildConfigurationList = 3DBB3F42145D936BBD5425D7; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = E1B7497DFD48F160861E53A2; projectDirPath = ""; projectRoot = ""; targets = ( 04F5D340BA63D9F8DE145DFB ); };
}; };
rootObject = FFAE6699AB89F7E949098342; rootObject = FFAE6699AB89F7E949098342;
} }

+ 1
- 1
extras/audio plugin host/Plugin Host.jucer View File

@@ -13,7 +13,7 @@
jucerVersion="3.0.0"> jucerVersion="3.0.0">
<EXPORTFORMATS> <EXPORTFORMATS>
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK" <XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
juceFolder="../.."/>
juceFolder="../.." objCExtraSuffix="M73TRi"/>
<VS2005 targetFolder="Builds/VisualStudio2005" vstFolder="c:\SDKs\vstsdk2.4" <VS2005 targetFolder="Builds/VisualStudio2005" vstFolder="c:\SDKs\vstsdk2.4"
rtasFolder="c:\SDKs\PT_80_SDK" juceFolder="../.." libraryType="1"/> rtasFolder="c:\SDKs\PT_80_SDK" juceFolder="../.." libraryType="1"/>
<VS2008 targetFolder="Builds/VisualStudio2008" vstFolder="c:\SDKs\vstsdk2.4" <VS2008 targetFolder="Builds/VisualStudio2008" vstFolder="c:\SDKs\vstsdk2.4"


+ 2
- 2
extras/audio plugins/demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj View File

@@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 44;
objectVersion = 45;
objects = { objects = {


0860A8808F16C84CE7641D04 = { isa = PBXBuildFile; fileRef = 91F0411829B13595887CE52A; }; 0860A8808F16C84CE7641D04 = { isa = PBXBuildFile; fileRef = 91F0411829B13595887CE52A; };
@@ -366,7 +366,7 @@
F0F39FCA8C402F34BB74F6B3, F0F39FCA8C402F34BB74F6B3,
9519B014653C694C3456E5A4, 9519B014653C694C3456E5A4,
06539322921079C10A447670 ); buildRules = ( ); dependencies = ( ); name = JuceDemoPlugin; productName = JuceDemoPlugin; productReference = AF721FB8136D2CAA9404AD8D; productInstallPath = "$(HOME)/Library/Audio/Plug-Ins/Components/"; productType = "com.apple.product-type.bundle"; }; 06539322921079C10A447670 ); buildRules = ( ); dependencies = ( ); name = JuceDemoPlugin; productName = JuceDemoPlugin; productReference = AF721FB8136D2CAA9404AD8D; productInstallPath = "$(HOME)/Library/Audio/Plug-Ins/Components/"; productType = "com.apple.product-type.bundle"; };
64CEAC70FBD5AC5BD1D686C9 = { isa = PBXProject; buildConfigurationList = 91EB753864A948DE4421285E; compatibilityVersion = "Xcode 3.0"; hasScannedForEncodings = 0; mainGroup = E1C5E3C67B4A2621AD2D3E05; projectDirPath = ""; projectRoot = ""; targets = ( 792509270ABF8E6A65E16172 ); };
64CEAC70FBD5AC5BD1D686C9 = { isa = PBXProject; buildConfigurationList = 91EB753864A948DE4421285E; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = E1C5E3C67B4A2621AD2D3E05; projectDirPath = ""; projectRoot = ""; targets = ( 792509270ABF8E6A65E16172 ); };
}; };
rootObject = 64CEAC70FBD5AC5BD1D686C9; rootObject = 64CEAC70FBD5AC5BD1D686C9;
} }

+ 1
- 1
extras/binarybuilder/BinaryBuilder.jucer View File

@@ -11,7 +11,7 @@
bundleIdentifier="com.rawmaterialsoftware.binarybuilder"> bundleIdentifier="com.rawmaterialsoftware.binarybuilder">
<EXPORTFORMATS> <EXPORTFORMATS>
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK" <XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
juceFolder="../../../juce"/>
juceFolder="../../../juce" objCExtraSuffix="OeJtJb"/>
<VS2005 targetFolder="Builds/VisualStudio2005" vstFolder="c:\SDKs\vstsdk2.4" <VS2005 targetFolder="Builds/VisualStudio2005" vstFolder="c:\SDKs\vstsdk2.4"
rtasFolder="c:\SDKs\PT_80_SDK" juceFolder="../../../juce"/> rtasFolder="c:\SDKs\PT_80_SDK" juceFolder="../../../juce"/>
<VS2008 targetFolder="Builds/VisualStudio2008" vstFolder="c:\SDKs\vstsdk2.4" <VS2008 targetFolder="Builds/VisualStudio2008" vstFolder="c:\SDKs\vstsdk2.4"


+ 4
- 2
extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj View File

@@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 44;
objectVersion = 45;
objects = { objects = {


E8996D80686F2B3EC62DBDBB = { isa = PBXBuildFile; fileRef = 7119161802FA9887683494D0; }; E8996D80686F2B3EC62DBDBB = { isa = PBXBuildFile; fileRef = 7119161802FA9887683494D0; };
@@ -76,6 +76,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_DEBUG=1", "_DEBUG=1",
"DEBUG=1", "DEBUG=1",
"JUCE_ObjCExtraSuffix=OeJtJb",
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; };
D4E910481C9C05D598DC755B = { isa = XCBuildConfiguration; buildSettings = { D4E910481C9C05D598DC755B = { isa = XCBuildConfiguration; buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_BIT)";
@@ -89,6 +90,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_NDEBUG=1", "_NDEBUG=1",
"NDEBUG=1", "NDEBUG=1",
"JUCE_ObjCExtraSuffix=OeJtJb",
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; };
C69BDE02D12775D4A17BFA17 = { isa = XCBuildConfiguration; buildSettings = { C69BDE02D12775D4A17BFA17 = { isa = XCBuildConfiguration; buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
@@ -146,7 +148,7 @@
F485685C969D78B9212B61AD, F485685C969D78B9212B61AD,
C02C54CA659982168A3DA559, C02C54CA659982168A3DA559,
753185144E84CC3E130F945B ); buildRules = ( ); dependencies = ( ); name = BinaryBuilder; productName = BinaryBuilder; productReference = 7FABD4A9FCB57F9C63BD5D34; productInstallPath = /usr/bin; productType = "com.apple.product-type.tool"; }; 753185144E84CC3E130F945B ); buildRules = ( ); dependencies = ( ); name = BinaryBuilder; productName = BinaryBuilder; productReference = 7FABD4A9FCB57F9C63BD5D34; productInstallPath = /usr/bin; productType = "com.apple.product-type.tool"; };
33F77160E42E0F4DA09F3660 = { isa = PBXProject; buildConfigurationList = 71143A294DF2ABC013DAD8F4; compatibilityVersion = "Xcode 3.0"; hasScannedForEncodings = 0; mainGroup = 07E3546C6DFA9084D23A33E9; projectDirPath = ""; projectRoot = ""; targets = ( 495DDE27E308E15C44991018 ); };
33F77160E42E0F4DA09F3660 = { isa = PBXProject; buildConfigurationList = 71143A294DF2ABC013DAD8F4; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 07E3546C6DFA9084D23A33E9; projectDirPath = ""; projectRoot = ""; targets = ( 495DDE27E308E15C44991018 ); };
}; };
rootObject = 33F77160E42E0F4DA09F3660; rootObject = 33F77160E42E0F4DA09F3660;
} }

+ 4
- 2
extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj View File

@@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 44;
objectVersion = 45;
objects = { objects = {


3F902D2C41E0C1FFC90C2724 = { isa = PBXBuildFile; fileRef = C820D5B3DC8B4E486B13FF4A; }; 3F902D2C41E0C1FFC90C2724 = { isa = PBXBuildFile; fileRef = C820D5B3DC8B4E486B13FF4A; };
@@ -93,6 +93,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_DEBUG=1", "_DEBUG=1",
"DEBUG=1", "DEBUG=1",
"JUCE_ObjCExtraSuffix=JtTAKTK1s",
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; };
2BF0DFE3F61DBC969BCBD0C4 = { isa = XCBuildConfiguration; buildSettings = { 2BF0DFE3F61DBC969BCBD0C4 = { isa = XCBuildConfiguration; buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_BIT)";
@@ -107,6 +108,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_NDEBUG=1", "_NDEBUG=1",
"NDEBUG=1", "NDEBUG=1",
"JUCE_ObjCExtraSuffix=JtTAKTK1s",
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; };
1C939EADBAB81B95A46A6581 = { isa = XCBuildConfiguration; buildSettings = { 1C939EADBAB81B95A46A6581 = { isa = XCBuildConfiguration; buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
@@ -168,7 +170,7 @@
4B8D17F77F2E2E7A2419CB17, 4B8D17F77F2E2E7A2419CB17,
172414663F1A38D78D2B00C3, 172414663F1A38D78D2B00C3,
CB4944AF280662FF07FEFEC4 ); buildRules = ( ); dependencies = ( ); name = HelloWorld; productName = HelloWorld; productReference = D5A29444C637255D66ACB7AE; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; }; CB4944AF280662FF07FEFEC4 ); buildRules = ( ); dependencies = ( ); name = HelloWorld; productName = HelloWorld; productReference = D5A29444C637255D66ACB7AE; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; };
9A0E300BBDAFA50EA37EA0D9 = { isa = PBXProject; buildConfigurationList = C71BF9C42683418116C8426E; compatibilityVersion = "Xcode 3.0"; hasScannedForEncodings = 0; mainGroup = 4297D3C9A6348BA224516847; projectDirPath = ""; projectRoot = ""; targets = ( 9F559EB2CC99871D47887B82 ); };
9A0E300BBDAFA50EA37EA0D9 = { isa = PBXProject; buildConfigurationList = C71BF9C42683418116C8426E; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 4297D3C9A6348BA224516847; projectDirPath = ""; projectRoot = ""; targets = ( 9F559EB2CC99871D47887B82 ); };
}; };
rootObject = 9A0E300BBDAFA50EA37EA0D9; rootObject = 9A0E300BBDAFA50EA37EA0D9;
} }

extras/example projects/Builds/iPhone/HelloWorld.xcodeproj/project.pbxproj → extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj View File

@@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 44;
objectVersion = 45;
objects = { objects = {


BAEB975FAD8A99FA884DC593 = { isa = PBXBuildFile; fileRef = 6B236CD90C0803738D7B5235; }; BAEB975FAD8A99FA884DC593 = { isa = PBXBuildFile; fileRef = 6B236CD90C0803738D7B5235; };
@@ -70,7 +70,6 @@
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications"; INSTALL_PATH = "$(HOME)/Applications";
SDKROOT = iphonesimulator3.2;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
@@ -78,7 +77,8 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_DEBUG=1", "_DEBUG=1",
"DEBUG=1", "DEBUG=1",
"JUCER_XCODE_IPHONE_25ADD7EF=1"); }; name = Debug; };
"JUCE_ObjCExtraSuffix=JtTAKTK1s",
"JUCER_XCODE_IPHONE_5BC26AE3=1"); }; name = Debug; };
2BF0DFE3F61DBC969BCBD0C4 = { isa = XCBuildConfiguration; buildSettings = { 2BF0DFE3F61DBC969BCBD0C4 = { isa = XCBuildConfiguration; buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_BIT)";
PREBINDING = NO; PREBINDING = NO;
@@ -86,13 +86,13 @@
GCC_OPTIMIZATION_LEVEL = s; GCC_OPTIMIZATION_LEVEL = s;
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications"; INSTALL_PATH = "$(HOME)/Applications";
SDKROOT = iphonesimulator3.2;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_NDEBUG=1", "_NDEBUG=1",
"NDEBUG=1", "NDEBUG=1",
"JUCER_XCODE_IPHONE_25ADD7EF=1"); }; name = Release; };
"JUCE_ObjCExtraSuffix=JtTAKTK1s",
"JUCER_XCODE_IPHONE_5BC26AE3=1"); }; name = Release; };
1C939EADBAB81B95A46A6581 = { isa = XCBuildConfiguration; buildSettings = { 1C939EADBAB81B95A46A6581 = { isa = XCBuildConfiguration; buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
GCC_C_LANGUAGE_STANDARD = c99; GCC_C_LANGUAGE_STANDARD = c99;
@@ -105,6 +105,9 @@
WARNING_CFLAGS = -Wreorder; WARNING_CFLAGS = -Wreorder;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
ZERO_LINK = NO; ZERO_LINK = NO;
DEBUG_INFORMATION_FORMAT = "dwarf"; DEBUG_INFORMATION_FORMAT = "dwarf";
PRODUCT_NAME = "HelloWorld"; }; name = Debug; }; PRODUCT_NAME = "HelloWorld"; }; name = Debug; };
@@ -120,6 +123,9 @@
WARNING_CFLAGS = -Wreorder; WARNING_CFLAGS = -Wreorder;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
ZERO_LINK = NO; ZERO_LINK = NO;
DEBUG_INFORMATION_FORMAT = "dwarf"; DEBUG_INFORMATION_FORMAT = "dwarf";
PRODUCT_NAME = "HelloWorld"; }; name = Release; }; PRODUCT_NAME = "HelloWorld"; }; name = Release; };
@@ -148,7 +154,7 @@
4B8D17F77F2E2E7A2419CB17, 4B8D17F77F2E2E7A2419CB17,
172414663F1A38D78D2B00C3, 172414663F1A38D78D2B00C3,
CB4944AF280662FF07FEFEC4 ); buildRules = ( ); dependencies = ( ); name = HelloWorld; productName = HelloWorld; productReference = D5A29444C637255D66ACB7AE; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; }; CB4944AF280662FF07FEFEC4 ); buildRules = ( ); dependencies = ( ); name = HelloWorld; productName = HelloWorld; productReference = D5A29444C637255D66ACB7AE; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; };
9A0E300BBDAFA50EA37EA0D9 = { isa = PBXProject; buildConfigurationList = C71BF9C42683418116C8426E; compatibilityVersion = "Xcode 3.0"; hasScannedForEncodings = 0; mainGroup = 4297D3C9A6348BA224516847; projectDirPath = ""; projectRoot = ""; targets = ( 9F559EB2CC99871D47887B82 ); };
9A0E300BBDAFA50EA37EA0D9 = { isa = PBXProject; buildConfigurationList = C71BF9C42683418116C8426E; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 4297D3C9A6348BA224516847; projectDirPath = ""; projectRoot = ""; targets = ( 9F559EB2CC99871D47887B82 ); };
}; };
rootObject = 9A0E300BBDAFA50EA37EA0D9; rootObject = 9A0E300BBDAFA50EA37EA0D9;
} }

extras/example projects/Builds/iPhone/Info.plist → extras/example projects/Builds/iOS/Info.plist View File


+ 3
- 3
extras/example projects/HelloWorld.jucer View File

@@ -12,9 +12,9 @@
pluginAUViewClass="HelloWorldAU_V1" pluginRTASCategory="" bundleIdentifier="com.rawmaterialsoftware.jucehelloworld"> pluginAUViewClass="HelloWorldAU_V1" pluginRTASCategory="" bundleIdentifier="com.rawmaterialsoftware.jucehelloworld">
<EXPORTFORMATS> <EXPORTFORMATS>
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK" <XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
juceFolder="../.."/>
<XCODE_IPHONE targetFolder="Builds/iPhone" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
juceFolder="../.."/>
juceFolder="../.." objCExtraSuffix="JtTAKTK1s"/>
<XCODE_IPHONE targetFolder="Builds/iOS" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
juceFolder="../.." objCExtraSuffix="JtTAKTK1s"/>
<VS2005 targetFolder="Builds/VisualStudio2005" vstFolder="c:\SDKs\vstsdk2.4" <VS2005 targetFolder="Builds/VisualStudio2005" vstFolder="c:\SDKs\vstsdk2.4"
rtasFolder="c:\SDKs\PT_80_SDK" juceFolder="../.." libraryType="1"/> rtasFolder="c:\SDKs\PT_80_SDK" juceFolder="../.." libraryType="1"/>
<VS2008 targetFolder="Builds/VisualStudio2008" vstFolder="c:\SDKs\vstsdk2.4" <VS2008 targetFolder="Builds/VisualStudio2008" vstFolder="c:\SDKs\vstsdk2.4"


BIN
extras/juce demo/Builds/MacOSX/Icon.icns View File


+ 4
- 2
extras/juce demo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj View File

@@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 44;
objectVersion = 45;
objects = { objects = {


92A7143821252FB13891CC53 = { isa = PBXBuildFile; fileRef = 2B37CDCFCBC0AC0AEAA9A479; }; 92A7143821252FB13891CC53 = { isa = PBXBuildFile; fileRef = 2B37CDCFCBC0AC0AEAA9A479; };
@@ -190,6 +190,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_DEBUG=1", "_DEBUG=1",
"DEBUG=1", "DEBUG=1",
"JUCE_ObjCExtraSuffix=JSLvvV6j",
"JUCE_UNIT_TESTS=1", "JUCE_UNIT_TESTS=1",
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; };
8EF7C7FFD55219581A5075F3 = { isa = XCBuildConfiguration; buildSettings = { 8EF7C7FFD55219581A5075F3 = { isa = XCBuildConfiguration; buildSettings = {
@@ -205,6 +206,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_NDEBUG=1", "_NDEBUG=1",
"NDEBUG=1", "NDEBUG=1",
"JUCE_ObjCExtraSuffix=JSLvvV6j",
"JUCE_UNIT_TESTS=1", "JUCE_UNIT_TESTS=1",
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; };
7FA986B99AFC795723E00AB0 = { isa = XCBuildConfiguration; buildSettings = { 7FA986B99AFC795723E00AB0 = { isa = XCBuildConfiguration; buildSettings = {
@@ -288,7 +290,7 @@
AE930F136F638C3C939F7146, AE930F136F638C3C939F7146,
7A3A0C722E5F96990CA1B5F2, 7A3A0C722E5F96990CA1B5F2,
2E5F3CCB074AC0B18683A4F3 ); buildRules = ( ); dependencies = ( ); name = "Juce Demo"; productName = "Juce Demo"; productReference = 39B98C60B57B831FE5215CDD; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; }; 2E5F3CCB074AC0B18683A4F3 ); buildRules = ( ); dependencies = ( ); name = "Juce Demo"; productName = "Juce Demo"; productReference = 39B98C60B57B831FE5215CDD; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; };
FD051827ADE403C022034508 = { isa = PBXProject; buildConfigurationList = 2B22E1D006C8AF43954EE79D; compatibilityVersion = "Xcode 3.0"; hasScannedForEncodings = 0; mainGroup = D6A4B94A747BFCF299B17932; projectDirPath = ""; projectRoot = ""; targets = ( F26B86DEACDEE5DFB60E10B1 ); };
FD051827ADE403C022034508 = { isa = PBXProject; buildConfigurationList = 2B22E1D006C8AF43954EE79D; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = D6A4B94A747BFCF299B17932; projectDirPath = ""; projectRoot = ""; targets = ( F26B86DEACDEE5DFB60E10B1 ); };
}; };
rootObject = FD051827ADE403C022034508; rootObject = FD051827ADE403C022034508;
} }

BIN
extras/juce demo/Builds/VisualStudio2005/icon.ico View File

Before After

BIN
extras/juce demo/Builds/VisualStudio2008/icon.ico View File

Before After

BIN
extras/juce demo/Builds/VisualStudio2010/icon.ico View File

Before After

BIN
extras/juce demo/Builds/iOS/Icon.icns View File


extras/juce demo/Builds/iPhone/Info.plist → extras/juce demo/Builds/iOS/Info.plist View File


extras/juce demo/Builds/iPhone/Juce Demo.xcodeproj/project.pbxproj → extras/juce demo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj View File

@@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 44;
objectVersion = 45;
objects = { objects = {


1DF18F6B9CCFF7BD07C36AC2 = { isa = PBXBuildFile; fileRef = CE3A43E4FB4D61350C000764; }; 1DF18F6B9CCFF7BD07C36AC2 = { isa = PBXBuildFile; fileRef = CE3A43E4FB4D61350C000764; };
@@ -167,7 +167,6 @@
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications"; INSTALL_PATH = "$(HOME)/Applications";
SDKROOT = iphonesimulator3.2;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
@@ -175,8 +174,9 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_DEBUG=1", "_DEBUG=1",
"DEBUG=1", "DEBUG=1",
"JUCE_ObjCExtraSuffix=JSLvvV6j",
"JUCE_UNIT_TESTS=1", "JUCE_UNIT_TESTS=1",
"JUCER_XCODE_IPHONE_25ADD7EF=1"); }; name = Debug; };
"JUCER_XCODE_IPHONE_5BC26AE3=1"); }; name = Debug; };
8EF7C7FFD55219581A5075F3 = { isa = XCBuildConfiguration; buildSettings = { 8EF7C7FFD55219581A5075F3 = { isa = XCBuildConfiguration; buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_BIT)";
PREBINDING = NO; PREBINDING = NO;
@@ -184,14 +184,14 @@
GCC_OPTIMIZATION_LEVEL = s; GCC_OPTIMIZATION_LEVEL = s;
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications"; INSTALL_PATH = "$(HOME)/Applications";
SDKROOT = iphonesimulator3.2;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"_NDEBUG=1", "_NDEBUG=1",
"NDEBUG=1", "NDEBUG=1",
"JUCE_ObjCExtraSuffix=JSLvvV6j",
"JUCE_UNIT_TESTS=1", "JUCE_UNIT_TESTS=1",
"JUCER_XCODE_IPHONE_25ADD7EF=1"); }; name = Release; };
"JUCER_XCODE_IPHONE_5BC26AE3=1"); }; name = Release; };
7FA986B99AFC795723E00AB0 = { isa = XCBuildConfiguration; buildSettings = { 7FA986B99AFC795723E00AB0 = { isa = XCBuildConfiguration; buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
GCC_C_LANGUAGE_STANDARD = c99; GCC_C_LANGUAGE_STANDARD = c99;
@@ -204,6 +204,9 @@
WARNING_CFLAGS = -Wreorder; WARNING_CFLAGS = -Wreorder;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
ZERO_LINK = NO; ZERO_LINK = NO;
DEBUG_INFORMATION_FORMAT = "dwarf"; DEBUG_INFORMATION_FORMAT = "dwarf";
PRODUCT_NAME = "JuceDemo"; }; name = Debug; }; PRODUCT_NAME = "JuceDemo"; }; name = Debug; };
@@ -219,6 +222,9 @@
WARNING_CFLAGS = -Wreorder; WARNING_CFLAGS = -Wreorder;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
ZERO_LINK = NO; ZERO_LINK = NO;
DEBUG_INFORMATION_FORMAT = "dwarf"; DEBUG_INFORMATION_FORMAT = "dwarf";
PRODUCT_NAME = "JuceDemo"; }; name = Release; }; PRODUCT_NAME = "JuceDemo"; }; name = Release; };
@@ -268,7 +274,7 @@
AE930F136F638C3C939F7146, AE930F136F638C3C939F7146,
7A3A0C722E5F96990CA1B5F2, 7A3A0C722E5F96990CA1B5F2,
2E5F3CCB074AC0B18683A4F3 ); buildRules = ( ); dependencies = ( ); name = "Juce Demo"; productName = "Juce Demo"; productReference = 39B98C60B57B831FE5215CDD; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; }; 2E5F3CCB074AC0B18683A4F3 ); buildRules = ( ); dependencies = ( ); name = "Juce Demo"; productName = "Juce Demo"; productReference = 39B98C60B57B831FE5215CDD; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; };
FD051827ADE403C022034508 = { isa = PBXProject; buildConfigurationList = 2B22E1D006C8AF43954EE79D; compatibilityVersion = "Xcode 3.0"; hasScannedForEncodings = 0; mainGroup = D6A4B94A747BFCF299B17932; projectDirPath = ""; projectRoot = ""; targets = ( F26B86DEACDEE5DFB60E10B1 ); };
FD051827ADE403C022034508 = { isa = PBXProject; buildConfigurationList = 2B22E1D006C8AF43954EE79D; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = D6A4B94A747BFCF299B17932; projectDirPath = ""; projectRoot = ""; targets = ( F26B86DEACDEE5DFB60E10B1 ); };
}; };
rootObject = FD051827ADE403C022034508; rootObject = FD051827ADE403C022034508;
} }

BIN
extras/juce demo/Builds/iPhone/Icon.icns View File


+ 3
- 3
extras/juce demo/Juce Demo.jucer View File

@@ -11,9 +11,9 @@
bigIcon="f4hwldS"> bigIcon="f4hwldS">
<EXPORTFORMATS> <EXPORTFORMATS>
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK" <XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
juceFolder="../../../juce"/>
<XCODE_IPHONE targetFolder="Builds/iPhone" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
juceFolder="../../../juce"/>
juceFolder="../../../juce" objCExtraSuffix="JSLvvV6j"/>
<XCODE_IPHONE targetFolder="Builds/iOS" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
juceFolder="../../../juce" objCExtraSuffix="JSLvvV6j"/>
<VS2005 targetFolder="Builds/VisualStudio2005" vstFolder="c:\SDKs\vstsdk2.4" <VS2005 targetFolder="Builds/VisualStudio2005" vstFolder="c:\SDKs\vstsdk2.4"
rtasFolder="c:\SDKs\PT_80_SDK" juceFolder="../../../juce" libraryType="1"/> rtasFolder="c:\SDKs\PT_80_SDK" juceFolder="../../../juce" libraryType="1"/>
<VS2008 targetFolder="Builds/VisualStudio2008" vstFolder="c:\SDKs\vstsdk2.4" <VS2008 targetFolder="Builds/VisualStudio2008" vstFolder="c:\SDKs\vstsdk2.4"


+ 40
- 27
juce_amalgamated.cpp View File

@@ -4416,6 +4416,18 @@ inline NamedValueSet::NamedValue::NamedValue (const Identifier& name_, const var
{ {
} }


NamedValueSet::NamedValue::NamedValue (const NamedValue& other)
: name (other.name), value (other.value)
{
}

NamedValueSet::NamedValue& NamedValueSet::NamedValue::operator= (const NamedValueSet::NamedValue& other)
{
name = other.name;
value = other.value;
return *this;
}

bool NamedValueSet::NamedValue::operator== (const NamedValueSet::NamedValue& other) const throw() bool NamedValueSet::NamedValue::operator== (const NamedValueSet::NamedValue& other) const throw()
{ {
return name == other.name && value == other.value; return name == other.name && value == other.value;
@@ -4734,7 +4746,7 @@ public:


bool referencesSymbol (const String& s, const EvaluationContext* c, int recursionDepth) const bool referencesSymbol (const String& s, const EvaluationContext* c, int recursionDepth) const
{ {
if (s == mainSymbol)
if (s == mainSymbol || (s.containsChar ('.') && s == toString()))
return true; return true;


if (++recursionDepth > 256) if (++recursionDepth > 256)
@@ -15594,7 +15606,7 @@ XmlElement::XmlAttributeNode::XmlAttributeNode (const String& name_, const Strin
value (value_) value (value_)
{ {
#if JUCE_DEBUG #if JUCE_DEBUG
// this checks whether the attribute name string contains any illegals characters..
// this checks whether the attribute name string contains any illegal characters..
for (const juce_wchar* t = name; *t != 0; ++t) for (const juce_wchar* t = name; *t != 0; ++t)
jassert (CharacterFunctions::isLetterOrDigit (*t) || *t == '_' || *t == '-' || *t == ':'); jassert (CharacterFunctions::isLetterOrDigit (*t) || *t == '_' || *t == '-' || *t == ':');
#endif #endif
@@ -240065,19 +240077,14 @@ class FontDCHolder : private DeletedAtShutdown
public: public:


FontDCHolder() FontDCHolder()
: dc (0), numKPs (0), size (0),
: dc (0), fontH (0), previousFontH (0), numKPs (0), size (0),
bold (false), italic (false) bold (false), italic (false)
{ {
} }


~FontDCHolder() ~FontDCHolder()
{ {
if (dc != 0)
{
DeleteDC (dc);
DeleteObject (fontH);
}

deleteDCAndFont();
clearSingletonInstance(); clearSingletonInstance();
} }


@@ -240092,14 +240099,7 @@ public:
italic = italic_; italic = italic_;
size = size_; size = size_;


if (dc != 0)
{
DeleteDC (dc);
DeleteObject (fontH);
kps.free();
}

fontH = 0;
deleteDCAndFont();


dc = CreateCompatibleDC (0); dc = CreateCompatibleDC (0);
SetMapperFlags (dc, 0); SetMapperFlags (dc, 0);
@@ -240122,7 +240122,7 @@ public:


if (standardSizedFont != 0) if (standardSizedFont != 0)
{ {
if (SelectObject (dc, standardSizedFont) != 0)
if ((previousFontH = SelectObject (dc, standardSizedFont)) != 0)
{ {
fontH = standardSizedFont; fontH = standardSizedFont;


@@ -240139,14 +240139,6 @@ public:
} }
} }
} }
else
{
jassertfalse;
}
}
else
{
jassertfalse;
} }
} }


@@ -240169,12 +240161,31 @@ public:
private: private:


HFONT fontH; HFONT fontH;
HGDIOBJ previousFontH;
HDC dc; HDC dc;
String fontName; String fontName;
HeapBlock <KERNINGPAIR> kps; HeapBlock <KERNINGPAIR> kps;
int numKPs, size; int numKPs, size;
bool bold, italic; bool bold, italic;


void deleteDCAndFont()
{
if (dc != 0)
{
SelectObject (dc, previousFontH); // Replacing the previous font before deleting the DC avoids a warning in BoundsChecker
DeleteDC (dc);
dc = 0;
}

if (fontH != 0)
{
DeleteObject (fontH);
fontH = 0;
}

kps.free();
}

JUCE_DECLARE_NON_COPYABLE (FontDCHolder); JUCE_DECLARE_NON_COPYABLE (FontDCHolder);
}; };


@@ -241336,6 +241347,7 @@ class WindowsBitmapImage : public Image::SharedImage
public: public:


HBITMAP hBitmap; HBITMAP hBitmap;
HGDIOBJ previousBitmap;
BITMAPV4HEADER bitmapInfo; BITMAPV4HEADER bitmapInfo;
HDC hdc; HDC hdc;
unsigned char* bitmapData; unsigned char* bitmapData;
@@ -241383,7 +241395,7 @@ public:
(void**) &bitmapData, (void**) &bitmapData,
0, 0); 0, 0);


SelectObject (hdc, hBitmap);
previousBitmap = SelectObject (hdc, hBitmap);


if (format_ == Image::ARGB && clearImage) if (format_ == Image::ARGB && clearImage)
zeromem (bitmapData, abs (h * lineStride)); zeromem (bitmapData, abs (h * lineStride));
@@ -241393,6 +241405,7 @@ public:


~WindowsBitmapImage() ~WindowsBitmapImage()
{ {
SelectObject (hdc, previousBitmap); // Selecting the previous bitmap before deleting the DC avoids a warning in BoundsChecker
DeleteDC (hdc); DeleteDC (hdc);
DeleteObject (hBitmap); DeleteObject (hBitmap);
} }


+ 8
- 10
juce_amalgamated.h View File

@@ -73,7 +73,7 @@ namespace JuceDummyNamespace {}
*/ */
#define JUCE_MAJOR_VERSION 1 #define JUCE_MAJOR_VERSION 1
#define JUCE_MINOR_VERSION 53 #define JUCE_MINOR_VERSION 53
#define JUCE_BUILDNUMBER 13
#define JUCE_BUILDNUMBER 14


/** Current Juce version number. /** Current Juce version number.


@@ -6375,8 +6375,8 @@ public:


ObjectType* const oldItem = item; ObjectType* const oldItem = item;
item = newItem; item = newItem;
item->nextListItem = oldItem->nextListItem;
oldItem->nextListItem = 0;
item->nextListItem = oldItem->nextListItem.item;
oldItem->nextListItem = (ObjectType*) 0;
return oldItem; return oldItem;
} }


@@ -6417,7 +6417,7 @@ public:
if (oldItem != 0) if (oldItem != 0)
{ {
item = oldItem->nextListItem; item = oldItem->nextListItem;
oldItem->nextListItem = 0;
oldItem->nextListItem = (ObjectType*) 0;
} }


return oldItem; return oldItem;
@@ -6513,6 +6513,8 @@ public:
private: private:


ObjectType* item; ObjectType* item;

JUCE_DECLARE_NON_COPYABLE (LinkedListPointer);
}; };


#endif // __JUCE_LINKEDLISTPOINTER_JUCEHEADER__ #endif // __JUCE_LINKEDLISTPOINTER_JUCEHEADER__
@@ -6607,7 +6609,9 @@ private:
{ {
public: public:
NamedValue() throw(); NamedValue() throw();
NamedValue (const NamedValue&);
NamedValue (const Identifier& name, const var& value); NamedValue (const Identifier& name, const var& value);
NamedValue& operator= (const NamedValue&);
bool operator== (const NamedValue& other) const throw(); bool operator== (const NamedValue& other) const throw();


LinkedListPointer<NamedValue> nextListItem; LinkedListPointer<NamedValue> nextListItem;
@@ -21080,7 +21084,6 @@ private:
static int doubleClickTimeOutMs; static int doubleClickTimeOutMs;


MouseEvent& operator= (const MouseEvent&); MouseEvent& operator= (const MouseEvent&);
JUCE_LEAK_DETECTOR (MouseEvent);
}; };


#endif // __JUCE_MOUSEEVENT_JUCEHEADER__ #endif // __JUCE_MOUSEEVENT_JUCEHEADER__
@@ -57211,11 +57214,6 @@ public:
return *this; return *this;
} }


/** Destructor. */
~SelectedItemSet()
{
}

/** Clears any other currently selected items, and selects this item. /** Clears any other currently selected items, and selects this item.


If this item is already the only thing selected, no change notification If this item is already the only thing selected, no change notification


+ 5
- 3
src/containers/juce_LinkedListPointer.h View File

@@ -200,8 +200,8 @@ public:
ObjectType* const oldItem = item; ObjectType* const oldItem = item;
item = newItem; item = newItem;
item->nextListItem = oldItem->nextListItem;
oldItem->nextListItem = 0;
item->nextListItem = oldItem->nextListItem.item;
oldItem->nextListItem = (ObjectType*) 0;
return oldItem; return oldItem;
} }
@@ -242,7 +242,7 @@ public:
if (oldItem != 0) if (oldItem != 0)
{ {
item = oldItem->nextListItem; item = oldItem->nextListItem;
oldItem->nextListItem = 0;
oldItem->nextListItem = (ObjectType*) 0;
} }
return oldItem; return oldItem;
@@ -339,6 +339,8 @@ public:
private: private:
//============================================================================== //==============================================================================
ObjectType* item; ObjectType* item;
JUCE_DECLARE_NON_COPYABLE (LinkedListPointer);
}; };


+ 12
- 0
src/containers/juce_NamedValueSet.cpp View File

@@ -41,6 +41,18 @@ inline NamedValueSet::NamedValue::NamedValue (const Identifier& name_, const var
{ {
} }
NamedValueSet::NamedValue::NamedValue (const NamedValue& other)
: name (other.name), value (other.value)
{
}
NamedValueSet::NamedValue& NamedValueSet::NamedValue::operator= (const NamedValueSet::NamedValue& other)
{
name = other.name;
value = other.value;
return *this;
}
bool NamedValueSet::NamedValue::operator== (const NamedValueSet::NamedValue& other) const throw() bool NamedValueSet::NamedValue::operator== (const NamedValueSet::NamedValue& other) const throw()
{ {
return name == other.name && value == other.value; return name == other.name && value == other.value;


+ 2
- 0
src/containers/juce_NamedValueSet.h View File

@@ -122,7 +122,9 @@ private:
{ {
public: public:
NamedValue() throw(); NamedValue() throw();
NamedValue (const NamedValue&);
NamedValue (const Identifier& name, const var& value); NamedValue (const Identifier& name, const var& value);
NamedValue& operator= (const NamedValue&);
bool operator== (const NamedValue& other) const throw(); bool operator== (const NamedValue& other) const throw();
LinkedListPointer<NamedValue> nextListItem; LinkedListPointer<NamedValue> nextListItem;


+ 1
- 1
src/core/juce_StandardHeader.h View File

@@ -33,7 +33,7 @@
*/ */
#define JUCE_MAJOR_VERSION 1 #define JUCE_MAJOR_VERSION 1
#define JUCE_MINOR_VERSION 53 #define JUCE_MINOR_VERSION 53
#define JUCE_BUILDNUMBER 13
#define JUCE_BUILDNUMBER 14
/** Current Juce version number. /** Current Juce version number.


+ 0
- 1
src/gui/components/mouse/juce_MouseEvent.h View File

@@ -321,7 +321,6 @@ private:
static int doubleClickTimeOutMs; static int doubleClickTimeOutMs;
MouseEvent& operator= (const MouseEvent&); MouseEvent& operator= (const MouseEvent&);
JUCE_LEAK_DETECTOR (MouseEvent);
}; };


+ 1
- 1
src/maths/juce_Expression.cpp View File

@@ -116,7 +116,7 @@ public:
bool referencesSymbol (const String& s, const EvaluationContext* c, int recursionDepth) const bool referencesSymbol (const String& s, const EvaluationContext* c, int recursionDepth) const
{ {
if (s == mainSymbol)
if (s == mainSymbol || (s.containsChar ('.') && s == toString()))
return true; return true;
if (++recursionDepth > 256) if (++recursionDepth > 256)


+ 23
- 24
src/native/windows/juce_win32_Fonts.cpp View File

@@ -129,19 +129,14 @@ class FontDCHolder : private DeletedAtShutdown
public: public:
//============================================================================== //==============================================================================
FontDCHolder() FontDCHolder()
: dc (0), numKPs (0), size (0),
: dc (0), fontH (0), previousFontH (0), numKPs (0), size (0),
bold (false), italic (false) bold (false), italic (false)
{ {
} }
~FontDCHolder() ~FontDCHolder()
{ {
if (dc != 0)
{
DeleteDC (dc);
DeleteObject (fontH);
}
deleteDCAndFont();
clearSingletonInstance(); clearSingletonInstance();
} }
@@ -157,14 +152,7 @@ public:
italic = italic_; italic = italic_;
size = size_; size = size_;
if (dc != 0)
{
DeleteDC (dc);
DeleteObject (fontH);
kps.free();
}
fontH = 0;
deleteDCAndFont();
dc = CreateCompatibleDC (0); dc = CreateCompatibleDC (0);
SetMapperFlags (dc, 0); SetMapperFlags (dc, 0);
@@ -187,7 +175,7 @@ public:
if (standardSizedFont != 0) if (standardSizedFont != 0)
{ {
if (SelectObject (dc, standardSizedFont) != 0)
if ((previousFontH = SelectObject (dc, standardSizedFont)) != 0)
{ {
fontH = standardSizedFont; fontH = standardSizedFont;
@@ -204,14 +192,6 @@ public:
} }
} }
} }
else
{
jassertfalse;
}
}
else
{
jassertfalse;
} }
} }
@@ -236,12 +216,31 @@ public:
private: private:
//============================================================================== //==============================================================================
HFONT fontH; HFONT fontH;
HGDIOBJ previousFontH;
HDC dc; HDC dc;
String fontName; String fontName;
HeapBlock <KERNINGPAIR> kps; HeapBlock <KERNINGPAIR> kps;
int numKPs, size; int numKPs, size;
bool bold, italic; bool bold, italic;
void deleteDCAndFont()
{
if (dc != 0)
{
SelectObject (dc, previousFontH); // Replacing the previous font before deleting the DC avoids a warning in BoundsChecker
DeleteDC (dc);
dc = 0;
}
if (fontH != 0)
{
DeleteObject (fontH);
fontH = 0;
}
kps.free();
}
JUCE_DECLARE_NON_COPYABLE (FontDCHolder); JUCE_DECLARE_NON_COPYABLE (FontDCHolder);
}; };


+ 3
- 1
src/native/windows/juce_win32_Windowing.cpp View File

@@ -147,6 +147,7 @@ class WindowsBitmapImage : public Image::SharedImage
public: public:
//============================================================================== //==============================================================================
HBITMAP hBitmap; HBITMAP hBitmap;
HGDIOBJ previousBitmap;
BITMAPV4HEADER bitmapInfo; BITMAPV4HEADER bitmapInfo;
HDC hdc; HDC hdc;
unsigned char* bitmapData; unsigned char* bitmapData;
@@ -195,7 +196,7 @@ public:
(void**) &bitmapData, (void**) &bitmapData,
0, 0); 0, 0);
SelectObject (hdc, hBitmap);
previousBitmap = SelectObject (hdc, hBitmap);
if (format_ == Image::ARGB && clearImage) if (format_ == Image::ARGB && clearImage)
zeromem (bitmapData, abs (h * lineStride)); zeromem (bitmapData, abs (h * lineStride));
@@ -205,6 +206,7 @@ public:
~WindowsBitmapImage() ~WindowsBitmapImage()
{ {
SelectObject (hdc, previousBitmap); // Selecting the previous bitmap before deleting the DC avoids a warning in BoundsChecker
DeleteDC (hdc); DeleteDC (hdc);
DeleteObject (hBitmap); DeleteObject (hBitmap);
} }


+ 1
- 1
src/text/juce_XmlElement.cpp View File

@@ -46,7 +46,7 @@ XmlElement::XmlAttributeNode::XmlAttributeNode (const String& name_, const Strin
value (value_) value (value_)
{ {
#if JUCE_DEBUG #if JUCE_DEBUG
// this checks whether the attribute name string contains any illegals characters..
// this checks whether the attribute name string contains any illegal characters..
for (const juce_wchar* t = name; *t != 0; ++t) for (const juce_wchar* t = name; *t != 0; ++t)
jassert (CharacterFunctions::isLetterOrDigit (*t) || *t == '_' || *t == '-' || *t == ':'); jassert (CharacterFunctions::isLetterOrDigit (*t) || *t == '_' || *t == '-' || *t == ':');
#endif #endif


+ 0
- 5
src/utilities/juce_SelectedItemSet.h View File

@@ -82,11 +82,6 @@ public:
return *this; return *this;
} }
/** Destructor. */
~SelectedItemSet()
{
}
//============================================================================== //==============================================================================
/** Clears any other currently selected items, and selects this item. /** Clears any other currently selected items, and selects this item.


Loading…
Cancel
Save