From d8ac79c574ca1db87a99c4ceb58225c23f4a665a Mon Sep 17 00:00:00 2001 From: jules Date: Fri, 14 Aug 2009 10:08:56 +0000 Subject: [PATCH] Tidied up some mac project files and config settings, and tweaked the main readme file. --- docs/JUCE readme.html | 70 +++------ .../mac/PluginHost.xcodeproj/project.pbxproj | 26 ++-- .../JuceDemoPlugin.xcodeproj/project.pbxproj | 12 +- .../demo/src/juce_LibrarySource.mm | 40 ++--- .../macosx/jucedemo.xcodeproj/project.pbxproj | 18 +-- extras/juce demo/src/juce_AppConfig.h | 142 +++++++++--------- .../build/mac/Jucer.xcodeproj/project.pbxproj | 56 ++----- extras/the jucer/src/juce_AppConfig.h | 14 +- juce_amalgamated.cpp | 12 +- 9 files changed, 168 insertions(+), 222 deletions(-) diff --git a/docs/JUCE readme.html b/docs/JUCE readme.html index 87f643eb11..a20b4b3e62 100644 --- a/docs/JUCE readme.html +++ b/docs/JUCE readme.html @@ -74,20 +74,23 @@ library beforehand, but instead by just adding juce_amalgamated.cpp there's less setting-up required for a new user to do before getting stuck-in, but some compilers and debuggers can struggle with the huge files involved, so you may prefer to build your project in the traditional way, using it as a separate library.

+

A variation on this approach is to include juce_amalgamated_template.cpp in your app, which has the +same effect as the normal amalgamated file, but which actually pulls in all the juce cpp files via #include statements +rather than by pre-munging them into one file. This makes debugging a lot easier

Building your application with JUCE

-

Compiling with Microsoft Visual Studio 2005

+

Compiling with Microsoft Visual Studio

The quickest way to get started is to try building the demo application - there's a Visual Studio soluion in juce/extras/juce demo/build/win32_vc8/jucedemo.sln.

-

This should build and run with no extra set-up needed in Visual Studio. (If you're using VCExpress Edition -see below for the few extra steps needed).

-

The only thing to check if you're unfamiliar with Visual Studio is that the jucedemo +

This should build and run with no extra set-up needed in all versions of Visual Studio from 2005 onwards, +including the free version of Visual Express 2009.

+

One thing to check if you're unfamiliar with Visual Studio is that the jucedemo project needs to be selected as your "startup" project (right-click on the jucedemo project in the solution explorer for this option). Also, the active configuration should be -set to "Debug" or "Release", (the first time you load a project, VS selects one of the configurations and -usually picks "Debug DLL" as its default, for reasons best known to itself).

+set to "Debug" or "Release", (the first time you load a project, VS selects one of the configurations by default +and usually picks "Debug DLL", for reasons best known to itself).

To create your own application that links to Juce:

    @@ -113,33 +116,6 @@ your project without needing to link to it separately, so you can skip the steps setting up the link paths, etc. Most of the demo apps are written using the amalgamated version, so refer to these for an example of how to do this.

    - -

    Compiling with Microsoft Visual C++ Express edition

    - -

    Although VCExpress is basically the same thing as Visual Studio 2005, it doesn't come -with all the Win32 library code pre-installed, so a couple of extra steps are required before JUCE -can be compiled with it:

    - -
      -
    1. Install the latest Platform SDK from Microsoft.
      2. -
    2. A few extra items need to be added to your include and library search paths. The first few -entries on your include path should look like this (obviously you might have things installed in -different places, but the order is important!): -
      C:\Program Files\Microsoft Platform SDK\include
-C:\Program Files\Microsoft Platform SDK\include\crt
-C:\Program Files\Microsoft Platform SDK\include\mfc
-C:\mycode\juce
-...
      -And the library search path should begin like this: -
      $(VSInstallDir)VC\lib
-C:\Program Files\Microsoft Platform SDK\lib
-C:\mycode\juce\bin
-...
      -
      3. -
    - -

    Then, you can follow the same instructions as for Visual Studio 2005 above.

    -

    Compiling with Microsoft Visual Studio 6

    To compile the JUCE .lib files from the source code:

    @@ -212,31 +188,33 @@ or "-ljucedebug".
  1. You'll also need to add some or all of the following OSX frameworks to your "External Frameworks and Libraries" list, depending on what features your application uses: 
    Cocoa.framework
-CoreFoundation.framework
-CoreServices.framework
-ApplicationServices.framework
 Carbon.framework
 IOKit.framework
-QuickTime.framework
 CoreAudio.framework
 CoreMIDI.framework
+WebKit.framework
+DiscRecording.framework
+QTKit.framework
+QuickTime.framework
+QuartzCore.framework
 AudioUnit.framework
+AudioToolbox.framework
 OpenGL.framework
-AGL.framework
-WebKit.framework
-DiscRecording.framework
    +AppKit.framework +CoreAudioKit.framework +CoreFoundation.framework In future there may be other frameworks that you'll need to link with to support new JUCE features. (It should be pretty obvious from the link-time error when one of these is missing).
-

If all this seems too complicated, you can use the amalgamated form of Juce (see earlier note). To do this, -all need to do is to add juce_amalagamated.cpp to your project, and include -juce_amalagamated.h instead of juce.h. This pulls the entire library into -your project without needing to link to it separately, so you can skip the steps above that involve -compiling the library, setting up the link paths, etc. Most of the demo apps are written using the amalgamated version, -so refer to these for an example of how to do this.

+

If all this seems too complicated, you can make things slightly easier by using the amalgamated form of Juce +(see earlier note). To do this, all you need to do is to add juce_amalagamated.cpp to your project, and include +juce_amalagamated.h instead of juce.h. This pulls the entire library into your project without needing +to link to it separately, so you can skip the steps above that involve compiling the library, setting up the link paths, etc. +Most of the demo apps are written using the amalgamated version, so have a look through their source code for examples of how +to do this.

Creating a JUCE application with Code::Blocks and MinGW

    diff --git a/extras/audio plugin host/build/mac/PluginHost.xcodeproj/project.pbxproj b/extras/audio plugin host/build/mac/PluginHost.xcodeproj/project.pbxproj index a4ddfe7e91..c2938ad4b8 100644 --- a/extras/audio plugin host/build/mac/PluginHost.xcodeproj/project.pbxproj +++ b/extras/audio plugin host/build/mac/PluginHost.xcodeproj/project.pbxproj @@ -7,13 +7,12 @@ objects = { /* Begin PBXBuildFile section */ - 8490448E0EF15EFD00D72485 /* CoreAudioKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8490448D0EF15EFD00D72485 /* CoreAudioKit.framework */; }; 8490449F0EF15F1600D72485 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8490449E0EF15F1600D72485 /* CoreAudio.framework */; }; + 8497883C103562B60020003B /* CoreAudioKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8497883B103562B60020003B /* CoreAudioKit.framework */; }; 84B59D6D0DE34F530041FA3D /* juce_LibrarySource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84B59D6C0DE34F530041FA3D /* juce_LibrarySource.mm */; }; 84C0A3910DE2D5C700606895 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C0A3830DE2D5C700606895 /* AudioUnit.framework */; }; 84C0A3930DE2D5C700606895 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C0A3850DE2D5C700606895 /* Cocoa.framework */; }; 84C0A3960DE2D5C700606895 /* CoreMIDI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C0A3880DE2D5C700606895 /* CoreMIDI.framework */; }; - 84C0A3970DE2D5C700606895 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C0A3890DE2D5C700606895 /* CoreServices.framework */; }; 84C0A3980DE2D5C700606895 /* DiscRecording.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C0A38A0DE2D5C700606895 /* DiscRecording.framework */; }; 84C0A3990DE2D5C700606895 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C0A38B0DE2D5C700606895 /* IOKit.framework */; }; 84C0A39A0DE2D5C700606895 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C0A38C0DE2D5C700606895 /* OpenGL.framework */; }; @@ -30,16 +29,15 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 508344B209E5C41E0093A071 /* Juce Plugin Host.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Juce Plugin Host.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 8490448D0EF15EFD00D72485 /* CoreAudioKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = /System/Library/Frameworks/CoreAudioKit.framework; sourceTree = ""; }; + 508344B209E5C41E0093A071 /* PluginHost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PluginHost.app; sourceTree = BUILT_PRODUCTS_DIR; }; 8490449E0EF15F1600D72485 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; + 8497883B103562B60020003B /* CoreAudioKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; }; 84B59D6A0DE34F530041FA3D /* includes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = includes.h; path = ../../src/includes.h; sourceTree = SOURCE_ROOT; }; 84B59D6B0DE34F530041FA3D /* juce_AppConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_AppConfig.h; path = ../../src/juce_AppConfig.h; sourceTree = SOURCE_ROOT; }; 84B59D6C0DE34F530041FA3D /* juce_LibrarySource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_LibrarySource.mm; path = ../../src/juce_LibrarySource.mm; sourceTree = SOURCE_ROOT; }; 84C0A3830DE2D5C700606895 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = ""; }; 84C0A3850DE2D5C700606895 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 84C0A3880DE2D5C700606895 /* CoreMIDI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = /System/Library/Frameworks/CoreMIDI.framework; sourceTree = ""; }; - 84C0A3890DE2D5C700606895 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = ""; }; 84C0A38A0DE2D5C700606895 /* DiscRecording.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = /System/Library/Frameworks/DiscRecording.framework; sourceTree = ""; }; 84C0A38B0DE2D5C700606895 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; 84C0A38C0DE2D5C700606895 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; @@ -68,7 +66,6 @@ 84C0A3910DE2D5C700606895 /* AudioUnit.framework in Frameworks */, 84C0A3930DE2D5C700606895 /* Cocoa.framework in Frameworks */, 84C0A3960DE2D5C700606895 /* CoreMIDI.framework in Frameworks */, - 84C0A3970DE2D5C700606895 /* CoreServices.framework in Frameworks */, 84C0A3980DE2D5C700606895 /* DiscRecording.framework in Frameworks */, 84C0A3990DE2D5C700606895 /* IOKit.framework in Frameworks */, 84C0A39A0DE2D5C700606895 /* OpenGL.framework in Frameworks */, @@ -76,8 +73,8 @@ 84F6F6160E8EDA7100AA911A /* Carbon.framework in Frameworks */, 84D16CFE0E9A58CA00CB8B94 /* QTKit.framework in Frameworks */, 84F8B6D70EB5FEF70020D98D /* QuickTime.framework in Frameworks */, - 8490448E0EF15EFD00D72485 /* CoreAudioKit.framework in Frameworks */, 8490449F0EF15F1600D72485 /* CoreAudio.framework in Frameworks */, + 8497883C103562B60020003B /* CoreAudioKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -87,7 +84,7 @@ 195DF8CFFE9D517E11CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 508344B209E5C41E0093A071 /* Juce Plugin Host.app */, + 508344B209E5C41E0093A071 /* PluginHost.app */, ); name = Products; sourceTree = ""; @@ -134,15 +131,14 @@ 20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = { isa = PBXGroup; children = ( - 8490449E0EF15F1600D72485 /* CoreAudio.framework */, - 8490448D0EF15EFD00D72485 /* CoreAudioKit.framework */, - 84F6F6150E8EDA7100AA911A /* Carbon.framework */, - 84C0A3830DE2D5C700606895 /* AudioUnit.framework */, 84C0A3850DE2D5C700606895 /* Cocoa.framework */, + 84F6F6150E8EDA7100AA911A /* Carbon.framework */, + 84C0A38B0DE2D5C700606895 /* IOKit.framework */, + 8490449E0EF15F1600D72485 /* CoreAudio.framework */, + 8497883B103562B60020003B /* CoreAudioKit.framework */, 84C0A3880DE2D5C700606895 /* CoreMIDI.framework */, - 84C0A3890DE2D5C700606895 /* CoreServices.framework */, + 84C0A3830DE2D5C700606895 /* AudioUnit.framework */, 84C0A38A0DE2D5C700606895 /* DiscRecording.framework */, - 84C0A38B0DE2D5C700606895 /* IOKit.framework */, 84F8B6D60EB5FEF70020D98D /* QuickTime.framework */, 84C0A38C0DE2D5C700606895 /* OpenGL.framework */, 84D16CFD0E9A58CA00CB8B94 /* QTKit.framework */, @@ -169,7 +165,7 @@ name = PluginHost; productInstallPath = "$(HOME)/Applications"; productName = PluginHost; - productReference = 508344B209E5C41E0093A071 /* Juce Plugin Host.app */; + productReference = 508344B209E5C41E0093A071 /* PluginHost.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ diff --git a/extras/audio plugins/demo/build/mac/JuceDemoPlugin.xcodeproj/project.pbxproj b/extras/audio plugins/demo/build/mac/JuceDemoPlugin.xcodeproj/project.pbxproj index 77f562eba6..f0bb789efa 100644 --- a/extras/audio plugins/demo/build/mac/JuceDemoPlugin.xcodeproj/project.pbxproj +++ b/extras/audio plugins/demo/build/mac/JuceDemoPlugin.xcodeproj/project.pbxproj @@ -20,7 +20,6 @@ 843792B10EFBF14B002A2725 /* JucePluginCharacteristics.h in Headers */ = {isa = PBXBuildFile; fileRef = 843792A90EFBF14B002A2725 /* JucePluginCharacteristics.h */; }; 843792B50EFBF175002A2725 /* juce_AU_Resources.r in Rez */ = {isa = PBXBuildFile; fileRef = 843792B30EFBF175002A2725 /* juce_AU_Resources.r */; }; 843792B60EFBF175002A2725 /* juce_AU_Wrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 843792B40EFBF175002A2725 /* juce_AU_Wrapper.mm */; }; - 8437956E0EFBF323002A2725 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 843795630EFBF323002A2725 /* AudioToolbox.framework */; }; 8437956F0EFBF323002A2725 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 843795640EFBF323002A2725 /* AudioUnit.framework */; }; 843795700EFBF323002A2725 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 843795650EFBF323002A2725 /* Cocoa.framework */; }; 843795710EFBF323002A2725 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 843795660EFBF323002A2725 /* OpenGL.framework */; }; @@ -39,7 +38,6 @@ 8437966E0EFBF357002A2725 /* AUOutputBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 843796640EFBF357002A2725 /* AUOutputBase.h */; }; 843796710EFBF357002A2725 /* MusicDeviceBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 843796670EFBF357002A2725 /* MusicDeviceBase.cpp */; }; 843796720EFBF357002A2725 /* MusicDeviceBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 843796680EFBF357002A2725 /* MusicDeviceBase.h */; }; - 843796750EFBF416002A2725 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 843796740EFBF416002A2725 /* CoreFoundation.framework */; }; 8437967F0EFBF5E4002A2725 /* juce_VST_Wrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8437967D0EFBF5E4002A2725 /* juce_VST_Wrapper.cpp */; }; 843796800EFBF5E4002A2725 /* juce_VST_Wrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8437967E0EFBF5E4002A2725 /* juce_VST_Wrapper.mm */; }; 843796DC0EFBFD16002A2725 /* juce_RTAS_DigiCode1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 843796D50EFBFD16002A2725 /* juce_RTAS_DigiCode1.cpp */; }; @@ -50,6 +48,7 @@ 843796E10EFBFD16002A2725 /* juce_RTAS_MacUtilities.mm in Sources */ = {isa = PBXBuildFile; fileRef = 843796DA0EFBFD16002A2725 /* juce_RTAS_MacUtilities.mm */; }; 843796E20EFBFD16002A2725 /* juce_RTAS_Wrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 843796DB0EFBFD16002A2725 /* juce_RTAS_Wrapper.cpp */; }; 843797050EFC0269002A2725 /* libPluginLibrary.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 843797030EFC022E002A2725 /* libPluginLibrary.a */; }; + 84978759103561A60020003B /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84978758103561A60020003B /* AudioToolbox.framework */; }; 849817021010B3C500297ECA /* JuceDemoPlugin.component in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8D01CCD20486CAD60068D4B7 /* JuceDemoPlugin.component */; }; 84D3AB5F0FCC744600EA8080 /* AUCarbonViewBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D3AB5E0FCC744600EA8080 /* AUCarbonViewBase.cpp */; }; 84D3AB630FCC749100EA8080 /* AUCarbonViewBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 84D3AB620FCC749100EA8080 /* AUCarbonViewBase.h */; }; @@ -129,7 +128,6 @@ 843792A90EFBF14B002A2725 /* JucePluginCharacteristics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JucePluginCharacteristics.h; path = ../../src/JucePluginCharacteristics.h; sourceTree = SOURCE_ROOT; }; 843792B30EFBF175002A2725 /* juce_AU_Resources.r */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.rez; name = juce_AU_Resources.r; path = ../../../wrapper/AU/juce_AU_Resources.r; sourceTree = SOURCE_ROOT; }; 843792B40EFBF175002A2725 /* juce_AU_Wrapper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 2; name = juce_AU_Wrapper.mm; path = ../../../wrapper/AU/juce_AU_Wrapper.mm; sourceTree = SOURCE_ROOT; }; - 843795630EFBF323002A2725 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = ""; }; 843795640EFBF323002A2725 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = ""; }; 843795650EFBF323002A2725 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 843795660EFBF323002A2725 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; @@ -148,7 +146,6 @@ 843796640EFBF357002A2725 /* AUOutputBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AUOutputBase.h; path = Examples/CoreAudio/AudioUnits/AUPublic/OtherBases/AUOutputBase.h; sourceTree = DEVELOPER_DIR; }; 843796670EFBF357002A2725 /* MusicDeviceBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MusicDeviceBase.cpp; path = Examples/CoreAudio/AudioUnits/AUPublic/OtherBases/MusicDeviceBase.cpp; sourceTree = DEVELOPER_DIR; }; 843796680EFBF357002A2725 /* MusicDeviceBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MusicDeviceBase.h; path = Examples/CoreAudio/AudioUnits/AUPublic/OtherBases/MusicDeviceBase.h; sourceTree = DEVELOPER_DIR; }; - 843796740EFBF416002A2725 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; 8437967D0EFBF5E4002A2725 /* juce_VST_Wrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = juce_VST_Wrapper.cpp; path = ../../../wrapper/VST/juce_VST_Wrapper.cpp; sourceTree = SOURCE_ROOT; }; 8437967E0EFBF5E4002A2725 /* juce_VST_Wrapper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_VST_Wrapper.mm; path = ../../../wrapper/VST/juce_VST_Wrapper.mm; sourceTree = SOURCE_ROOT; }; 843796D50EFBFD16002A2725 /* juce_RTAS_DigiCode1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_DigiCode1.cpp; path = ../../../wrapper/RTAS/juce_RTAS_DigiCode1.cpp; sourceTree = SOURCE_ROOT; }; @@ -161,6 +158,7 @@ 843796F40EFC0102002A2725 /* CommonDebugSettings.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = CommonDebugSettings.xcconfig; path = /Users/jules/SDKs/PT_80_SDK/AlturaPorts/TDMPlugIns/common/Mac/CommonDebugSettings.xcconfig; sourceTree = ""; }; 843796F50EFC0102002A2725 /* CommonReleaseSettings.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = CommonReleaseSettings.xcconfig; path = /Users/jules/SDKs/PT_80_SDK/AlturaPorts/TDMPlugIns/common/Mac/CommonReleaseSettings.xcconfig; sourceTree = ""; }; 843796FE0EFC022E002A2725 /* PluginLibrary.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PluginLibrary.xcodeproj; path = /Users/jules/stuff/PT_73_SDK/AlturaPorts/TDMPlugIns/PlugInLibrary/MacBuild/PluginLibrary.xcodeproj; sourceTree = ""; }; + 84978758103561A60020003B /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 84D3AB5E0FCC744600EA8080 /* AUCarbonViewBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AUCarbonViewBase.cpp; path = Examples/CoreAudio/AudioUnits/AUPublic/AUCarbonViewBase/AUCarbonViewBase.cpp; sourceTree = DEVELOPER_DIR; }; 84D3AB620FCC749100EA8080 /* AUCarbonViewBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AUCarbonViewBase.h; path = Examples/CoreAudio/AudioUnits/AUPublic/AUCarbonViewBase/AUCarbonViewBase.h; sourceTree = DEVELOPER_DIR; }; 84D3AB650FCC74B300EA8080 /* CarbonEventHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CarbonEventHandler.cpp; path = Examples/CoreAudio/AudioUnits/AUPublic/AUCarbonViewBase/CarbonEventHandler.cpp; sourceTree = DEVELOPER_DIR; }; @@ -209,7 +207,6 @@ buildActionMask = 2147483647; files = ( 843797050EFC0269002A2725 /* libPluginLibrary.a in Frameworks */, - 8437956E0EFBF323002A2725 /* AudioToolbox.framework in Frameworks */, 8437956F0EFBF323002A2725 /* AudioUnit.framework in Frameworks */, 843795700EFBF323002A2725 /* Cocoa.framework in Frameworks */, 843795710EFBF323002A2725 /* OpenGL.framework in Frameworks */, @@ -220,7 +217,7 @@ 843795760EFBF323002A2725 /* DiscRecording.framework in Frameworks */, 843795770EFBF323002A2725 /* QTKit.framework in Frameworks */, 843795780EFBF323002A2725 /* WebKit.framework in Frameworks */, - 843796750EFBF416002A2725 /* CoreFoundation.framework in Frameworks */, + 84978759103561A60020003B /* AudioToolbox.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -244,9 +241,8 @@ isa = PBXGroup; children = ( 843796FE0EFC022E002A2725 /* PluginLibrary.xcodeproj */, - 843796740EFBF416002A2725 /* CoreFoundation.framework */, - 843795630EFBF323002A2725 /* AudioToolbox.framework */, 843795640EFBF323002A2725 /* AudioUnit.framework */, + 84978758103561A60020003B /* AudioToolbox.framework */, 843795650EFBF323002A2725 /* Cocoa.framework */, 843795660EFBF323002A2725 /* OpenGL.framework */, 843795670EFBF323002A2725 /* IOKit.framework */, diff --git a/extras/audio plugins/demo/src/juce_LibrarySource.mm b/extras/audio plugins/demo/src/juce_LibrarySource.mm index 429beb2475..dee8f8da55 100644 --- a/extras/audio plugins/demo/src/juce_LibrarySource.mm +++ b/extras/audio plugins/demo/src/juce_LibrarySource.mm @@ -1,20 +1,20 @@ - -/* - This file includes the entire juce source tree via the amalgamated file. - - You could add the amalgamated file directly to your project, but doing it - like this allows you to put your app's config settings in the - juce_AppConfig.h file and have them applied to both the juce headers and - the source code. -*/ - -#include "juce_AppConfig.h" - -// This is where all the juce code gets included, via this amalgamated file.. -#include "../../../juce_amalgamated.mm" - -/* NB. A handy tip is that if you're doing a lot of debugging into the juce code, then stepping through - the amalgamated file can be slow or impossible for the debugger. But if you use the following line - instead of the one above, then it makes it a lot easier.. -*/ -//#include "../../../src/juce_amalgamated_template.cpp" + +/* + This file includes the entire juce source tree via the amalgamated file. + + You could add the amalgamated file directly to your project, but doing it + like this allows you to put your app's config settings in the + juce_AppConfig.h file and have them applied to both the juce headers and + the source code. +*/ + +#include "juce_AppConfig.h" + +// This is where all the juce code gets included, via this amalgamated file.. +#include "../../../../juce_amalgamated.mm" + +/* NB. A handy tip is that if you're doing a lot of debugging into the juce code, then stepping through + the amalgamated file can be slow or impossible for the debugger. But if you use the following line + instead of the one above, then it makes it a lot easier.. +*/ +//#include "../../../../src/juce_amalgamated_template.cpp" diff --git a/extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj b/extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj index 14d836b9e3..710a127f30 100644 --- a/extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj +++ b/extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 841FE43C0E8ABDD4003C3263 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 841FE4360E8ABDD4003C3263 /* CoreAudio.framework */; }; 841FE43D0E8ABDD4003C3263 /* CoreMIDI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 841FE4370E8ABDD4003C3263 /* CoreMIDI.framework */; }; - 841FE43E0E8ABDD4003C3263 /* DiscRecording.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 841FE4380E8ABDD4003C3263 /* DiscRecording.framework */; }; 841FE43F0E8ABDD4003C3263 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 841FE4390E8ABDD4003C3263 /* IOKit.framework */; }; 841FE4400E8ABDD4003C3263 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 841FE43A0E8ABDD4003C3263 /* OpenGL.framework */; }; 841FE4410E8ABDD4003C3263 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 841FE43B0E8ABDD4003C3263 /* WebKit.framework */; }; @@ -30,6 +29,7 @@ 847F4EB90E8BA9DD00F64426 /* BinaryData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 847F4EB10E8BA9DD00F64426 /* BinaryData.cpp */; }; 847F4EBA0E8BA9DD00F64426 /* juce_LibrarySource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 847F4EB40E8BA9DD00F64426 /* juce_LibrarySource.mm */; }; 847F4EBB0E8BA9DD00F64426 /* MainDemoWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 847F4EB60E8BA9DD00F64426 /* MainDemoWindow.cpp */; }; + 849786F3103560630020003B /* DiscRecording.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 849786F2103560630020003B /* DiscRecording.framework */; }; 84E81551100BAF6200FAE212 /* WebBrowserDemo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84E81550100BAF6200FAE212 /* WebBrowserDemo.cpp */; }; 84EE00FA0FF22E390093FACA /* CameraDemo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84EE00F90FF22E390093FACA /* CameraDemo.cpp */; }; 84EE01200FF23BBE0093FACA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84EE011F0FF23BBE0093FACA /* QuartzCore.framework */; }; @@ -39,11 +39,8 @@ /* Begin PBXFileReference section */ 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; - 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; - 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; 841FE4360E8ABDD4003C3263 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; 841FE4370E8ABDD4003C3263 /* CoreMIDI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = /System/Library/Frameworks/CoreMIDI.framework; sourceTree = ""; }; - 841FE4380E8ABDD4003C3263 /* DiscRecording.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = /System/Library/Frameworks/DiscRecording.framework; sourceTree = ""; }; 841FE4390E8ABDD4003C3263 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; 841FE43A0E8ABDD4003C3263 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; 841FE43B0E8ABDD4003C3263 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = ""; }; @@ -68,6 +65,7 @@ 847F4EB50E8BA9DD00F64426 /* jucedemo_headers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jucedemo_headers.h; path = ../../src/jucedemo_headers.h; sourceTree = SOURCE_ROOT; }; 847F4EB60E8BA9DD00F64426 /* MainDemoWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MainDemoWindow.cpp; path = ../../src/MainDemoWindow.cpp; sourceTree = SOURCE_ROOT; }; 847F4EB70E8BA9DD00F64426 /* MainDemoWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MainDemoWindow.h; path = ../../src/MainDemoWindow.h; sourceTree = SOURCE_ROOT; }; + 849786F2103560630020003B /* DiscRecording.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = System/Library/Frameworks/DiscRecording.framework; sourceTree = SDKROOT; }; 84E81550100BAF6200FAE212 /* WebBrowserDemo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 2; name = WebBrowserDemo.cpp; path = ../../src/demos/WebBrowserDemo.cpp; sourceTree = SOURCE_ROOT; }; 84EE00F90FF22E390093FACA /* CameraDemo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CameraDemo.cpp; path = ../../src/demos/CameraDemo.cpp; sourceTree = SOURCE_ROOT; }; 84EE011F0FF23BBE0093FACA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; @@ -84,7 +82,6 @@ 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, 841FE43C0E8ABDD4003C3263 /* CoreAudio.framework in Frameworks */, 841FE43D0E8ABDD4003C3263 /* CoreMIDI.framework in Frameworks */, - 841FE43E0E8ABDD4003C3263 /* DiscRecording.framework in Frameworks */, 841FE43F0E8ABDD4003C3263 /* IOKit.framework in Frameworks */, 841FE4400E8ABDD4003C3263 /* OpenGL.framework in Frameworks */, 841FE4410E8ABDD4003C3263 /* WebKit.framework in Frameworks */, @@ -92,6 +89,7 @@ 8450577A0EB52CE500029DFF /* QuickTime.framework in Frameworks */, 84FFCF3B0EDAFE7F007D5302 /* Carbon.framework in Frameworks */, 84EE01200FF23BBE0093FACA /* QuartzCore.framework in Frameworks */, + 849786F3103560630020003B /* DiscRecording.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -144,19 +142,17 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( - 84FFCF3A0EDAFE7F007D5302 /* Carbon.framework */, 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */, + 84FFCF3A0EDAFE7F007D5302 /* Carbon.framework */, + 841FE4390E8ABDD4003C3263 /* IOKit.framework */, 841FE4360E8ABDD4003C3263 /* CoreAudio.framework */, 841FE4370E8ABDD4003C3263 /* CoreMIDI.framework */, - 841FE4380E8ABDD4003C3263 /* DiscRecording.framework */, - 841FE4390E8ABDD4003C3263 /* IOKit.framework */, + 841FE43B0E8ABDD4003C3263 /* WebKit.framework */, + 849786F2103560630020003B /* DiscRecording.framework */, 841FE43A0E8ABDD4003C3263 /* OpenGL.framework */, 84EE011F0FF23BBE0093FACA /* QuartzCore.framework */, 847F4D8F0E8AC35C00F64426 /* QTKit.framework */, 845057790EB52CE500029DFF /* QuickTime.framework */, - 841FE43B0E8ABDD4003C3263 /* WebKit.framework */, - 29B97324FDCFA39411CA2CEA /* AppKit.framework */, - 29B97325FDCFA39411CA2CEA /* Foundation.framework */, ); name = Frameworks; sourceTree = ""; diff --git a/extras/juce demo/src/juce_AppConfig.h b/extras/juce demo/src/juce_AppConfig.h index b946c6e333..6fe1fe67fe 100644 --- a/extras/juce demo/src/juce_AppConfig.h +++ b/extras/juce demo/src/juce_AppConfig.h @@ -1,69 +1,73 @@ -/* - ============================================================================== - - This file is part of the JUCE library - "Jules' Utility Class Extensions" - Copyright 2004-7 by Raw Material Software ltd. - - ------------------------------------------------------------------------------ - - JUCE can be redistributed and/or modified under the terms of the - GNU General Public License, as published by the Free Software Foundation; - either version 2 of the License, or (at your option) any later version. - - JUCE is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with JUCE; if not, visit www.gnu.org/licenses or write to the - Free Software Foundation, Inc., 59 Temple Place, Suite 330, - Boston, MA 02111-1307 USA - - ------------------------------------------------------------------------------ - - If you'd like to release a closed-source product which uses JUCE, commercial - licenses are also available: visit www.rawmaterialsoftware.com/juce for - more information. - - ============================================================================== -*/ - -/* - This file contains settings that you might want to explicitly apply to - your Juce build. - - These flags enable or disable juce features - if you're linking to juce as - a library, then to change them, you'd need to alter your juce_Config.h file and - recompile the juce lib. But because we're using the amalgamated file, you can - just include this file before including your juce_amalgamated.cpp file to - have the same effect. - - If you leave any of these commented-out, they'll take on the default value - assigned to them in juce_Config.h, so to force them on or off, just set them - to an explicit 0 or 1 in here. -*/ - -//#define JUCE_ONLY_BUILD_CORE_LIBRARY 1 -//#define JUCE_FORCE_DEBUG 1 -//#define JUCE_LOG_ASSERTIONS 1 -//#define JUCE_ASIO 1 -//#define JUCE_ALSA 1 -//#define JUCE_QUICKTIME 1 -//#define JUCE_OPENGL 1 -//#define JUCE_USE_FLAC 1 -//#define JUCE_USE_OGGVORBIS 1 -//#define JUCE_USE_CDBURNER 1 -//#define JUCE_ENABLE_REPAINT_DEBUGGING 1 -//#define JUCE_USE_XINERAMA 1 -//#define JUCE_USE_XSHM 1 -#define JUCE_PLUGINHOST_VST 0 -#define JUCE_PLUGINHOST_AU 0 - -#ifndef LINUX - //#define JUCE_USE_CAMERA 1 -#endif - -//#define JUCE_CHECK_MEMORY_LEAKS 1 -//#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 1 -//#define JUCE_STRINGS_ARE_UNICODE 1 +/* + ============================================================================== + + This file is part of the JUCE library - "Jules' Utility Class Extensions" + Copyright 2004-7 by Raw Material Software ltd. + + ------------------------------------------------------------------------------ + + JUCE can be redistributed and/or modified under the terms of the + GNU General Public License, as published by the Free Software Foundation; + either version 2 of the License, or (at your option) any later version. + + JUCE is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with JUCE; if not, visit www.gnu.org/licenses or write to the + Free Software Foundation, Inc., 59 Temple Place, Suite 330, + Boston, MA 02111-1307 USA + + ------------------------------------------------------------------------------ + + If you'd like to release a closed-source product which uses JUCE, commercial + licenses are also available: visit www.rawmaterialsoftware.com/juce for + more information. + + ============================================================================== +*/ + +/* + This file contains settings that you might want to explicitly apply to + your Juce build. + + These flags enable or disable juce features - if you're linking to juce as + a library, then to change them, you'd need to alter your juce_Config.h file and + recompile the juce lib. But because we're using the amalgamated file, you can + just include this file before including your juce_amalgamated.cpp file to + have the same effect. + + If you leave any of these commented-out, they'll take on the default value + assigned to them in juce_Config.h, so to force them on or off, just set them + to an explicit 0 or 1 in here. +*/ + +//#define JUCE_ONLY_BUILD_CORE_LIBRARY 1 +//#define JUCE_FORCE_DEBUG 1 +//#define JUCE_LOG_ASSERTIONS 1 +//#define JUCE_ASIO 1 +//#define JUCE_ALSA 1 +#ifdef _MSC_VER + #define JUCE_QUICKTIME 0 // (This is disabled here by default because on windows it requires the QT SDK, + // but you can turn it on again if you've got the SDK) +#endif + +#define JUCE_OPENGL 1 +//#define JUCE_USE_FLAC 1 +//#define JUCE_USE_OGGVORBIS 1 +//#define JUCE_USE_CDBURNER 1 +//#define JUCE_ENABLE_REPAINT_DEBUGGING 1 +//#define JUCE_USE_XINERAMA 1 +//#define JUCE_USE_XSHM 1 +#define JUCE_PLUGINHOST_VST 0 +#define JUCE_PLUGINHOST_AU 0 + +#ifndef LINUX + #define JUCE_USE_CAMERA 1 +#endif + +//#define JUCE_CHECK_MEMORY_LEAKS 1 +//#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 1 +//#define JUCE_STRINGS_ARE_UNICODE 1 diff --git a/extras/the jucer/build/mac/Jucer.xcodeproj/project.pbxproj b/extras/the jucer/build/mac/Jucer.xcodeproj/project.pbxproj index 8c7b6ddb0a..5427eb6580 100644 --- a/extras/the jucer/build/mac/Jucer.xcodeproj/project.pbxproj +++ b/extras/the jucer/build/mac/Jucer.xcodeproj/project.pbxproj @@ -7,20 +7,15 @@ objects = { /* Begin PBXBuildFile section */ - 844B0A9B0F52DC6000B2F1FD /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 844B0A9A0F52DC6000B2F1FD /* Carbon.framework */; }; 846929140A49DB9C00314975 /* juce.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 846929130A49DB9C00314975 /* juce.xcconfig */; }; 846C10D40DE33F4D00E8CCE8 /* juce_LibrarySource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 846C10D30DE33F4D00E8CCE8 /* juce_LibrarySource.mm */; }; - 846C10EA0DE33FA100E8CCE8 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10DC0DE33FA100E8CCE8 /* ApplicationServices.framework */; }; 846C10ED0DE33FA100E8CCE8 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10DF0DE33FA100E8CCE8 /* Cocoa.framework */; }; 846C10EE0DE33FA100E8CCE8 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10E00DE33FA100E8CCE8 /* CoreAudio.framework */; }; 846C10EF0DE33FA100E8CCE8 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10E10DE33FA100E8CCE8 /* CoreFoundation.framework */; }; - 846C10F00DE33FA100E8CCE8 /* CoreMIDI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10E20DE33FA100E8CCE8 /* CoreMIDI.framework */; }; - 846C10F10DE33FA100E8CCE8 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10E30DE33FA100E8CCE8 /* CoreServices.framework */; }; - 846C10F20DE33FA100E8CCE8 /* DiscRecording.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10E40DE33FA100E8CCE8 /* DiscRecording.framework */; }; - 846C10F30DE33FA100E8CCE8 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10E50DE33FA100E8CCE8 /* IOKit.framework */; }; - 846C10F40DE33FA100E8CCE8 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10E60DE33FA100E8CCE8 /* OpenGL.framework */; }; - 846C10F60DE33FA100E8CCE8 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10E80DE33FA100E8CCE8 /* WebKit.framework */; }; - 84E01DD90E910B7B003E41AF /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84E01DD80E910B7B003E41AF /* QTKit.framework */; }; + 8497839E10355C6A0020003B /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8497839D10355C6A0020003B /* WebKit.framework */; }; + 8497844B10355C840020003B /* CoreMIDI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8497844A10355C840020003B /* CoreMIDI.framework */; }; + 8497845610355CE30020003B /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8497845510355CE30020003B /* Carbon.framework */; }; + 8497863010355E320020003B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8497862F10355E320020003B /* IOKit.framework */; }; 84F1769F0A271BBD00908B2F /* jucer_StoredSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1769B0A271BBD00908B2F /* jucer_StoredSettings.cpp */; }; 84F176A00A271BBD00908B2F /* jucer_UtilityFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1769D0A271BBD00908B2F /* jucer_UtilityFunctions.cpp */; }; 84F176BA0A271BD000908B2F /* jucer_ComponentLayoutEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F176A20A271BD000908B2F /* jucer_ComponentLayoutEditor.cpp */; }; @@ -55,27 +50,21 @@ 84F555CF0A22381100A8311C /* Jucer To Do list.txt in Resources */ = {isa = PBXBuildFile; fileRef = 84F5556A0A22381000A8311C /* Jucer To Do list.txt */; }; 84F555D30A22381100A8311C /* BinaryData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F555700A22381000A8311C /* BinaryData.cpp */; }; 84F555D40A22381100A8311C /* jucer_Main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F555730A22381000A8311C /* jucer_Main.cpp */; }; - 84F8B68E0EB5FB290020D98D /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F8B68D0EB5FB290020D98D /* QuickTime.framework */; }; 8D0C4E8D0486CD37000505A6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 0867D6ABFE840B52C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; - 844B0A9A0F52DC6000B2F1FD /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; 846929130A49DB9C00314975 /* juce.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; name = juce.xcconfig; path = ../../../../build/macosx/juce.xcconfig; sourceTree = SOURCE_ROOT; }; 846C10D20DE33F4D00E8CCE8 /* juce_AppConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_AppConfig.h; path = ../../src/juce_AppConfig.h; sourceTree = SOURCE_ROOT; }; 846C10D30DE33F4D00E8CCE8 /* juce_LibrarySource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_LibrarySource.mm; path = ../../src/juce_LibrarySource.mm; sourceTree = SOURCE_ROOT; }; - 846C10DC0DE33FA100E8CCE8 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = ""; }; 846C10DF0DE33FA100E8CCE8 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 846C10E00DE33FA100E8CCE8 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; 846C10E10DE33FA100E8CCE8 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; - 846C10E20DE33FA100E8CCE8 /* CoreMIDI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = /System/Library/Frameworks/CoreMIDI.framework; sourceTree = ""; }; - 846C10E30DE33FA100E8CCE8 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = ""; }; - 846C10E40DE33FA100E8CCE8 /* DiscRecording.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = /System/Library/Frameworks/DiscRecording.framework; sourceTree = ""; }; - 846C10E50DE33FA100E8CCE8 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; - 846C10E60DE33FA100E8CCE8 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; - 846C10E80DE33FA100E8CCE8 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = ""; }; - 84E01DD80E910B7B003E41AF /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = ""; }; + 8497839D10355C6A0020003B /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; + 8497844A10355C840020003B /* CoreMIDI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; }; + 8497845510355CE30020003B /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; + 8497862F10355E320020003B /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; 84F176990A271BBD00908B2F /* jucer_ColourEditorComponent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = jucer_ColourEditorComponent.h; sourceTree = ""; }; 84F1769A0A271BBD00908B2F /* jucer_Colours.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = jucer_Colours.h; sourceTree = ""; }; 84F1769B0A271BBD00908B2F /* jucer_StoredSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = jucer_StoredSettings.cpp; sourceTree = ""; }; @@ -180,7 +169,6 @@ 84F555720A22381000A8311C /* jucer_Headers.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = jucer_Headers.h; path = ../../src/jucer_Headers.h; sourceTree = SOURCE_ROOT; }; 84F555730A22381000A8311C /* jucer_Main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_Main.cpp; path = ../../src/jucer_Main.cpp; sourceTree = SOURCE_ROOT; }; 84F555B00A22381000A8311C /* jucer_ComponentTemplate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = jucer_ComponentTemplate.h; path = ../../src/templates/jucer_ComponentTemplate.h; sourceTree = SOURCE_ROOT; }; - 84F8B68D0EB5FB290020D98D /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = ""; }; 8D0C4E960486CD37000505A6 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 8D0C4E970486CD37000505A6 /* Jucer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Jucer.app; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -190,19 +178,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 846C10EA0DE33FA100E8CCE8 /* ApplicationServices.framework in Frameworks */, 846C10ED0DE33FA100E8CCE8 /* Cocoa.framework in Frameworks */, 846C10EE0DE33FA100E8CCE8 /* CoreAudio.framework in Frameworks */, 846C10EF0DE33FA100E8CCE8 /* CoreFoundation.framework in Frameworks */, - 846C10F00DE33FA100E8CCE8 /* CoreMIDI.framework in Frameworks */, - 846C10F10DE33FA100E8CCE8 /* CoreServices.framework in Frameworks */, - 846C10F20DE33FA100E8CCE8 /* DiscRecording.framework in Frameworks */, - 846C10F30DE33FA100E8CCE8 /* IOKit.framework in Frameworks */, - 846C10F40DE33FA100E8CCE8 /* OpenGL.framework in Frameworks */, - 846C10F60DE33FA100E8CCE8 /* WebKit.framework in Frameworks */, - 84E01DD90E910B7B003E41AF /* QTKit.framework in Frameworks */, - 84F8B68E0EB5FB290020D98D /* QuickTime.framework in Frameworks */, - 844B0A9B0F52DC6000B2F1FD /* Carbon.framework in Frameworks */, + 8497839E10355C6A0020003B /* WebKit.framework in Frameworks */, + 8497844B10355C840020003B /* CoreMIDI.framework in Frameworks */, + 8497845610355CE30020003B /* Carbon.framework in Frameworks */, + 8497863010355E320020003B /* IOKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -261,19 +243,13 @@ 20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = { isa = PBXGroup; children = ( - 844B0A9A0F52DC6000B2F1FD /* Carbon.framework */, - 846C10DC0DE33FA100E8CCE8 /* ApplicationServices.framework */, 846C10DF0DE33FA100E8CCE8 /* Cocoa.framework */, 846C10E10DE33FA100E8CCE8 /* CoreFoundation.framework */, - 846C10E30DE33FA100E8CCE8 /* CoreServices.framework */, + 8497845510355CE30020003B /* Carbon.framework */, + 8497862F10355E320020003B /* IOKit.framework */, 846C10E00DE33FA100E8CCE8 /* CoreAudio.framework */, - 846C10E20DE33FA100E8CCE8 /* CoreMIDI.framework */, - 846C10E40DE33FA100E8CCE8 /* DiscRecording.framework */, - 846C10E50DE33FA100E8CCE8 /* IOKit.framework */, - 846C10E60DE33FA100E8CCE8 /* OpenGL.framework */, - 84E01DD80E910B7B003E41AF /* QTKit.framework */, - 84F8B68D0EB5FB290020D98D /* QuickTime.framework */, - 846C10E80DE33FA100E8CCE8 /* WebKit.framework */, + 8497844A10355C840020003B /* CoreMIDI.framework */, + 8497839D10355C6A0020003B /* WebKit.framework */, ); name = "External Frameworks and Libraries"; sourceTree = ""; diff --git a/extras/the jucer/src/juce_AppConfig.h b/extras/the jucer/src/juce_AppConfig.h index 15558f21c7..156ed472ec 100644 --- a/extras/the jucer/src/juce_AppConfig.h +++ b/extras/the jucer/src/juce_AppConfig.h @@ -47,13 +47,13 @@ //#define JUCE_ONLY_BUILD_CORE_LIBRARY 1 //#define JUCE_FORCE_DEBUG 1 //#define JUCE_LOG_ASSERTIONS 1 -//#define JUCE_ASIO 1 -//#define JUCE_ALSA 1 -//#define JUCE_QUICKTIME 1 -//#define JUCE_OPENGL 1 -//#define JUCE_USE_FLAC 1 -//#define JUCE_USE_OGGVORBIS 1 -//#define JUCE_USE_CDBURNER 1 +#define JUCE_ASIO 0 +#define JUCE_ALSA 0 +#define JUCE_QUICKTIME 0 +#define JUCE_OPENGL 0 +#define JUCE_USE_FLAC 0 +#define JUCE_USE_OGGVORBIS 0 +#define JUCE_USE_CDBURNER 0 //#define JUCE_ENABLE_REPAINT_DEBUGGING 1 //#define JUCE_USE_XINERAMA 1 //#define JUCE_USE_XSHM 1 diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index c5c5e73900..8a143673b1 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -254584,9 +254584,9 @@ bool SystemStats::isOperatingSystem64Bit() throw() int SystemStats::getMemorySizeInMegabytes() throw() { uint64 mem = 0; - size_t memSize = sizeof (mem); - int mib[] = { CTL_HW, HW_MEMSIZE }; - sysctl (mib, 2, &mem, &memSize, 0, 0); + size_t memSize = sizeof (mem); + int mib[] = { CTL_HW, HW_MEMSIZE }; + sysctl (mib, 2, &mem, &memSize, 0, 0); return mem / (1024 * 1024); } @@ -254640,9 +254640,9 @@ const String SystemStats::getCpuVendor() throw() int SystemStats::getCpuSpeedInMegaherz() throw() { uint64 speedHz = 0; - size_t speedSize = sizeof (speedHz); - int mib[] = { CTL_HW, HW_CPU_FREQ }; - sysctl (mib, 2, &speedHz, &speedSize, 0, 0); + size_t speedSize = sizeof (speedHz); + int mib[] = { CTL_HW, HW_CPU_FREQ }; + sysctl (mib, 2, &speedHz, &speedSize, 0, 0); #if JUCE_BIG_ENDIAN if (speedSize == 4)