diff --git a/extras/example projects/common/Main.cpp b/extras/example projects/common/Main.cpp index f580443c92..2e08e0d66c 100644 --- a/extras/example projects/common/Main.cpp +++ b/extras/example projects/common/Main.cpp @@ -2,66 +2,40 @@ ============================================================================== Demonstration "Hello World" application in JUCE - Copyright 2004 by Julian Storer. + Copyright 2008 by Julian Storer. ============================================================================== */ -#include "../../../juce.h" +#include "includes.h" +#include "MainComponent.h" //============================================================================== -/** This is the component that sits inside the "hello world" window, filling its - content area. In this example, we'll just write "hello world" inside it. -*/ -class HelloWorldContentComponent : public Component -{ -public: - HelloWorldContentComponent() - { - } - - ~HelloWorldContentComponent() - { - } - - void paint (Graphics& g) - { - // clear the background with solid white - g.fillAll (Colours::white); - - // set our drawing colour to black.. - g.setColour (Colours::black); - - // choose a suitably sized font - g.setFont (20.0f, Font::bold); - - // and draw the text, centred in this component - g.drawText (T("Hello World!"), - 0, 0, getWidth(), getHeight(), - Justification::centred, false); - } -}; - -//============================================================================== -/** This is the top-level window that we'll pop up. Inside it, we'll create and - show a HelloWorldContentComponent component. +/** + This is the top-level window that we'll pop up. Inside it, we'll create and + show a component from the MainComponent.cpp file (you can open this file using + the Jucer to edit it). */ class HelloWorldWindow : public DocumentWindow { public: //============================================================================== - HelloWorldWindow() - : DocumentWindow (T("Hello World"), + HelloWorldWindow() + : DocumentWindow (T("JUCE Hello World!"), Colours::lightgrey, - DocumentWindow::allButtons, + DocumentWindow::allButtons, true) { - setContentComponent (new HelloWorldContentComponent()); + // Create an instance of our main content component, and add it + // to our window. - setVisible (true); + MainComponent* const contentComponent = new MainComponent(); + + setContentComponent (contentComponent, true, true); + + centreWithSize (getWidth(), getHeight()); - // centre the window on the desktop with this size - centreWithSize (400, 200); + setVisible (true); } ~HelloWorldWindow() @@ -73,12 +47,12 @@ public: void closeButtonPressed() { // When the user presses the close button, we'll tell the app to quit. This - // window will be deleted by the app object as it closes down. + // window will be deleted by our HelloWorldApplication::shutdown() method + // JUCEApplication::quit(); } }; - //============================================================================== /** This is the application object that is started up when Juce starts. It handles the initialisation and shutdown of the whole application. diff --git a/extras/example projects/common/MainComponent.cpp b/extras/example projects/common/MainComponent.cpp new file mode 100644 index 0000000000..b9391b3dd2 --- /dev/null +++ b/extras/example projects/common/MainComponent.cpp @@ -0,0 +1,158 @@ +/* + ============================================================================== + + This is an automatically generated file created by the Jucer! + + Creation date: 14 Apr 2008 11:28:13 am + + Be careful when adding custom code to these files, as only the code within + the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded + and re-saved. + + Jucer version: 1.11 + + ------------------------------------------------------------------------------ + + The Jucer is part of the JUCE library - "Jules' Utility Class Extensions" + Copyright 2004-6 by Raw Material Software ltd. + + ============================================================================== +*/ + +//[Headers] You can add your own extra header files here... +//[/Headers] + +#include "MainComponent.h" + + +//[MiscUserDefs] You can add your own user definitions and misc code here... +//[/MiscUserDefs] + +//============================================================================== +MainComponent::MainComponent () + : helloWorldLabel (0), + quitButton (0) +{ + addAndMakeVisible (helloWorldLabel = new Label (String::empty, + T("Hello World!"))); + helloWorldLabel->setFont (Font (40.0000f, Font::bold)); + helloWorldLabel->setJustificationType (Justification::centred); + helloWorldLabel->setEditable (false, false, false); + helloWorldLabel->setColour (Label::textColourId, Colours::black); + helloWorldLabel->setColour (TextEditor::textColourId, Colours::black); + helloWorldLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); + + addAndMakeVisible (quitButton = new TextButton (String::empty)); + quitButton->setButtonText (T("Quit")); + quitButton->addButtonListener (this); + + + //[UserPreSize] + //[/UserPreSize] + + setSize (600, 300); + + //[Constructor] You can add your own custom stuff here.. + //[/Constructor] +} + +MainComponent::~MainComponent() +{ + //[Destructor_pre]. You can add your own custom destruction code here.. + //[/Destructor_pre] + + deleteAndZero (helloWorldLabel); + deleteAndZero (quitButton); + + //[Destructor]. You can add your own custom destruction code here.. + //[/Destructor] +} + +//============================================================================== +void MainComponent::paint (Graphics& g) +{ + //[UserPrePaint] Add your own custom painting code here.. + //[/UserPrePaint] + + g.fillAll (Colour (0xffc1d0ff)); + + g.setColour (Colours::white); + g.fillPath (internalPath1); + g.setColour (Colour (0xff6f6f6f)); + g.strokePath (internalPath1, PathStrokeType (5.2000f)); + + //[UserPaint] Add your own custom painting code here.. + //[/UserPaint] +} + +void MainComponent::resized() +{ + helloWorldLabel->setBounds (152, 80, 296, 48); + quitButton->setBounds (getWidth() - 176, getHeight() - 60, 120, 32); + internalPath1.clear(); + internalPath1.startNewSubPath (136.0f, 80.0f); + internalPath1.quadraticTo (176.0f, 24.0f, 328.0f, 32.0f); + internalPath1.quadraticTo (472.0f, 40.0f, 472.0f, 104.0f); + internalPath1.quadraticTo (472.0f, 192.0f, 232.0f, 176.0f); + internalPath1.lineTo (184.0f, 216.0f); + internalPath1.lineTo (200.0f, 168.0f); + internalPath1.quadraticTo (96.0f, 136.0f, 136.0f, 80.0f); + internalPath1.closeSubPath(); + + //[UserResized] Add your own custom resize handling here.. + //[/UserResized] +} + +void MainComponent::buttonClicked (Button* buttonThatWasClicked) +{ + //[UserbuttonClicked_Pre] + //[/UserbuttonClicked_Pre] + + if (buttonThatWasClicked == quitButton) + { + //[UserButtonCode_quitButton] -- add your button handler code here.. + + JUCEApplication::quit(); + + //[/UserButtonCode_quitButton] + } + + //[UserbuttonClicked_Post] + //[/UserbuttonClicked_Post] +} + + + +//[MiscUserCode] You can add your own definitions of your custom methods or any other code here... +//[/MiscUserCode] + + +//============================================================================== +#if 0 +/* -- Jucer information section -- + + This is where the Jucer puts all of its metadata, so don't change anything in here! + +BEGIN_JUCER_METADATA + + + + s 136 80 q 176 24 328 32 q 472 40 472 104 q 472 192 232 176 l 184 216 l 200 168 q 96 136 136 80 x + + + +END_JUCER_METADATA +*/ +#endif diff --git a/extras/example projects/common/MainComponent.h b/extras/example projects/common/MainComponent.h new file mode 100644 index 0000000000..e3c0453843 --- /dev/null +++ b/extras/example projects/common/MainComponent.h @@ -0,0 +1,75 @@ +/* + ============================================================================== + + This is an automatically generated file created by the Jucer! + + Creation date: 14 Apr 2008 11:28:13 am + + Be careful when adding custom code to these files, as only the code within + the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded + and re-saved. + + Jucer version: 1.11 + + ------------------------------------------------------------------------------ + + The Jucer is part of the JUCE library - "Jules' Utility Class Extensions" + Copyright 2004-6 by Raw Material Software ltd. + + ============================================================================== +*/ + +#ifndef __JUCER_HEADER_MAINCOMPONENT_MAINCOMPONENT_D0F6CD31__ +#define __JUCER_HEADER_MAINCOMPONENT_MAINCOMPONENT_D0F6CD31__ + +//[Headers] -- You can add your own extra header files here -- +#include "includes.h" +//[/Headers] + + + +//============================================================================== +/** + //[Comments] + An auto-generated component, created by the Jucer. + + Describe your class and how it works here! + //[/Comments] +*/ +class MainComponent : public Component, + public ButtonListener +{ +public: + //============================================================================== + MainComponent (); + ~MainComponent(); + + //============================================================================== + //[UserMethods] -- You can add your own custom methods in this section. + //[/UserMethods] + + void paint (Graphics& g); + void resized(); + void buttonClicked (Button* buttonThatWasClicked); + + + //============================================================================== + juce_UseDebuggingNewOperator + +private: + //[UserVariables] -- You can add your own custom variables in this section. + //[/UserVariables] + + //============================================================================== + Label* helloWorldLabel; + TextButton* quitButton; + Path internalPath1; + + //============================================================================== + // (prevent copy constructor and operator= being generated..) + MainComponent (const MainComponent&); + const MainComponent& operator= (const MainComponent&); +}; + + +#endif // __JUCER_HEADER_MAINCOMPONENT_MAINCOMPONENT_D0F6CD31__ diff --git a/extras/example projects/common/includes.h b/extras/example projects/common/includes.h new file mode 100644 index 0000000000..439656bd94 --- /dev/null +++ b/extras/example projects/common/includes.h @@ -0,0 +1,36 @@ +/* + ============================================================================== + + 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 lets us set up any special config that we need for this app.. +#include "juce_AppConfig.h" + +// And this includes all the juce headers.. +#include "../../../juce_amalgamated.h" diff --git a/extras/example projects/common/juce_AppConfig.h b/extras/example projects/common/juce_AppConfig.h new file mode 100644 index 0000000000..fe77e6a598 --- /dev/null +++ b/extras/example projects/common/juce_AppConfig.h @@ -0,0 +1,29 @@ + +/* + This file contains settings that you might want to explicitly apply to + the your build. + + Most of these are turned on or off by default, but you can override + that setting here by un-commenting it and giving it a 1 or 0 value. +*/ + +//#define JUCE_ONLY_BUILD_CORE_LIBRARY 1 +//#define JUCE_QUICKTIME 0 +//#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 1 +//#define JUCE_PLUGINHOST_AU 1 +//#define JUCE_BUILD_GUI_CLASSES 1 +//#define JUCE_CHECK_MEMORY_LEAKS 1 +//#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 1 +//#define JUCE_STRINGS_ARE_UNICODE 1 diff --git a/extras/example projects/common/juce_LibrarySource.cpp b/extras/example projects/common/juce_LibrarySource.cpp new file mode 100644 index 0000000000..ab4357598c --- /dev/null +++ b/extras/example projects/common/juce_LibrarySource.cpp @@ -0,0 +1,12 @@ + +/* + 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" +#include "../../../juce_amalgamated.cpp" diff --git a/extras/example projects/common/juce_LibrarySource.mm b/extras/example projects/common/juce_LibrarySource.mm new file mode 100644 index 0000000000..628b36d217 --- /dev/null +++ b/extras/example projects/common/juce_LibrarySource.mm @@ -0,0 +1,12 @@ + +/* + 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" +#include "../../../juce_amalgamated.mm" diff --git a/extras/example projects/example_project_for_Mac/juce_application.xcodeproj/project.pbxproj b/extras/example projects/example_project_for_Mac/juce_application.xcodeproj/project.pbxproj index d10f5d3378..95c4c02fd2 100644 --- a/extras/example projects/example_project_for_Mac/juce_application.xcodeproj/project.pbxproj +++ b/extras/example projects/example_project_for_Mac/juce_application.xcodeproj/project.pbxproj @@ -15,21 +15,16 @@ 84F30CD108FEAAA20087E26C /* Main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F30CD008FEAAA20087E26C /* Main.cpp */; }; 84F30CED08FEAD7A0087E26C /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F30CEC08FEAD7A0087E26C /* CoreAudio.framework */; }; 84FAD61A0C7C3CCB00AF3028 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FAD6190C7C3CCB00AF3028 /* IOKit.framework */; }; - 84FDB0610C15BD5C00CD0087 /* libjucedebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FDB05E0C15BD4500CD0087 /* libjucedebug.a */; }; + 84FBB86F0E06CAC200B52196 /* juce_LibrarySource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84FBB86E0E06CAC200B52196 /* juce_LibrarySource.mm */; }; + 84FBB8730E06CC5D00B52196 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FBB8720E06CC5D00B52196 /* Cocoa.framework */; }; + 84FBB8770E06CCB200B52196 /* CoreMIDI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FBB8760E06CCB200B52196 /* CoreMIDI.framework */; }; + 84FBB87B0E06CCC600B52196 /* DiscRecording.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FBB87A0E06CCC600B52196 /* DiscRecording.framework */; }; + 84FBB8880E06CCE900B52196 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FBB8870E06CCE900B52196 /* AudioUnit.framework */; }; + 84FBB88D0E06CD0100B52196 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FBB88C0E06CD0100B52196 /* WebKit.framework */; }; 8D0C4E8D0486CD37000505A6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; }; 8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 84FDB05D0C15BD4500CD0087 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84F30CCA08FEAA8C0087E26C /* Juce.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D2AAC046055464E500DB518D; - remoteInfo = Juce; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ 0867D6ABFE840B52C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; @@ -42,10 +37,16 @@ 841083D40DB36EA400AB8583 /* MainComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MainComponent.h; path = ../common/MainComponent.h; sourceTree = SOURCE_ROOT; }; 841084870DB374E700AB8583 /* juce.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = juce.xcconfig; path = ../../../build/macosx/juce.xcconfig; sourceTree = SOURCE_ROOT; }; 8411369F0D0480DE0054B790 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; - 84F30CCA08FEAA8C0087E26C /* Juce.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Juce.xcodeproj; path = ../../../build/macosx/Juce.xcodeproj; sourceTree = SOURCE_ROOT; }; 84F30CD008FEAAA20087E26C /* Main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Main.cpp; path = ../common/Main.cpp; sourceTree = SOURCE_ROOT; }; 84F30CEC08FEAD7A0087E26C /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; 84FAD6190C7C3CCB00AF3028 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; + 84FBB86E0E06CAC200B52196 /* juce_LibrarySource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_LibrarySource.mm; path = ../common/juce_LibrarySource.mm; sourceTree = SOURCE_ROOT; }; + 84FBB8700E06CAD300B52196 /* juce_AppConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_AppConfig.h; path = ../common/juce_AppConfig.h; sourceTree = SOURCE_ROOT; }; + 84FBB8720E06CC5D00B52196 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 84FBB8760E06CCB200B52196 /* CoreMIDI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = /System/Library/Frameworks/CoreMIDI.framework; sourceTree = ""; }; + 84FBB87A0E06CCC600B52196 /* DiscRecording.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = /System/Library/Frameworks/DiscRecording.framework; sourceTree = ""; }; + 84FBB8870E06CCE900B52196 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = ""; }; + 84FBB88C0E06CD0100B52196 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = ""; }; 8D0C4E960486CD37000505A6 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 8D0C4E970486CD37000505A6 /* juce_application.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = juce_application.app; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -55,13 +56,17 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 84FDB0610C15BD5C00CD0087 /* libjucedebug.a in Frameworks */, 8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */, 84F30CED08FEAD7A0087E26C /* CoreAudio.framework in Frameworks */, 84078F3E09E6B42E004E7BCD /* AGL.framework in Frameworks */, 8407902B09E6B5BD004E7BCD /* QuickTime.framework in Frameworks */, 84FAD61A0C7C3CCB00AF3028 /* IOKit.framework in Frameworks */, 841136A00D0480DE0054B790 /* OpenGL.framework in Frameworks */, + 84FBB8730E06CC5D00B52196 /* Cocoa.framework in Frameworks */, + 84FBB8770E06CCB200B52196 /* CoreMIDI.framework in Frameworks */, + 84FBB87B0E06CCC600B52196 /* DiscRecording.framework in Frameworks */, + 84FBB8880E06CCE900B52196 /* AudioUnit.framework in Frameworks */, + 84FBB88D0E06CD0100B52196 /* WebKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -91,10 +96,12 @@ 20286C2AFDCF999611CA2CEA /* Sources */ = { isa = PBXGroup; children = ( - 841083D20DB36EA400AB8583 /* includes.h */, 841083D30DB36EA400AB8583 /* MainComponent.cpp */, 841083D40DB36EA400AB8583 /* MainComponent.h */, 84F30CD008FEAAA20087E26C /* Main.cpp */, + 841083D20DB36EA400AB8583 /* includes.h */, + 84FBB8700E06CAD300B52196 /* juce_AppConfig.h */, + 84FBB86E0E06CAC200B52196 /* juce_LibrarySource.mm */, ); name = Sources; sourceTree = ""; @@ -111,15 +118,19 @@ 20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = { isa = PBXGroup; children = ( - 84F30CCA08FEAA8C0087E26C /* Juce.xcodeproj */, + 84FBB8870E06CCE900B52196 /* AudioUnit.framework */, + 84FBB8720E06CC5D00B52196 /* Cocoa.framework */, 20286C33FDCF999611CA2CEA /* Carbon.framework */, 4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */, 84F30CEC08FEAD7A0087E26C /* CoreAudio.framework */, + 84FBB8760E06CCB200B52196 /* CoreMIDI.framework */, + 84FBB87A0E06CCC600B52196 /* DiscRecording.framework */, 4A9504C8FFE6A3BC11CA0CBA /* ApplicationServices.framework */, 84078F3D09E6B42E004E7BCD /* AGL.framework */, 8407902A09E6B5BD004E7BCD /* QuickTime.framework */, 84FAD6190C7C3CCB00AF3028 /* IOKit.framework */, 8411369F0D0480DE0054B790 /* OpenGL.framework */, + 84FBB88C0E06CD0100B52196 /* WebKit.framework */, ); name = "External Frameworks and Libraries"; sourceTree = ""; @@ -132,14 +143,6 @@ name = "Build settings"; sourceTree = ""; }; - 84FDB05A0C15BD4500CD0087 /* Products */ = { - isa = PBXGroup; - children = ( - 84FDB05E0C15BD4500CD0087 /* libjucedebug.a */, - ); - name = Products; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -171,12 +174,6 @@ hasScannedForEncodings = 1; mainGroup = 20286C29FDCF999611CA2CEA /* juce_application */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 84FDB05A0C15BD4500CD0087 /* Products */; - ProjectRef = 84F30CCA08FEAA8C0087E26C /* Juce.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 8D0C4E890486CD37000505A6 /* juce_application */, @@ -184,16 +181,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 84FDB05E0C15BD4500CD0087 /* libjucedebug.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libjucedebug.a; - remoteRef = 84FDB05D0C15BD4500CD0087 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 8D0C4E8C0486CD37000505A6 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -213,6 +200,7 @@ files = ( 84F30CD108FEAAA20087E26C /* Main.cpp in Sources */, 841083D50DB36EA400AB8583 /* MainComponent.cpp in Sources */, + 84FBB86F0E06CAC200B52196 /* juce_LibrarySource.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/extras/example projects/example_project_for_Win32/juce_application.vcproj b/extras/example projects/example_project_for_Win32/juce_application.vcproj index f509c00563..795ded1775 100644 --- a/extras/example projects/example_project_for_Win32/juce_application.vcproj +++ b/extras/example projects/example_project_for_Win32/juce_application.vcproj @@ -218,10 +218,30 @@ Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > + + + + + + + + + +