From ea83c7ee5e18a906a3964629e9f0362fcad90bb0 Mon Sep 17 00:00:00 2001 From: jules Date: Thu, 20 Aug 2009 09:19:37 +0000 Subject: [PATCH] Collected all the platform-specific code from the different build folders into a new folder in src/native. Also removed support for OSX10.2 --- build/linux/JUCE.make | 66 +- build/linux/juce_premake.lua | 5 +- .../juce_linux_NamedPipe.cpp | 27 - .../juce_linux_NativeCode.cpp | 114 --- build/macosx/Juce.xcodeproj/project.pbxproj | 216 +++--- .../juce_mac_NativeCode.mm | 131 ---- .../juce_mac_NativeHeaders.h | 61 -- .../juce_win32_NativeCode.cpp | 118 --- build/win32/vc6/JUCE.dsp | 42 +- build/win32/vc8/JUCE.vcproj | 48 +- extras/juce demo/build/linux/JuceDemo.make | 12 +- extras/juce demo/src/BinaryData.cpp | 1 + extras/the jucer/src/BinaryData.cpp | 1 + juce.h | 2 +- juce_amalgamated.cpp | 179 +---- juce_amalgamated.h | 25 +- src/juce_amalgamated_template.cpp | 699 +++++++++--------- .../formats/juce_AudioUnitPluginFormat.mm | 2 +- .../plugins/formats/juce_VSTPluginFormat.cpp | 2 +- src/juce_core/basics/juce_MathsFunctions.h | 20 +- src/juce_core/basics/juce_PlatformDefs.h | 5 +- src/juce_core/io/network/juce_Socket.cpp | 6 +- .../text/juce_CharacterFunctions.cpp | 125 ---- .../native/common/juce_posix_NamedPipe.cpp | 0 .../native/common}/juce_posix_SharedCode.h | 0 src/native/juce_linux_NativeCode.cpp | 114 +++ src/native/juce_mac_NativeCode.mm | 131 ++++ src/native/juce_win32_NativeCode.cpp | 117 +++ .../native/linux}/juce_linux_Audio.cpp | 0 .../linux}/juce_linux_AudioCDReader.cpp | 0 .../native/linux}/juce_linux_FileChooser.cpp | 0 .../native/linux}/juce_linux_Files.cpp | 0 .../native/linux}/juce_linux_Fonts.cpp | 0 .../native/linux}/juce_linux_Messaging.cpp | 0 .../native/linux}/juce_linux_Midi.cpp | 0 .../native/linux}/juce_linux_NativeIncludes.h | 0 .../native/linux}/juce_linux_Network.cpp | 0 .../native/linux}/juce_linux_SystemStats.cpp | 0 .../native/linux}/juce_linux_Threads.cpp | 0 .../linux}/juce_linux_WebBrowserComponent.cpp | 0 .../native/linux}/juce_linux_Windowing.cpp | 0 .../native/mac}/juce_mac_AppleRemote.mm | 4 - .../native/mac}/juce_mac_AudioCDBurner.mm | 0 .../native/mac}/juce_mac_CameraDevice.mm | 0 .../juce_mac_CarbonViewWrapperComponent.h | 0 .../native/mac}/juce_mac_CoreAudio.cpp | 0 .../native/mac}/juce_mac_CoreMidi.cpp | 0 .../native/mac}/juce_mac_Debugging.mm | 0 .../native/mac}/juce_mac_FileChooser.mm | 0 .../native/mac}/juce_mac_Files.mm | 0 .../native/mac}/juce_mac_Fonts.mm | 0 .../native/mac}/juce_mac_MainMenu.mm | 0 .../native/mac}/juce_mac_MessageManager.mm | 0 .../native/mac}/juce_mac_MiscUtilities.mm | 0 .../native/mac}/juce_mac_MouseCursor.mm | 0 .../native/mac}/juce_mac_NSViewComponent.mm | 0 .../mac}/juce_mac_NSViewComponentPeer.mm | 0 .../native/mac}/juce_mac_NativeIncludes.h | 0 .../native/mac}/juce_mac_Network.mm | 0 .../native/mac}/juce_mac_OpenGLComponent.mm | 0 .../mac}/juce_mac_QuickTimeMovieComponent.mm | 0 .../native/mac}/juce_mac_Strings.mm | 0 .../native/mac}/juce_mac_SystemStats.mm | 0 .../native/mac}/juce_mac_Threads.mm | 0 .../mac}/juce_mac_WebBrowserComponent.mm | 0 .../native/windows}/juce_win32_ASIO.cpp | 0 .../windows}/juce_win32_ActiveXComponent.cpp | 0 .../windows}/juce_win32_AudioCDReader.cpp | 0 .../windows}/juce_win32_AutoLinkLibraries.h | 0 .../windows}/juce_win32_CameraDevice.cpp | 0 .../windows}/juce_win32_DirectSound.cpp | 0 .../juce_win32_DynamicLibraryLoader.cpp | 0 .../juce_win32_DynamicLibraryLoader.h | 0 .../windows}/juce_win32_FileChooser.cpp | 0 .../native/windows}/juce_win32_Files.cpp | 0 .../native/windows}/juce_win32_Fonts.cpp | 0 .../native/windows}/juce_win32_Messaging.cpp | 0 .../native/windows}/juce_win32_Midi.cpp | 0 .../native/windows}/juce_win32_Misc.cpp | 0 .../windows}/juce_win32_NativeIncludes.h | 0 .../native/windows}/juce_win32_Network.cpp | 0 .../windows}/juce_win32_OpenGLComponent.cpp | 0 .../windows}/juce_win32_PlatformUtils.cpp | 0 .../juce_win32_QuickTimeMovieComponent.cpp | 0 .../windows}/juce_win32_SystemStats.cpp | 0 .../native/windows}/juce_win32_Threads.cpp | 0 .../juce_win32_WebBrowserComponent.cpp | 0 .../native/windows}/juce_win32_Windowing.cpp | 0 88 files changed, 927 insertions(+), 1346 deletions(-) delete mode 100644 build/linux/platform_specific_code/juce_linux_NamedPipe.cpp delete mode 100644 build/linux/platform_specific_code/juce_linux_NativeCode.cpp delete mode 100644 build/macosx/platform_specific_code/juce_mac_NativeCode.mm delete mode 100644 build/macosx/platform_specific_code/juce_mac_NativeHeaders.h delete mode 100644 build/win32/platform_specific_code/juce_win32_NativeCode.cpp rename build/macosx/platform_specific_code/juce_mac_NamedPipe.cpp => src/native/common/juce_posix_NamedPipe.cpp (100%) rename {build/macosx/platform_specific_code => src/native/common}/juce_posix_SharedCode.h (100%) create mode 100644 src/native/juce_linux_NativeCode.cpp create mode 100644 src/native/juce_mac_NativeCode.mm create mode 100644 src/native/juce_win32_NativeCode.cpp rename {build/linux/platform_specific_code => src/native/linux}/juce_linux_Audio.cpp (100%) rename {build/linux/platform_specific_code => src/native/linux}/juce_linux_AudioCDReader.cpp (100%) rename {build/linux/platform_specific_code => src/native/linux}/juce_linux_FileChooser.cpp (100%) rename {build/linux/platform_specific_code => src/native/linux}/juce_linux_Files.cpp (100%) rename {build/linux/platform_specific_code => src/native/linux}/juce_linux_Fonts.cpp (100%) rename {build/linux/platform_specific_code => src/native/linux}/juce_linux_Messaging.cpp (100%) rename {build/linux/platform_specific_code => src/native/linux}/juce_linux_Midi.cpp (100%) rename {build/linux/platform_specific_code => src/native/linux}/juce_linux_NativeIncludes.h (100%) rename {build/linux/platform_specific_code => src/native/linux}/juce_linux_Network.cpp (100%) rename {build/linux/platform_specific_code => src/native/linux}/juce_linux_SystemStats.cpp (100%) rename {build/linux/platform_specific_code => src/native/linux}/juce_linux_Threads.cpp (100%) rename {build/linux/platform_specific_code => src/native/linux}/juce_linux_WebBrowserComponent.cpp (100%) rename {build/linux/platform_specific_code => src/native/linux}/juce_linux_Windowing.cpp (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_AppleRemote.mm (96%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_AudioCDBurner.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_CameraDevice.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_CarbonViewWrapperComponent.h (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_CoreAudio.cpp (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_CoreMidi.cpp (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_Debugging.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_FileChooser.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_Files.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_Fonts.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_MainMenu.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_MessageManager.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_MiscUtilities.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_MouseCursor.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_NSViewComponent.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_NSViewComponentPeer.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_NativeIncludes.h (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_Network.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_OpenGLComponent.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_QuickTimeMovieComponent.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_Strings.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_SystemStats.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_Threads.mm (100%) rename {build/macosx/platform_specific_code => src/native/mac}/juce_mac_WebBrowserComponent.mm (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_ASIO.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_ActiveXComponent.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_AudioCDReader.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_AutoLinkLibraries.h (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_CameraDevice.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_DirectSound.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_DynamicLibraryLoader.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_DynamicLibraryLoader.h (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_FileChooser.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_Files.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_Fonts.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_Messaging.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_Midi.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_Misc.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_NativeIncludes.h (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_Network.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_OpenGLComponent.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_PlatformUtils.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_QuickTimeMovieComponent.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_SystemStats.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_Threads.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_WebBrowserComponent.cpp (100%) rename {build/win32/platform_specific_code => src/native/windows}/juce_win32_Windowing.cpp (100%) diff --git a/build/linux/JUCE.make b/build/linux/JUCE.make index 78f8440609..6fc39b8bb5 100644 --- a/build/linux/JUCE.make +++ b/build/linux/JUCE.make @@ -66,10 +66,10 @@ OBJECTS := \ $(OBJDIR)/juce_BufferedInputStream.o \ $(OBJDIR)/juce_FileInputSource.o \ $(OBJDIR)/juce_GZIPCompressorOutputStream.o \ - $(OBJDIR)/juce_GZIPDecompressorInputStream.o \ $(OBJDIR)/juce_MemoryInputStream.o \ $(OBJDIR)/juce_MemoryOutputStream.o \ $(OBJDIR)/juce_SubregionStream.o \ + $(OBJDIR)/juce_GZIPDecompressorInputStream.o \ $(OBJDIR)/juce_PerformanceCounter.o \ $(OBJDIR)/juce_Uuid.o \ $(OBJDIR)/juce_ZipFile.o \ @@ -189,8 +189,8 @@ OBJECTS := \ $(OBJDIR)/juce_Point.o \ $(OBJDIR)/juce_Rectangle.o \ $(OBJDIR)/juce_RectangleList.o \ - $(OBJDIR)/juce_PathStrokeType.o \ $(OBJDIR)/juce_PositionedRectangle.o \ + $(OBJDIR)/juce_PathStrokeType.o \ $(OBJDIR)/juce_Image.o \ $(OBJDIR)/juce_ImageCache.o \ $(OBJDIR)/juce_ImageConvolutionKernel.o \ @@ -291,20 +291,19 @@ OBJECTS := \ $(OBJDIR)/juce_TopLevelWindow.o \ $(OBJDIR)/juce_ComponentPeer.o \ $(OBJDIR)/juce_AlertWindow.o \ - $(OBJDIR)/juce_linux_Files.o \ - $(OBJDIR)/juce_linux_Audio.o \ - $(OBJDIR)/juce_linux_Fonts.o \ - $(OBJDIR)/juce_linux_Network.o \ - $(OBJDIR)/juce_linux_NamedPipe.o \ - $(OBJDIR)/juce_linux_Midi.o \ $(OBJDIR)/juce_linux_Windowing.o \ - $(OBJDIR)/juce_linux_AudioCDReader.o \ + $(OBJDIR)/juce_linux_WebBrowserComponent.o \ $(OBJDIR)/juce_linux_Threads.o \ - $(OBJDIR)/juce_linux_Messaging.o \ $(OBJDIR)/juce_linux_SystemStats.o \ - $(OBJDIR)/juce_linux_NativeCode.o \ + $(OBJDIR)/juce_linux_Network.o \ + $(OBJDIR)/juce_linux_Messaging.o \ + $(OBJDIR)/juce_linux_Midi.o \ + $(OBJDIR)/juce_linux_Files.o \ + $(OBJDIR)/juce_linux_Fonts.o \ $(OBJDIR)/juce_linux_FileChooser.o \ - $(OBJDIR)/juce_linux_WebBrowserComponent.o \ + $(OBJDIR)/juce_linux_AudioCDReader.o \ + $(OBJDIR)/juce_linux_Audio.o \ + $(OBJDIR)/juce_linux_NativeCode.o \ MKDIR_TYPE := msdos CMD := $(subst \,\\,$(ComSpec)$(COMSPEC)) @@ -481,22 +480,22 @@ $(OBJDIR)/juce_GZIPCompressorOutputStream.o: ../../src/juce_core/io/streams/juce @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_GZIPDecompressorInputStream.o: ../../src/juce_core/io/streams/juce_GZIPDecompressorInputStream.cpp +$(OBJDIR)/juce_MemoryInputStream.o: ../../src/juce_core/io/streams/juce_MemoryInputStream.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_MemoryInputStream.o: ../../src/juce_core/io/streams/juce_MemoryInputStream.cpp +$(OBJDIR)/juce_MemoryOutputStream.o: ../../src/juce_core/io/streams/juce_MemoryOutputStream.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_MemoryOutputStream.o: ../../src/juce_core/io/streams/juce_MemoryOutputStream.cpp +$(OBJDIR)/juce_SubregionStream.o: ../../src/juce_core/io/streams/juce_SubregionStream.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_SubregionStream.o: ../../src/juce_core/io/streams/juce_SubregionStream.cpp +$(OBJDIR)/juce_GZIPDecompressorInputStream.o: ../../src/juce_core/io/streams/juce_GZIPDecompressorInputStream.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1096,12 +1095,12 @@ $(OBJDIR)/juce_RectangleList.o: ../../src/juce_appframework/gui/graphics/geometr @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_PathStrokeType.o: ../../src/juce_appframework/gui/graphics/geometry/juce_PathStrokeType.cpp +$(OBJDIR)/juce_PositionedRectangle.o: ../../src/juce_appframework/gui/graphics/geometry/juce_PositionedRectangle.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_PositionedRectangle.o: ../../src/juce_appframework/gui/graphics/geometry/juce_PositionedRectangle.cpp +$(OBJDIR)/juce_PathStrokeType.o: ../../src/juce_appframework/gui/graphics/geometry/juce_PathStrokeType.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1606,72 +1605,67 @@ $(OBJDIR)/juce_AlertWindow.o: ../../src/juce_appframework/gui/components/windows @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_Files.o: platform_specific_code/juce_linux_Files.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_linux_Audio.o: platform_specific_code/juce_linux_Audio.cpp +$(OBJDIR)/juce_linux_Windowing.o: ../../src/native/linux/juce_linux_Windowing.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_Fonts.o: platform_specific_code/juce_linux_Fonts.cpp +$(OBJDIR)/juce_linux_WebBrowserComponent.o: ../../src/native/linux/juce_linux_WebBrowserComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_Network.o: platform_specific_code/juce_linux_Network.cpp +$(OBJDIR)/juce_linux_Threads.o: ../../src/native/linux/juce_linux_Threads.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_NamedPipe.o: platform_specific_code/juce_linux_NamedPipe.cpp +$(OBJDIR)/juce_linux_SystemStats.o: ../../src/native/linux/juce_linux_SystemStats.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_Midi.o: platform_specific_code/juce_linux_Midi.cpp +$(OBJDIR)/juce_linux_Network.o: ../../src/native/linux/juce_linux_Network.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_Windowing.o: platform_specific_code/juce_linux_Windowing.cpp +$(OBJDIR)/juce_linux_Messaging.o: ../../src/native/linux/juce_linux_Messaging.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_AudioCDReader.o: platform_specific_code/juce_linux_AudioCDReader.cpp +$(OBJDIR)/juce_linux_Midi.o: ../../src/native/linux/juce_linux_Midi.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_Threads.o: platform_specific_code/juce_linux_Threads.cpp +$(OBJDIR)/juce_linux_Files.o: ../../src/native/linux/juce_linux_Files.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_Messaging.o: platform_specific_code/juce_linux_Messaging.cpp +$(OBJDIR)/juce_linux_Fonts.o: ../../src/native/linux/juce_linux_Fonts.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_SystemStats.o: platform_specific_code/juce_linux_SystemStats.cpp +$(OBJDIR)/juce_linux_FileChooser.o: ../../src/native/linux/juce_linux_FileChooser.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_NativeCode.o: platform_specific_code/juce_linux_NativeCode.cpp +$(OBJDIR)/juce_linux_AudioCDReader.o: ../../src/native/linux/juce_linux_AudioCDReader.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_FileChooser.o: platform_specific_code/juce_linux_FileChooser.cpp +$(OBJDIR)/juce_linux_Audio.o: ../../src/native/linux/juce_linux_Audio.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_WebBrowserComponent.o: platform_specific_code/juce_linux_WebBrowserComponent.cpp +$(OBJDIR)/juce_linux_NativeCode.o: ../../src/native/juce_linux_NativeCode.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" diff --git a/build/linux/juce_premake.lua b/build/linux/juce_premake.lua index a5e9a26b5b..edd1be392d 100644 --- a/build/linux/juce_premake.lua +++ b/build/linux/juce_premake.lua @@ -123,7 +123,8 @@ package.files = { matchfiles ( "../../src/juce_appframework/gui/components/special/*.h", "../../src/juce_appframework/gui/components/windows/*.cpp", "../../src/juce_appframework/gui/components/windows/*.h", - "platform_specific_code/*.h", - "platform_specific_code/*.cpp" + "../../src/native/linux/*.h", + "../../src/native/linux/*.cpp", + "../../src/native/juce_linux_NativeCode.cpp" ) } diff --git a/build/linux/platform_specific_code/juce_linux_NamedPipe.cpp b/build/linux/platform_specific_code/juce_linux_NamedPipe.cpp deleted file mode 100644 index afd2d5ff37..0000000000 --- a/build/linux/platform_specific_code/juce_linux_NamedPipe.cpp +++ /dev/null @@ -1,27 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library - "Jules' Utility Class Extensions" - Copyright 2004-9 by Raw Material Software Ltd. - - ------------------------------------------------------------------------------ - - JUCE can be redistributed and/or modified under the terms of the GNU General - Public License (Version 2), as published by the Free Software Foundation. - A copy of the license is included in the JUCE distribution, or can be found - online at www.gnu.org/licenses. - - 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. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.rawmaterialsoftware.com/juce for more information. - - ============================================================================== -*/ - -#include "../../macosx/platform_specific_code/juce_mac_NamedPipe.cpp" - diff --git a/build/linux/platform_specific_code/juce_linux_NativeCode.cpp b/build/linux/platform_specific_code/juce_linux_NativeCode.cpp deleted file mode 100644 index 2b6feaa51e..0000000000 --- a/build/linux/platform_specific_code/juce_linux_NativeCode.cpp +++ /dev/null @@ -1,114 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library - "Jules' Utility Class Extensions" - Copyright 2004-9 by Raw Material Software Ltd. - - ------------------------------------------------------------------------------ - - JUCE can be redistributed and/or modified under the terms of the GNU General - Public License (Version 2), as published by the Free Software Foundation. - A copy of the license is included in the JUCE distribution, or can be found - online at www.gnu.org/licenses. - - 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. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.rawmaterialsoftware.com/juce for more information. - - ============================================================================== -*/ - -/* - This file wraps together all the mac-specific code, so that - we can include all the native headers just once, and compile all our - platform-specific stuff in one big lump, keeping it out of the way of - the rest of the codebase. -*/ - -#include "juce_linux_NativeIncludes.h" - - -BEGIN_JUCE_NAMESPACE - -#include "../../../src/juce_core/io/files/juce_FileInputStream.h" -#include "../../../src/juce_core/io/files/juce_FileOutputStream.h" -#include "../../../src/juce_core/basics/juce_SystemStats.h" -#include "../../../src/juce_core/basics/juce_Time.h" -#include "../../../src/juce_core/basics/juce_Random.h" -#include "../../../src/juce_core/io/network/juce_URL.h" -#include "../../../src/juce_core/io/files/juce_NamedPipe.h" -#include "../../../src/juce_core/threads/juce_InterProcessLock.h" -#include "../../../src/juce_appframework/audio/devices/juce_AudioIODeviceType.h" -#include "../../../src/juce_core/threads/juce_Thread.h" -#include "../../../src/juce_core/threads/juce_ScopedLock.h" -#include "../../../src/juce_core/io/files/juce_File.h" -#include "../../../src/juce_core/basics/juce_Singleton.h" -#include "../../../src/juce_appframework/audio/dsp/juce_AudioDataConverters.h" -#include "../../../src/juce_appframework/audio/audio_file_formats/juce_AudioCDReader.h" -#include "../../../src/juce_appframework/gui/graphics/fonts/juce_Font.h" -#include "../../../src/juce_core/io/streams/juce_MemoryInputStream.h" -#include "../../../src/juce_core/io/files/juce_DirectoryIterator.h" -#include "../../../src/juce_core/text/juce_XmlDocument.h" -#include "../../../src/juce_appframework/application/juce_DeletedAtShutdown.h" -#include "../../../src/juce_appframework/events/juce_MessageManager.h" -#include "../../../src/juce_core/threads/juce_WaitableEvent.h" -#include "../../../src/juce_core/threads/juce_Process.h" -#include "../../../src/juce_appframework/gui/components/filebrowser/juce_FileChooser.h" -#include "../../../src/juce_appframework/audio/devices/juce_MidiOutput.h" -#include "../../../src/juce_appframework/audio/devices/juce_MidiInput.h" -#include "../../../src/juce_core/text/juce_StringArray.h" -#include "../../../src/juce_core/containers/juce_MemoryBlock.h" -#include "../../../src/juce_core/misc/juce_PlatformUtilities.h" -#include "../../../src/juce_core/threads/juce_CriticalSection.h" -#include "../../../src/juce_appframework/events/juce_Timer.h" -#include "../../../src/juce_appframework/gui/components/special/juce_WebBrowserComponent.h" -#include "../../../src/juce_appframework/gui/components/keyboard/juce_KeyPress.h" -#include "../../../src/juce_appframework/application/juce_SystemClipboard.h" -#include "../../../src/juce_appframework/gui/components/windows/juce_AlertWindow.h" -#include "../../../src/juce_appframework/gui/components/special/juce_OpenGLComponent.h" -#include "../../../src/juce_appframework/gui/components/juce_Desktop.h" -#include "../../../src/juce_appframework/gui/components/juce_ComponentDeletionWatcher.h" -#include "../../../src/juce_appframework/gui/graphics/geometry/juce_RectangleList.h" -#include "../../../src/juce_appframework/gui/graphics/imaging/juce_ImageFileFormat.h" -#include "../../../src/juce_appframework/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h" -#include "../../../src/juce_appframework/gui/components/mouse/juce_DragAndDropContainer.h" -#include "../../../src/juce_appframework/gui/components/special/juce_SystemTrayIconComponent.h" -#include "../../../src/juce_appframework/application/juce_Application.h" - -/* Remove this macro if you're having problems compiling the cpu affinity - calls (the API for these has changed about quite a bit in various Linux - versions, and a lot of distros seem to ship with obsolete versions) -*/ -#if defined (CPU_ISSET) && ! defined (SUPPORT_AFFINITIES) - #define SUPPORT_AFFINITIES 1 -#endif - -//============================================================================== -#define JUCE_INCLUDED_FILE 1 - -// Now include the actual code files.. - -#include "../../macosx/platform_specific_code/juce_posix_SharedCode.h" -#include "juce_linux_Files.cpp" -#include "../../macosx/platform_specific_code/juce_mac_NamedPipe.cpp" -#include "juce_linux_Network.cpp" -#include "juce_linux_SystemStats.cpp" -#include "juce_linux_Threads.cpp" - -#if ! JUCE_ONLY_BUILD_CORE_LIBRARY - #include "juce_linux_Messaging.cpp" - #include "juce_linux_Fonts.cpp" - #include "juce_linux_Windowing.cpp" - #include "juce_linux_Audio.cpp" - #include "juce_linux_Midi.cpp" - #include "juce_linux_AudioCDReader.cpp" - #include "juce_linux_FileChooser.cpp" - #include "juce_linux_WebBrowserComponent.cpp" -#endif - -END_JUCE_NAMESPACE diff --git a/build/macosx/Juce.xcodeproj/project.pbxproj b/build/macosx/Juce.xcodeproj/project.pbxproj index 0cdd709b91..7e35e72f67 100644 --- a/build/macosx/Juce.xcodeproj/project.pbxproj +++ b/build/macosx/Juce.xcodeproj/project.pbxproj @@ -77,9 +77,6 @@ 842F9D6E0A19C9AF00B1358D /* juce_TextPropertyComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 842F9D620A19C9AF00B1358D /* juce_TextPropertyComponent.h */; }; 842F9DE20A19D2AF00B1358D /* juce_PositionedRectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 842F9DE00A19D2AF00B1358D /* juce_PositionedRectangle.cpp */; }; 842F9DE30A19D2AF00B1358D /* juce_PositionedRectangle.h in Headers */ = {isa = PBXBuildFile; fileRef = 842F9DE10A19D2AF00B1358D /* juce_PositionedRectangle.h */; }; - 8435D90D0E9406D2008FBD1C /* juce_mac_Strings.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8435D90C0E9406D2008FBD1C /* juce_mac_Strings.mm */; }; - 8435D9650E940A3E008FBD1C /* juce_mac_MiscUtilities.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8435D9640E940A3E008FBD1C /* juce_mac_MiscUtilities.mm */; }; - 8435DA420E95527D008FBD1C /* juce_mac_Debugging.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8435DA410E95527D008FBD1C /* juce_mac_Debugging.mm */; }; 8440CD3E0ACD0FFC0086FFD7 /* juce_ComponentMovementWatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8440CD3C0ACD0FFC0086FFD7 /* juce_ComponentMovementWatcher.cpp */; }; 8440CD3F0ACD0FFC0086FFD7 /* juce_ComponentMovementWatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 8440CD3D0ACD0FFC0086FFD7 /* juce_ComponentMovementWatcher.h */; }; 8440CD620ACD112E0086FFD7 /* juce_SliderListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 8440CD610ACD112E0086FFD7 /* juce_SliderListener.h */; }; @@ -118,6 +115,33 @@ 847F72DC0C2702A000CBECEC /* juce_DirectoryContentsDisplayComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 847F72D80C2702A000CBECEC /* juce_DirectoryContentsDisplayComponent.h */; }; 847F72DD0C2702A000CBECEC /* juce_FileTreeComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 847F72D90C2702A000CBECEC /* juce_FileTreeComponent.cpp */; }; 847F72DE0C2702A000CBECEC /* juce_FileTreeComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 847F72DA0C2702A000CBECEC /* juce_FileTreeComponent.h */; }; + 8484E9A5103C958A008B7C6C /* juce_mac_NativeCode.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9A4103C958A008B7C6C /* juce_mac_NativeCode.mm */; }; + 8484E9BE103C9595008B7C6C /* juce_mac_AppleRemote.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9A6103C9595008B7C6C /* juce_mac_AppleRemote.mm */; }; + 8484E9BF103C9595008B7C6C /* juce_mac_AudioCDBurner.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9A7103C9595008B7C6C /* juce_mac_AudioCDBurner.mm */; }; + 8484E9C0103C9595008B7C6C /* juce_mac_CameraDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9A8103C9595008B7C6C /* juce_mac_CameraDevice.mm */; }; + 8484E9C1103C9595008B7C6C /* juce_mac_CarbonViewWrapperComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 8484E9A9103C9595008B7C6C /* juce_mac_CarbonViewWrapperComponent.h */; }; + 8484E9C2103C9595008B7C6C /* juce_mac_CoreAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9AA103C9595008B7C6C /* juce_mac_CoreAudio.cpp */; }; + 8484E9C3103C9595008B7C6C /* juce_mac_CoreMidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9AB103C9595008B7C6C /* juce_mac_CoreMidi.cpp */; }; + 8484E9C4103C9595008B7C6C /* juce_mac_Debugging.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9AC103C9595008B7C6C /* juce_mac_Debugging.mm */; }; + 8484E9C5103C9595008B7C6C /* juce_mac_FileChooser.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9AD103C9595008B7C6C /* juce_mac_FileChooser.mm */; }; + 8484E9C6103C9595008B7C6C /* juce_mac_Files.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9AE103C9595008B7C6C /* juce_mac_Files.mm */; }; + 8484E9C7103C9595008B7C6C /* juce_mac_Fonts.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9AF103C9595008B7C6C /* juce_mac_Fonts.mm */; }; + 8484E9C8103C9595008B7C6C /* juce_mac_MainMenu.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9B0103C9595008B7C6C /* juce_mac_MainMenu.mm */; }; + 8484E9C9103C9595008B7C6C /* juce_mac_MessageManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9B1103C9595008B7C6C /* juce_mac_MessageManager.mm */; }; + 8484E9CA103C9595008B7C6C /* juce_mac_MiscUtilities.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9B2103C9595008B7C6C /* juce_mac_MiscUtilities.mm */; }; + 8484E9CB103C9595008B7C6C /* juce_mac_MouseCursor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9B3103C9595008B7C6C /* juce_mac_MouseCursor.mm */; }; + 8484E9CC103C9595008B7C6C /* juce_mac_NativeIncludes.h in Headers */ = {isa = PBXBuildFile; fileRef = 8484E9B4103C9595008B7C6C /* juce_mac_NativeIncludes.h */; }; + 8484E9CD103C9595008B7C6C /* juce_mac_Network.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9B5103C9595008B7C6C /* juce_mac_Network.mm */; }; + 8484E9CE103C9595008B7C6C /* juce_mac_NSViewComponent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9B6103C9595008B7C6C /* juce_mac_NSViewComponent.mm */; }; + 8484E9CF103C9595008B7C6C /* juce_mac_NSViewComponentPeer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9B7103C9595008B7C6C /* juce_mac_NSViewComponentPeer.mm */; }; + 8484E9D0103C9595008B7C6C /* juce_mac_OpenGLComponent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9B8103C9595008B7C6C /* juce_mac_OpenGLComponent.mm */; }; + 8484E9D1103C9595008B7C6C /* juce_mac_QuickTimeMovieComponent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9B9103C9595008B7C6C /* juce_mac_QuickTimeMovieComponent.mm */; }; + 8484E9D2103C9595008B7C6C /* juce_mac_Strings.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9BA103C9595008B7C6C /* juce_mac_Strings.mm */; }; + 8484E9D3103C9595008B7C6C /* juce_mac_SystemStats.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9BB103C9595008B7C6C /* juce_mac_SystemStats.mm */; }; + 8484E9D4103C9595008B7C6C /* juce_mac_Threads.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9BC103C9595008B7C6C /* juce_mac_Threads.mm */; }; + 8484E9D5103C9595008B7C6C /* juce_mac_WebBrowserComponent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9BD103C9595008B7C6C /* juce_mac_WebBrowserComponent.mm */; }; + 8484E9D8103C95A6008B7C6C /* juce_posix_SharedCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 8484E9D6103C95A6008B7C6C /* juce_posix_SharedCode.h */; }; + 8484E9D9103C95A6008B7C6C /* juce_posix_NamedPipe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9D7103C95A6008B7C6C /* juce_posix_NamedPipe.cpp */; }; 848A560E0DDDD3FB0041C706 /* juce_WebBrowserComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 848A560D0DDDD3FB0041C706 /* juce_WebBrowserComponent.h */; }; 8495BB8C0D8067B2001D9C0B /* juce_AudioThumbnail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8495BB880D8067B2001D9C0B /* juce_AudioThumbnail.cpp */; }; 8495BB8D0D8067B2001D9C0B /* juce_AudioThumbnail.h in Headers */ = {isa = PBXBuildFile; fileRef = 8495BB890D8067B2001D9C0B /* juce_AudioThumbnail.h */; }; @@ -489,30 +513,8 @@ 84CA4AF40E9BF8B6004CCC0E /* juce_VSTPluginFormat.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84CA4AF30E9BF8B6004CCC0E /* juce_VSTPluginFormat.mm */; }; 84D296BD09B763190026C535 /* juce_PropertiesFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D296BB09B763190026C535 /* juce_PropertiesFile.cpp */; }; 84D296BE09B763190026C535 /* juce_PropertiesFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 84D296BC09B763190026C535 /* juce_PropertiesFile.h */; }; - 84E024F10E94028C003E41AF /* juce_mac_AppleRemote.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84E024DB0E94028C003E41AF /* juce_mac_AppleRemote.mm */; }; - 84E024F20E94028C003E41AF /* juce_mac_AudioCDBurner.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84E024DC0E94028C003E41AF /* juce_mac_AudioCDBurner.mm */; }; - 84E024F30E94028C003E41AF /* juce_mac_CoreAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84E024DD0E94028C003E41AF /* juce_mac_CoreAudio.cpp */; }; - 84E024F40E94028C003E41AF /* juce_mac_CoreMidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84E024DE0E94028C003E41AF /* juce_mac_CoreMidi.cpp */; }; - 84E024F50E94028C003E41AF /* juce_mac_FileChooser.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84E024DF0E94028C003E41AF /* juce_mac_FileChooser.mm */; }; - 84E024F60E94028C003E41AF /* juce_mac_Files.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84E024E00E94028C003E41AF /* juce_mac_Files.mm */; }; - 84E024F70E94028C003E41AF /* juce_mac_Fonts.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84E024E10E94028C003E41AF /* juce_mac_Fonts.mm */; }; - 84E024F80E94028C003E41AF /* juce_mac_MainMenu.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84E024E20E94028C003E41AF /* juce_mac_MainMenu.mm */; }; - 84E024F90E94028C003E41AF /* juce_mac_MessageManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84E024E30E94028C003E41AF /* juce_mac_MessageManager.mm */; }; - 84E024FA0E94028C003E41AF /* juce_mac_MouseCursor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84E024E40E94028C003E41AF /* juce_mac_MouseCursor.mm */; }; - 84E024FB0E94028C003E41AF /* juce_mac_NamedPipe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84E024E50E94028C003E41AF /* juce_mac_NamedPipe.cpp */; }; - 84E024FC0E94028C003E41AF /* juce_mac_NativeCode.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84E024E60E94028C003E41AF /* juce_mac_NativeCode.mm */; }; - 84E024FE0E94028C003E41AF /* juce_mac_Network.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84E024E80E94028C003E41AF /* juce_mac_Network.mm */; }; - 84E024FF0E94028C003E41AF /* juce_mac_NSViewComponent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84E024E90E94028C003E41AF /* juce_mac_NSViewComponent.mm */; }; - 84E025000E94028C003E41AF /* juce_mac_NSViewComponentPeer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84E024EA0E94028C003E41AF /* juce_mac_NSViewComponentPeer.mm */; }; - 84E025010E94028C003E41AF /* juce_mac_OpenGLComponent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84E024EB0E94028C003E41AF /* juce_mac_OpenGLComponent.mm */; }; - 84E025020E94028C003E41AF /* juce_mac_QuickTimeMovieComponent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84E024EC0E94028C003E41AF /* juce_mac_QuickTimeMovieComponent.mm */; }; - 84E025030E94028C003E41AF /* juce_mac_SystemStats.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84E024ED0E94028C003E41AF /* juce_mac_SystemStats.mm */; }; - 84E025040E94028C003E41AF /* juce_mac_Threads.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84E024EE0E94028C003E41AF /* juce_mac_Threads.mm */; }; - 84E025050E94028C003E41AF /* juce_mac_WebBrowserComponent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84E024EF0E94028C003E41AF /* juce_mac_WebBrowserComponent.mm */; }; - 84E025060E94028C003E41AF /* juce_posix_SharedCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 84E024F00E94028C003E41AF /* juce_posix_SharedCode.h */; }; 84E8209409729D2A0097675B /* juce_AudioFormatManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84E8209209729D2A0097675B /* juce_AudioFormatManager.cpp */; }; 84E8209509729D2A0097675B /* juce_AudioFormatManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 84E8209309729D2A0097675B /* juce_AudioFormatManager.h */; }; - 84EE00FD0FF22E660093FACA /* juce_mac_CameraDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84EE00FC0FF22E660093FACA /* juce_mac_CameraDevice.mm */; }; 84EE01050FF235750093FACA /* juce_CameraDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 84EE01040FF235750093FACA /* juce_CameraDevice.h */; }; 84F1B8DA09499F1400AD8EDE /* juce_MidiKeyboardComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1B8D809499F1400AD8EDE /* juce_MidiKeyboardComponent.cpp */; }; 84F1B8DB09499F1400AD8EDE /* juce_MidiKeyboardComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F1B8D909499F1400AD8EDE /* juce_MidiKeyboardComponent.h */; }; @@ -560,7 +562,6 @@ 84F7A7C20A8383E000D36246 /* juce_MultiTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F7A7C00A8383E000D36246 /* juce_MultiTimer.h */; }; 84F7A7EF0A838CC900D36246 /* juce_ComponentAnimator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F7A7ED0A838CC900D36246 /* juce_ComponentAnimator.cpp */; }; 84F7A7F00A838CC900D36246 /* juce_ComponentAnimator.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F7A7EE0A838CC900D36246 /* juce_ComponentAnimator.h */; }; - 84F8B60D0EB5B9230020D98D /* juce_mac_NativeIncludes.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F8B60C0EB5B9230020D98D /* juce_mac_NativeIncludes.h */; }; 84F8DAD0099C963A00E911ED /* juce_ComponentPeer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F8DACE099C963A00E911ED /* juce_ComponentPeer.cpp */; }; 84F8DAD1099C963A00E911ED /* juce_ComponentPeer.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F8DACF099C963A00E911ED /* juce_ComponentPeer.h */; }; 84FC318F09B749FD00B75141 /* juce_FileBasedDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84FC318709B749FD00B75141 /* juce_FileBasedDocument.cpp */; }; @@ -609,7 +610,7 @@ 84099C9C0AE52BD000B2A05D /* juce_Sampler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = juce_Sampler.h; sourceTree = ""; }; 84099C9D0AE52BD000B2A05D /* juce_Synthesiser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = juce_Synthesiser.cpp; sourceTree = ""; }; 84099C9E0AE52BD000B2A05D /* juce_Synthesiser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = juce_Synthesiser.h; sourceTree = ""; }; - 840F80BB092B399D005E7B4E /* juce.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = juce.h; path = ../../juce.h; sourceTree = SOURCE_ROOT; }; + 840F80BB092B399D005E7B4E /* juce.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 2; name = juce.h; path = ../../juce.h; sourceTree = SOURCE_ROOT; }; 8417EE4F0A6E7A270058E04E /* juce_TableHeaderComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = juce_TableHeaderComponent.cpp; sourceTree = ""; }; 8417EE500A6E7A270058E04E /* juce_TableHeaderComponent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = juce_TableHeaderComponent.h; sourceTree = ""; }; 8417EE510A6E7A280058E04E /* juce_TableListBox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = juce_TableListBox.cpp; sourceTree = ""; }; @@ -667,13 +668,10 @@ 842F9D620A19C9AF00B1358D /* juce_TextPropertyComponent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = juce_TextPropertyComponent.h; sourceTree = ""; }; 842F9DE00A19D2AF00B1358D /* juce_PositionedRectangle.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = juce_PositionedRectangle.cpp; sourceTree = ""; }; 842F9DE10A19D2AF00B1358D /* juce_PositionedRectangle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = juce_PositionedRectangle.h; sourceTree = ""; }; - 8435D90C0E9406D2008FBD1C /* juce_mac_Strings.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = juce_mac_Strings.mm; sourceTree = ""; }; - 8435D9640E940A3E008FBD1C /* juce_mac_MiscUtilities.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = juce_mac_MiscUtilities.mm; sourceTree = ""; }; - 8435DA410E95527D008FBD1C /* juce_mac_Debugging.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = juce_mac_Debugging.mm; sourceTree = ""; }; 8440CD3C0ACD0FFC0086FFD7 /* juce_ComponentMovementWatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = juce_ComponentMovementWatcher.cpp; sourceTree = ""; }; 8440CD3D0ACD0FFC0086FFD7 /* juce_ComponentMovementWatcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = juce_ComponentMovementWatcher.h; sourceTree = ""; }; 8440CD610ACD112E0086FFD7 /* juce_SliderListener.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = juce_SliderListener.h; sourceTree = ""; }; - 8456EC6508A2A6C80087C412 /* juce_Config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = juce_Config.h; path = ../../juce_Config.h; sourceTree = SOURCE_ROOT; }; + 8456EC6508A2A6C80087C412 /* juce_Config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 2; name = juce_Config.h; path = ../../juce_Config.h; sourceTree = SOURCE_ROOT; }; 8456EC6908A2A6F00087C412 /* JUCE changelist.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = "JUCE changelist.txt"; path = "../../docs/JUCE changelist.txt"; sourceTree = SOURCE_ROOT; }; 8457783D0E8947C8006D9E4E /* juce_NSViewComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = juce_NSViewComponent.h; sourceTree = ""; }; 84581EE80D9148C500AE1A4C /* juce_QuickTimeAudioFormat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = juce_QuickTimeAudioFormat.cpp; sourceTree = ""; }; @@ -710,6 +708,33 @@ 847F72D80C2702A000CBECEC /* juce_DirectoryContentsDisplayComponent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = juce_DirectoryContentsDisplayComponent.h; path = filebrowser/juce_DirectoryContentsDisplayComponent.h; sourceTree = ""; }; 847F72D90C2702A000CBECEC /* juce_FileTreeComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = juce_FileTreeComponent.cpp; path = filebrowser/juce_FileTreeComponent.cpp; sourceTree = ""; }; 847F72DA0C2702A000CBECEC /* juce_FileTreeComponent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = juce_FileTreeComponent.h; path = filebrowser/juce_FileTreeComponent.h; sourceTree = ""; }; + 8484E9A4103C958A008B7C6C /* juce_mac_NativeCode.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_NativeCode.mm; path = ../../src/native/juce_mac_NativeCode.mm; sourceTree = SOURCE_ROOT; }; + 8484E9A6103C9595008B7C6C /* juce_mac_AppleRemote.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_AppleRemote.mm; path = ../../src/native/mac/juce_mac_AppleRemote.mm; sourceTree = SOURCE_ROOT; }; + 8484E9A7103C9595008B7C6C /* juce_mac_AudioCDBurner.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_AudioCDBurner.mm; path = ../../src/native/mac/juce_mac_AudioCDBurner.mm; sourceTree = SOURCE_ROOT; }; + 8484E9A8103C9595008B7C6C /* juce_mac_CameraDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_CameraDevice.mm; path = ../../src/native/mac/juce_mac_CameraDevice.mm; sourceTree = SOURCE_ROOT; }; + 8484E9A9103C9595008B7C6C /* juce_mac_CarbonViewWrapperComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_mac_CarbonViewWrapperComponent.h; path = ../../src/native/mac/juce_mac_CarbonViewWrapperComponent.h; sourceTree = SOURCE_ROOT; }; + 8484E9AA103C9595008B7C6C /* juce_mac_CoreAudio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = juce_mac_CoreAudio.cpp; path = ../../src/native/mac/juce_mac_CoreAudio.cpp; sourceTree = SOURCE_ROOT; }; + 8484E9AB103C9595008B7C6C /* juce_mac_CoreMidi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = juce_mac_CoreMidi.cpp; path = ../../src/native/mac/juce_mac_CoreMidi.cpp; sourceTree = SOURCE_ROOT; }; + 8484E9AC103C9595008B7C6C /* juce_mac_Debugging.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_Debugging.mm; path = ../../src/native/mac/juce_mac_Debugging.mm; sourceTree = SOURCE_ROOT; }; + 8484E9AD103C9595008B7C6C /* juce_mac_FileChooser.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_FileChooser.mm; path = ../../src/native/mac/juce_mac_FileChooser.mm; sourceTree = SOURCE_ROOT; }; + 8484E9AE103C9595008B7C6C /* juce_mac_Files.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_Files.mm; path = ../../src/native/mac/juce_mac_Files.mm; sourceTree = SOURCE_ROOT; }; + 8484E9AF103C9595008B7C6C /* juce_mac_Fonts.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_Fonts.mm; path = ../../src/native/mac/juce_mac_Fonts.mm; sourceTree = SOURCE_ROOT; }; + 8484E9B0103C9595008B7C6C /* juce_mac_MainMenu.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_MainMenu.mm; path = ../../src/native/mac/juce_mac_MainMenu.mm; sourceTree = SOURCE_ROOT; }; + 8484E9B1103C9595008B7C6C /* juce_mac_MessageManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_MessageManager.mm; path = ../../src/native/mac/juce_mac_MessageManager.mm; sourceTree = SOURCE_ROOT; }; + 8484E9B2103C9595008B7C6C /* juce_mac_MiscUtilities.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_MiscUtilities.mm; path = ../../src/native/mac/juce_mac_MiscUtilities.mm; sourceTree = SOURCE_ROOT; }; + 8484E9B3103C9595008B7C6C /* juce_mac_MouseCursor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_MouseCursor.mm; path = ../../src/native/mac/juce_mac_MouseCursor.mm; sourceTree = SOURCE_ROOT; }; + 8484E9B4103C9595008B7C6C /* juce_mac_NativeIncludes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_mac_NativeIncludes.h; path = ../../src/native/mac/juce_mac_NativeIncludes.h; sourceTree = SOURCE_ROOT; }; + 8484E9B5103C9595008B7C6C /* juce_mac_Network.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_Network.mm; path = ../../src/native/mac/juce_mac_Network.mm; sourceTree = SOURCE_ROOT; }; + 8484E9B6103C9595008B7C6C /* juce_mac_NSViewComponent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_NSViewComponent.mm; path = ../../src/native/mac/juce_mac_NSViewComponent.mm; sourceTree = SOURCE_ROOT; }; + 8484E9B7103C9595008B7C6C /* juce_mac_NSViewComponentPeer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_NSViewComponentPeer.mm; path = ../../src/native/mac/juce_mac_NSViewComponentPeer.mm; sourceTree = SOURCE_ROOT; }; + 8484E9B8103C9595008B7C6C /* juce_mac_OpenGLComponent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_OpenGLComponent.mm; path = ../../src/native/mac/juce_mac_OpenGLComponent.mm; sourceTree = SOURCE_ROOT; }; + 8484E9B9103C9595008B7C6C /* juce_mac_QuickTimeMovieComponent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_QuickTimeMovieComponent.mm; path = ../../src/native/mac/juce_mac_QuickTimeMovieComponent.mm; sourceTree = SOURCE_ROOT; }; + 8484E9BA103C9595008B7C6C /* juce_mac_Strings.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_Strings.mm; path = ../../src/native/mac/juce_mac_Strings.mm; sourceTree = SOURCE_ROOT; }; + 8484E9BB103C9595008B7C6C /* juce_mac_SystemStats.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_SystemStats.mm; path = ../../src/native/mac/juce_mac_SystemStats.mm; sourceTree = SOURCE_ROOT; }; + 8484E9BC103C9595008B7C6C /* juce_mac_Threads.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_Threads.mm; path = ../../src/native/mac/juce_mac_Threads.mm; sourceTree = SOURCE_ROOT; }; + 8484E9BD103C9595008B7C6C /* juce_mac_WebBrowserComponent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_WebBrowserComponent.mm; path = ../../src/native/mac/juce_mac_WebBrowserComponent.mm; sourceTree = SOURCE_ROOT; }; + 8484E9D6103C95A6008B7C6C /* juce_posix_SharedCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_posix_SharedCode.h; path = ../../src/native/common/juce_posix_SharedCode.h; sourceTree = SOURCE_ROOT; }; + 8484E9D7103C95A6008B7C6C /* juce_posix_NamedPipe.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = juce_posix_NamedPipe.cpp; path = ../../src/native/common/juce_posix_NamedPipe.cpp; sourceTree = SOURCE_ROOT; }; 848A560D0DDDD3FB0041C706 /* juce_WebBrowserComponent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = juce_WebBrowserComponent.h; sourceTree = ""; }; 8495BB880D8067B2001D9C0B /* juce_AudioThumbnail.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = juce_AudioThumbnail.cpp; sourceTree = ""; }; 8495BB890D8067B2001D9C0B /* juce_AudioThumbnail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = juce_AudioThumbnail.h; sourceTree = ""; }; @@ -1082,30 +1107,8 @@ 84CA4AFA0E9BF9EC004CCC0E /* juce_VSTPluginFormat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = juce_VSTPluginFormat.cpp; sourceTree = ""; }; 84D296BB09B763190026C535 /* juce_PropertiesFile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = juce_PropertiesFile.cpp; sourceTree = ""; }; 84D296BC09B763190026C535 /* juce_PropertiesFile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = juce_PropertiesFile.h; sourceTree = ""; }; - 84E024DB0E94028C003E41AF /* juce_mac_AppleRemote.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = juce_mac_AppleRemote.mm; sourceTree = ""; }; - 84E024DC0E94028C003E41AF /* juce_mac_AudioCDBurner.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = juce_mac_AudioCDBurner.mm; sourceTree = ""; }; - 84E024DD0E94028C003E41AF /* juce_mac_CoreAudio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 2; path = juce_mac_CoreAudio.cpp; sourceTree = ""; }; - 84E024DE0E94028C003E41AF /* juce_mac_CoreMidi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = juce_mac_CoreMidi.cpp; sourceTree = ""; }; - 84E024DF0E94028C003E41AF /* juce_mac_FileChooser.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = juce_mac_FileChooser.mm; sourceTree = ""; }; - 84E024E00E94028C003E41AF /* juce_mac_Files.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = juce_mac_Files.mm; sourceTree = ""; }; - 84E024E10E94028C003E41AF /* juce_mac_Fonts.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 2; path = juce_mac_Fonts.mm; sourceTree = ""; }; - 84E024E20E94028C003E41AF /* juce_mac_MainMenu.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = juce_mac_MainMenu.mm; sourceTree = ""; }; - 84E024E30E94028C003E41AF /* juce_mac_MessageManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 2; path = juce_mac_MessageManager.mm; sourceTree = ""; }; - 84E024E40E94028C003E41AF /* juce_mac_MouseCursor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 2; path = juce_mac_MouseCursor.mm; sourceTree = ""; }; - 84E024E50E94028C003E41AF /* juce_mac_NamedPipe.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = juce_mac_NamedPipe.cpp; sourceTree = ""; }; - 84E024E60E94028C003E41AF /* juce_mac_NativeCode.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = juce_mac_NativeCode.mm; sourceTree = ""; }; - 84E024E80E94028C003E41AF /* juce_mac_Network.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 2; path = juce_mac_Network.mm; sourceTree = ""; }; - 84E024E90E94028C003E41AF /* juce_mac_NSViewComponent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = juce_mac_NSViewComponent.mm; sourceTree = ""; }; - 84E024EA0E94028C003E41AF /* juce_mac_NSViewComponentPeer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 2; path = juce_mac_NSViewComponentPeer.mm; sourceTree = ""; }; - 84E024EB0E94028C003E41AF /* juce_mac_OpenGLComponent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 2; path = juce_mac_OpenGLComponent.mm; sourceTree = ""; }; - 84E024EC0E94028C003E41AF /* juce_mac_QuickTimeMovieComponent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = juce_mac_QuickTimeMovieComponent.mm; sourceTree = ""; }; - 84E024ED0E94028C003E41AF /* juce_mac_SystemStats.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = juce_mac_SystemStats.mm; sourceTree = ""; }; - 84E024EE0E94028C003E41AF /* juce_mac_Threads.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = juce_mac_Threads.mm; sourceTree = ""; }; - 84E024EF0E94028C003E41AF /* juce_mac_WebBrowserComponent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = juce_mac_WebBrowserComponent.mm; sourceTree = ""; }; - 84E024F00E94028C003E41AF /* juce_posix_SharedCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = juce_posix_SharedCode.h; sourceTree = ""; }; 84E8209209729D2A0097675B /* juce_AudioFormatManager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = juce_AudioFormatManager.cpp; sourceTree = ""; }; 84E8209309729D2A0097675B /* juce_AudioFormatManager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = juce_AudioFormatManager.h; sourceTree = ""; }; - 84EE00FC0FF22E660093FACA /* juce_mac_CameraDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = juce_mac_CameraDevice.mm; sourceTree = ""; }; 84EE01040FF235750093FACA /* juce_CameraDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = juce_CameraDevice.h; sourceTree = ""; }; 84F1B8D809499F1400AD8EDE /* juce_MidiKeyboardComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = juce_MidiKeyboardComponent.cpp; sourceTree = ""; }; 84F1B8D909499F1400AD8EDE /* juce_MidiKeyboardComponent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = juce_MidiKeyboardComponent.h; sourceTree = ""; }; @@ -1153,7 +1156,6 @@ 84F7A7C00A8383E000D36246 /* juce_MultiTimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = juce_MultiTimer.h; sourceTree = ""; }; 84F7A7ED0A838CC900D36246 /* juce_ComponentAnimator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = juce_ComponentAnimator.cpp; sourceTree = ""; }; 84F7A7EE0A838CC900D36246 /* juce_ComponentAnimator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = juce_ComponentAnimator.h; sourceTree = ""; }; - 84F8B60C0EB5B9230020D98D /* juce_mac_NativeIncludes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = juce_mac_NativeIncludes.h; sourceTree = ""; }; 84F8DACE099C963A00E911ED /* juce_ComponentPeer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = juce_ComponentPeer.cpp; sourceTree = ""; }; 84F8DACF099C963A00E911ED /* juce_ComponentPeer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = juce_ComponentPeer.h; sourceTree = ""; }; 84FC318709B749FD00B75141 /* juce_FileBasedDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = juce_FileBasedDocument.cpp; path = documents/juce_FileBasedDocument.cpp; sourceTree = ""; }; @@ -1351,32 +1353,33 @@ 84A4881C08A22E2400752A2B /* mac specific code */ = { isa = PBXGroup; children = ( - 84E024DB0E94028C003E41AF /* juce_mac_AppleRemote.mm */, - 84E024DC0E94028C003E41AF /* juce_mac_AudioCDBurner.mm */, - 84EE00FC0FF22E660093FACA /* juce_mac_CameraDevice.mm */, - 84E024DD0E94028C003E41AF /* juce_mac_CoreAudio.cpp */, - 84E024DE0E94028C003E41AF /* juce_mac_CoreMidi.cpp */, - 8435DA410E95527D008FBD1C /* juce_mac_Debugging.mm */, - 84E024DF0E94028C003E41AF /* juce_mac_FileChooser.mm */, - 84E024E00E94028C003E41AF /* juce_mac_Files.mm */, - 84E024E10E94028C003E41AF /* juce_mac_Fonts.mm */, - 84E024E20E94028C003E41AF /* juce_mac_MainMenu.mm */, - 84E024E30E94028C003E41AF /* juce_mac_MessageManager.mm */, - 8435D9640E940A3E008FBD1C /* juce_mac_MiscUtilities.mm */, - 84E024E40E94028C003E41AF /* juce_mac_MouseCursor.mm */, - 84E024E50E94028C003E41AF /* juce_mac_NamedPipe.cpp */, - 84E024E60E94028C003E41AF /* juce_mac_NativeCode.mm */, - 84F8B60C0EB5B9230020D98D /* juce_mac_NativeIncludes.h */, - 84E024E80E94028C003E41AF /* juce_mac_Network.mm */, - 84E024E90E94028C003E41AF /* juce_mac_NSViewComponent.mm */, - 84E024EA0E94028C003E41AF /* juce_mac_NSViewComponentPeer.mm */, - 84E024EB0E94028C003E41AF /* juce_mac_OpenGLComponent.mm */, - 84E024EC0E94028C003E41AF /* juce_mac_QuickTimeMovieComponent.mm */, - 8435D90C0E9406D2008FBD1C /* juce_mac_Strings.mm */, - 84E024ED0E94028C003E41AF /* juce_mac_SystemStats.mm */, - 84E024EE0E94028C003E41AF /* juce_mac_Threads.mm */, - 84E024EF0E94028C003E41AF /* juce_mac_WebBrowserComponent.mm */, - 84E024F00E94028C003E41AF /* juce_posix_SharedCode.h */, + 8484E9A4103C958A008B7C6C /* juce_mac_NativeCode.mm */, + 8484E9A6103C9595008B7C6C /* juce_mac_AppleRemote.mm */, + 8484E9A7103C9595008B7C6C /* juce_mac_AudioCDBurner.mm */, + 8484E9A8103C9595008B7C6C /* juce_mac_CameraDevice.mm */, + 8484E9A9103C9595008B7C6C /* juce_mac_CarbonViewWrapperComponent.h */, + 8484E9AA103C9595008B7C6C /* juce_mac_CoreAudio.cpp */, + 8484E9AB103C9595008B7C6C /* juce_mac_CoreMidi.cpp */, + 8484E9AC103C9595008B7C6C /* juce_mac_Debugging.mm */, + 8484E9AD103C9595008B7C6C /* juce_mac_FileChooser.mm */, + 8484E9AE103C9595008B7C6C /* juce_mac_Files.mm */, + 8484E9AF103C9595008B7C6C /* juce_mac_Fonts.mm */, + 8484E9B0103C9595008B7C6C /* juce_mac_MainMenu.mm */, + 8484E9B1103C9595008B7C6C /* juce_mac_MessageManager.mm */, + 8484E9B2103C9595008B7C6C /* juce_mac_MiscUtilities.mm */, + 8484E9B3103C9595008B7C6C /* juce_mac_MouseCursor.mm */, + 8484E9B4103C9595008B7C6C /* juce_mac_NativeIncludes.h */, + 8484E9B5103C9595008B7C6C /* juce_mac_Network.mm */, + 8484E9B6103C9595008B7C6C /* juce_mac_NSViewComponent.mm */, + 8484E9B7103C9595008B7C6C /* juce_mac_NSViewComponentPeer.mm */, + 8484E9B8103C9595008B7C6C /* juce_mac_OpenGLComponent.mm */, + 8484E9B9103C9595008B7C6C /* juce_mac_QuickTimeMovieComponent.mm */, + 8484E9BA103C9595008B7C6C /* juce_mac_Strings.mm */, + 8484E9BB103C9595008B7C6C /* juce_mac_SystemStats.mm */, + 8484E9BC103C9595008B7C6C /* juce_mac_Threads.mm */, + 8484E9BD103C9595008B7C6C /* juce_mac_WebBrowserComponent.mm */, + 8484E9D6103C95A6008B7C6C /* juce_posix_SharedCode.h */, + 8484E9D7103C95A6008B7C6C /* juce_posix_NamedPipe.cpp */, ); name = "mac specific code"; path = platform_specific_code; @@ -2560,11 +2563,12 @@ 84688AFC0DED58820077FDEA /* juce_AudioProcessorGraph.h in Headers */, 84688AFE0DED58820077FDEA /* juce_AudioProcessorPlayer.h in Headers */, 8457783E0E8947C8006D9E4E /* juce_NSViewComponent.h in Headers */, - 84E025060E94028C003E41AF /* juce_posix_SharedCode.h in Headers */, - 84F8B60D0EB5B9230020D98D /* juce_mac_NativeIncludes.h in Headers */, 84B1C1330F6287E70068E14F /* juce_CallbackMessage.h in Headers */, 849C0A9E0F98AF62001C1494 /* juce_Variant.h in Headers */, 84EE01050FF235750093FACA /* juce_CameraDevice.h in Headers */, + 8484E9C1103C9595008B7C6C /* juce_mac_CarbonViewWrapperComponent.h in Headers */, + 8484E9CC103C9595008B7C6C /* juce_mac_NativeIncludes.h in Headers */, + 8484E9D8103C95A6008B7C6C /* juce_posix_SharedCode.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2860,32 +2864,32 @@ 84581EEA0D9148C500AE1A4C /* juce_QuickTimeAudioFormat.cpp in Sources */, 84688AFB0DED58820077FDEA /* juce_AudioProcessorGraph.cpp in Sources */, 84688AFD0DED58820077FDEA /* juce_AudioProcessorPlayer.cpp in Sources */, - 84E024F10E94028C003E41AF /* juce_mac_AppleRemote.mm in Sources */, - 84E024F20E94028C003E41AF /* juce_mac_AudioCDBurner.mm in Sources */, - 84E024F30E94028C003E41AF /* juce_mac_CoreAudio.cpp in Sources */, - 84E024F40E94028C003E41AF /* juce_mac_CoreMidi.cpp in Sources */, - 84E024F50E94028C003E41AF /* juce_mac_FileChooser.mm in Sources */, - 84E024F60E94028C003E41AF /* juce_mac_Files.mm in Sources */, - 84E024F70E94028C003E41AF /* juce_mac_Fonts.mm in Sources */, - 84E024F80E94028C003E41AF /* juce_mac_MainMenu.mm in Sources */, - 84E024F90E94028C003E41AF /* juce_mac_MessageManager.mm in Sources */, - 84E024FA0E94028C003E41AF /* juce_mac_MouseCursor.mm in Sources */, - 84E024FB0E94028C003E41AF /* juce_mac_NamedPipe.cpp in Sources */, - 84E024FC0E94028C003E41AF /* juce_mac_NativeCode.mm in Sources */, - 84E024FE0E94028C003E41AF /* juce_mac_Network.mm in Sources */, - 84E024FF0E94028C003E41AF /* juce_mac_NSViewComponent.mm in Sources */, - 84E025000E94028C003E41AF /* juce_mac_NSViewComponentPeer.mm in Sources */, - 84E025010E94028C003E41AF /* juce_mac_OpenGLComponent.mm in Sources */, - 84E025020E94028C003E41AF /* juce_mac_QuickTimeMovieComponent.mm in Sources */, - 84E025030E94028C003E41AF /* juce_mac_SystemStats.mm in Sources */, - 84E025040E94028C003E41AF /* juce_mac_Threads.mm in Sources */, - 84E025050E94028C003E41AF /* juce_mac_WebBrowserComponent.mm in Sources */, - 8435D90D0E9406D2008FBD1C /* juce_mac_Strings.mm in Sources */, - 8435D9650E940A3E008FBD1C /* juce_mac_MiscUtilities.mm in Sources */, - 8435DA420E95527D008FBD1C /* juce_mac_Debugging.mm in Sources */, 84CA4AF40E9BF8B6004CCC0E /* juce_VSTPluginFormat.mm in Sources */, 849C0A9F0F98AF62001C1494 /* juce_Variant.cpp in Sources */, - 84EE00FD0FF22E660093FACA /* juce_mac_CameraDevice.mm in Sources */, + 8484E9A5103C958A008B7C6C /* juce_mac_NativeCode.mm in Sources */, + 8484E9BE103C9595008B7C6C /* juce_mac_AppleRemote.mm in Sources */, + 8484E9BF103C9595008B7C6C /* juce_mac_AudioCDBurner.mm in Sources */, + 8484E9C0103C9595008B7C6C /* juce_mac_CameraDevice.mm in Sources */, + 8484E9C2103C9595008B7C6C /* juce_mac_CoreAudio.cpp in Sources */, + 8484E9C3103C9595008B7C6C /* juce_mac_CoreMidi.cpp in Sources */, + 8484E9C4103C9595008B7C6C /* juce_mac_Debugging.mm in Sources */, + 8484E9C5103C9595008B7C6C /* juce_mac_FileChooser.mm in Sources */, + 8484E9C6103C9595008B7C6C /* juce_mac_Files.mm in Sources */, + 8484E9C7103C9595008B7C6C /* juce_mac_Fonts.mm in Sources */, + 8484E9C8103C9595008B7C6C /* juce_mac_MainMenu.mm in Sources */, + 8484E9C9103C9595008B7C6C /* juce_mac_MessageManager.mm in Sources */, + 8484E9CA103C9595008B7C6C /* juce_mac_MiscUtilities.mm in Sources */, + 8484E9CB103C9595008B7C6C /* juce_mac_MouseCursor.mm in Sources */, + 8484E9CD103C9595008B7C6C /* juce_mac_Network.mm in Sources */, + 8484E9CE103C9595008B7C6C /* juce_mac_NSViewComponent.mm in Sources */, + 8484E9CF103C9595008B7C6C /* juce_mac_NSViewComponentPeer.mm in Sources */, + 8484E9D0103C9595008B7C6C /* juce_mac_OpenGLComponent.mm in Sources */, + 8484E9D1103C9595008B7C6C /* juce_mac_QuickTimeMovieComponent.mm in Sources */, + 8484E9D2103C9595008B7C6C /* juce_mac_Strings.mm in Sources */, + 8484E9D3103C9595008B7C6C /* juce_mac_SystemStats.mm in Sources */, + 8484E9D4103C9595008B7C6C /* juce_mac_Threads.mm in Sources */, + 8484E9D5103C9595008B7C6C /* juce_mac_WebBrowserComponent.mm in Sources */, + 8484E9D9103C95A6008B7C6C /* juce_posix_NamedPipe.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/build/macosx/platform_specific_code/juce_mac_NativeCode.mm b/build/macosx/platform_specific_code/juce_mac_NativeCode.mm deleted file mode 100644 index 7a69457bee..0000000000 --- a/build/macosx/platform_specific_code/juce_mac_NativeCode.mm +++ /dev/null @@ -1,131 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library - "Jules' Utility Class Extensions" - Copyright 2004-9 by Raw Material Software Ltd. - - ------------------------------------------------------------------------------ - - JUCE can be redistributed and/or modified under the terms of the GNU General - Public License (Version 2), as published by the Free Software Foundation. - A copy of the license is included in the JUCE distribution, or can be found - online at www.gnu.org/licenses. - - 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. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.rawmaterialsoftware.com/juce for more information. - - ============================================================================== -*/ - -/* - This file wraps together all the mac-specific code, so that - we can include all the native headers just once, and compile all our - platform-specific stuff in one big lump, keeping it out of the way of - the rest of the codebase. -*/ - -#include "juce_mac_NativeIncludes.h" - -BEGIN_JUCE_NAMESPACE - -//============================================================================== -#include "../../../src/juce_core/basics/juce_Singleton.h" -#include "../../../src/juce_core/basics/juce_Random.h" -#include "../../../src/juce_core/basics/juce_SystemStats.h" -#include "../../../src/juce_core/threads/juce_Process.h" -#include "../../../src/juce_core/threads/juce_Thread.h" -#include "../../../src/juce_core/threads/juce_InterProcessLock.h" -#include "../../../src/juce_core/io/files/juce_FileInputStream.h" -#include "../../../src/juce_core/io/files/juce_NamedPipe.h" -#include "../../../src/juce_core/io/network/juce_URL.h" -#include "../../../src/juce_core/misc/juce_PlatformUtilities.h" -#include "../../../src/juce_core/text/juce_LocalisedStrings.h" -#include "../../../src/juce_appframework/application/juce_DeletedAtShutdown.h" -#include "../../../src/juce_appframework/application/juce_Application.h" -#include "../../../src/juce_appframework/application/juce_SystemClipboard.h" -#include "../../../src/juce_appframework/events/juce_MessageManager.h" -#include "../../../src/juce_appframework/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h" -#include "../../../src/juce_appframework/gui/graphics/imaging/juce_ImageFileFormat.h" -#include "../../../src/juce_appframework/gui/graphics/imaging/juce_CameraDevice.h" -#include "../../../src/juce_appframework/gui/components/windows/juce_AlertWindow.h" -#include "../../../src/juce_appframework/gui/components/juce_Desktop.h" -#include "../../../src/juce_appframework/gui/components/menus/juce_MenuBarModel.h" -#include "../../../src/juce_appframework/gui/components/special/juce_OpenGLComponent.h" -#include "../../../src/juce_appframework/gui/components/special/juce_QuickTimeMovieComponent.h" -#include "../../../src/juce_appframework/gui/components/mouse/juce_DragAndDropContainer.h" -#include "../../../src/juce_appframework/gui/components/keyboard/juce_KeyPressMappingSet.h" -#include "../../../src/juce_appframework/gui/components/special/juce_NSViewComponent.h" -#include "../../../src/juce_appframework/gui/components/layout/juce_ComponentMovementWatcher.h" -#include "../../../src/juce_appframework/gui/components/special/juce_WebBrowserComponent.h" -#include "../../../src/juce_appframework/gui/components/filebrowser/juce_FileChooser.h" -#include "../../../src/juce_appframework/audio/audio_file_formats/juce_AudioCDBurner.h" -#include "../../../src/juce_appframework/audio/audio_file_formats/juce_AudioCDReader.h" -#include "../../../src/juce_appframework/audio/audio_sources/juce_AudioSource.h" -#include "../../../src/juce_appframework/audio/dsp/juce_AudioDataConverters.h" -#include "../../../src/juce_appframework/audio/devices/juce_AudioIODeviceType.h" -#include "../../../src/juce_appframework/audio/devices/juce_MidiOutput.h" -#include "../../../src/juce_appframework/audio/devices/juce_MidiInput.h" -#undef Point - -//============================================================================== -/** This suffix is used for naming all Obj-C classes that are used inside juce. - - Because of the flat naming structure used by Obj-C, you can get horrible situations where - two DLLs are loaded into a host, each of which uses classes with the same names, and these get - cross-linked so that when you make a call to a class that you thought was private, it ends up - actually calling into a similarly named class in the other module's address space. - - By changing this macro to a unique value, you ensure that all the obj-C classes in your app - have unique names, and should avoid this problem. - - If you're using the amalgamated version, you can just set this macro to something unique before - you include juce_amalgamated.cpp. -*/ -#ifndef JUCE_ObjCExtraSuffix - #define JUCE_ObjCExtraSuffix 3 -#endif - -#define appendMacro1(a, b, c, d) a ## _ ## b ## _ ## c ## _ ## d -#define appendMacro2(a, b, c, d) appendMacro1(a, b, c, d) -#define MakeObjCClassName(rootName) appendMacro2 (rootName, JUCE_MAJOR_VERSION, JUCE_MINOR_VERSION, JUCE_ObjCExtraSuffix) - -//============================================================================== -#define JUCE_INCLUDED_FILE 1 - -// Now include the actual code files.. - -#include "juce_mac_Strings.mm" -#include "juce_mac_SystemStats.mm" -#include "juce_mac_Network.mm" -#include "juce_mac_NamedPipe.cpp" -#include "juce_mac_Threads.mm" -#include "juce_posix_SharedCode.h" -#include "juce_mac_Files.mm" -#include "juce_mac_MiscUtilities.mm" -#include "juce_mac_Debugging.mm" - -#if ! JUCE_ONLY_BUILD_CORE_LIBRARY -#include "juce_mac_NSViewComponentPeer.mm" -#include "juce_mac_MouseCursor.mm" -#include "juce_mac_NSViewComponent.mm" -#include "juce_mac_AppleRemote.mm" -#include "juce_mac_OpenGLComponent.mm" -#include "juce_mac_MainMenu.mm" -#include "juce_mac_FileChooser.mm" -#include "juce_mac_QuickTimeMovieComponent.mm" -#include "juce_mac_AudioCDBurner.mm" -#include "juce_mac_Fonts.mm" -#include "juce_mac_MessageManager.mm" -#include "juce_mac_WebBrowserComponent.mm" -#include "juce_mac_CoreAudio.cpp" -#include "juce_mac_CoreMidi.cpp" -#include "juce_mac_CameraDevice.mm" -#endif - -END_JUCE_NAMESPACE diff --git a/build/macosx/platform_specific_code/juce_mac_NativeHeaders.h b/build/macosx/platform_specific_code/juce_mac_NativeHeaders.h deleted file mode 100644 index 8a24ef1b55..0000000000 --- a/build/macosx/platform_specific_code/juce_mac_NativeHeaders.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library - "Jules' Utility Class Extensions" - Copyright 2004-9 by Raw Material Software Ltd. - - ------------------------------------------------------------------------------ - - JUCE can be redistributed and/or modified under the terms of the GNU General - Public License (Version 2), as published by the Free Software Foundation. - A copy of the license is included in the JUCE distribution, or can be found - online at www.gnu.org/licenses. - - 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. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.rawmaterialsoftware.com/juce for more information. - - ============================================================================== -*/ - -#ifndef __JUCE_MAC_NATIVEHEADERS_JUCEHEADER__ -#define __JUCE_MAC_NATIVEHEADERS_JUCEHEADER__ - -#include "../../../src/juce_core/basics/juce_StandardHeader.h" - -#include - - -//============================================================================== -BEGIN_JUCE_NAMESPACE - -class AutoPool -{ -public: - AutoPool() { pool = [[NSAutoreleasePool alloc] init]; } - ~AutoPool() { [pool release]; } - -private: - NSAutoreleasePool* pool; -}; - -END_JUCE_NAMESPACE - -//============================================================================== -static const JUCE_NAMESPACE::String nsStringToJuce (NSString* s) -{ - return JUCE_NAMESPACE::String::fromUTF8 ((JUCE_NAMESPACE::uint8*) [s UTF8String]); -} - -static NSString* juceStringToNS (const JUCE_NAMESPACE::String& s) -{ - return [NSString stringWithUTF8String: (const char*) s.toUTF8()]; -} - - -#endif // __JUCE_MAC_NATIVEHEADERS_JUCEHEADER__ diff --git a/build/win32/platform_specific_code/juce_win32_NativeCode.cpp b/build/win32/platform_specific_code/juce_win32_NativeCode.cpp deleted file mode 100644 index 9c7cb93825..0000000000 --- a/build/win32/platform_specific_code/juce_win32_NativeCode.cpp +++ /dev/null @@ -1,118 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library - "Jules' Utility Class Extensions" - Copyright 2004-9 by Raw Material Software Ltd. - - ------------------------------------------------------------------------------ - - JUCE can be redistributed and/or modified under the terms of the GNU General - Public License (Version 2), as published by the Free Software Foundation. - A copy of the license is included in the JUCE distribution, or can be found - online at www.gnu.org/licenses. - - 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. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.rawmaterialsoftware.com/juce for more information. - - ============================================================================== -*/ - -//============================================================================== -/* - This file wraps together all the win32-specific code, so that - we can include all the native headers just once, and compile all our - platform-specific stuff in one big lump, keeping it out of the way of - the rest of the codebase. -*/ - -//============================================================================== -#include "juce_win32_NativeIncludes.h" - -#include "../../../src/juce_core/basics/juce_StandardHeader.h" - -BEGIN_JUCE_NAMESPACE - -//============================================================================== -#include "../../../src/juce_core/basics/juce_Singleton.h" -#include "../../../src/juce_core/basics/juce_Random.h" -#include "../../../src/juce_core/basics/juce_SystemStats.h" -#include "../../../src/juce_core/threads/juce_Process.h" -#include "../../../src/juce_core/threads/juce_Thread.h" -#include "../../../src/juce_core/threads/juce_InterProcessLock.h" -#include "../../../src/juce_core/io/files/juce_FileInputStream.h" -#include "../../../src/juce_core/io/files/juce_NamedPipe.h" -#include "../../../src/juce_core/io/network/juce_URL.h" -#include "../../../src/juce_core/misc/juce_PlatformUtilities.h" -#include "../../../src/juce_core/text/juce_LocalisedStrings.h" -#include "../../../src/juce_appframework/application/juce_DeletedAtShutdown.h" -#include "../../../src/juce_appframework/application/juce_Application.h" -#include "../../../src/juce_appframework/application/juce_SystemClipboard.h" -#include "../../../src/juce_appframework/events/juce_MessageManager.h" -#include "../../../src/juce_appframework/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h" -#include "../../../src/juce_appframework/gui/graphics/imaging/juce_ImageFileFormat.h" -#include "../../../src/juce_appframework/gui/graphics/imaging/juce_CameraDevice.h" -#include "../../../src/juce_appframework/gui/components/windows/juce_AlertWindow.h" -#include "../../../src/juce_appframework/gui/components/juce_Desktop.h" -#include "../../../src/juce_appframework/gui/components/menus/juce_MenuBarModel.h" -#include "../../../src/juce_appframework/gui/components/special/juce_OpenGLComponent.h" -#include "../../../src/juce_appframework/gui/components/special/juce_QuickTimeMovieComponent.h" -#include "../../../src/juce_appframework/gui/components/mouse/juce_DragAndDropContainer.h" -#include "../../../src/juce_appframework/gui/components/keyboard/juce_KeyPressMappingSet.h" -#include "../../../src/juce_appframework/gui/components/layout/juce_ComponentMovementWatcher.h" -#include "../../../src/juce_appframework/gui/components/special/juce_ActiveXControlComponent.h" -#include "../../../src/juce_appframework/gui/components/special/juce_WebBrowserComponent.h" -#include "../../../src/juce_appframework/gui/components/special/juce_DropShadower.h" -#include "../../../src/juce_appframework/gui/components/special/juce_SystemTrayIconComponent.h" -#include "../../../src/juce_appframework/gui/components/filebrowser/juce_FileChooser.h" -#include "../../../src/juce_appframework/gui/components/lookandfeel/juce_LookAndFeel.h" -#include "../../../src/juce_appframework/audio/audio_file_formats/juce_AudioCDBurner.h" -#include "../../../src/juce_appframework/audio/audio_file_formats/juce_AudioCDReader.h" -#include "../../../src/juce_appframework/audio/audio_sources/juce_AudioSource.h" -#include "../../../src/juce_appframework/audio/dsp/juce_AudioDataConverters.h" -#include "../../../src/juce_appframework/audio/devices/juce_AudioIODeviceType.h" -#include "../../../src/juce_appframework/audio/devices/juce_MidiOutput.h" -#include "../../../src/juce_appframework/audio/devices/juce_MidiInput.h" - - -//============================================================================== -#define JUCE_INCLUDED_FILE 1 - -// Now include the actual code files.. -#include "juce_win32_DynamicLibraryLoader.cpp" -#include "juce_win32_SystemStats.cpp" -#include "juce_win32_Threads.cpp" -#include "juce_win32_Files.cpp" -#include "juce_win32_Network.cpp" -#include "juce_win32_PlatformUtils.cpp" - -#if ! JUCE_ONLY_BUILD_CORE_LIBRARY - #include "juce_win32_Messaging.cpp" - #include "juce_win32_Windowing.cpp" - #include "juce_win32_Fonts.cpp" - #include "juce_win32_FileChooser.cpp" - #include "juce_win32_Misc.cpp" - #include "juce_win32_ActiveXComponent.cpp" - #include "juce_win32_QuickTimeMovieComponent.cpp" - #include "juce_win32_WebBrowserComponent.cpp" - #include "juce_win32_OpenGLComponent.cpp" - #include "juce_win32_AudioCDReader.cpp" - #include "juce_win32_Midi.cpp" - #include "juce_win32_ASIO.cpp" - #include "juce_win32_DirectSound.cpp" - #include "juce_win32_CameraDevice.cpp" -#endif - -//============================================================================== -// Auto-link the other win32 libs that are needed by library calls.. -#if defined (JUCE_DLL_BUILD) && JUCE_MSVC - #include "juce_win32_AutoLinkLibraries.h" -#endif - - -END_JUCE_NAMESPACE diff --git a/build/win32/vc6/JUCE.dsp b/build/win32/vc6/JUCE.dsp index c717b7ace3..1147e4ae59 100644 --- a/build/win32/vc6/JUCE.dsp +++ b/build/win32/vc6/JUCE.dsp @@ -2489,87 +2489,87 @@ SOURCE=..\..\..\src\juce_core\cryptography\juce_RSAKey.h # PROP Default_Filter "" # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_ActiveXComponent.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_ActiveXComponent.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_ASIO.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_ASIO.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_AudioCDReader.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_AudioCDReader.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_DirectSound.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_DirectSound.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_DynamicLibraryLoader.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_DynamicLibraryLoader.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_FileChooser.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_FileChooser.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_Files.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_Files.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_Fonts.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_Fonts.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_Messaging.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_Messaging.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_Midi.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_Midi.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_Misc.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_Misc.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_NativeCode.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_NativeCode.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_Network.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_Network.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_OpenGLComponent.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_OpenGLComponent.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_PlatformUtils.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_PlatformUtils.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_QuickTimeMovieComponent.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_QuickTimeMovieComponent.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_SystemStats.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_SystemStats.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_Threads.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_Threads.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_WebBrowserComponent.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_WebBrowserComponent.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\juce_win32_Windowing.cpp +SOURCE=..\..\..\src\native\windows\juce_win32_Windowing.cpp # End Source File # Begin Source File -SOURCE=..\platform_specific_code\win32_headers.h +SOURCE=..\..\..\src\native\windows\win32_headers.h # End Source File # End Group # Begin Source File diff --git a/build/win32/vc8/JUCE.vcproj b/build/win32/vc8/JUCE.vcproj index 40bedb80a1..84205be32b 100644 --- a/build/win32/vc8/JUCE.vcproj +++ b/build/win32/vc8/JUCE.vcproj @@ -5679,99 +5679,99 @@ Name="win32_code" > diff --git a/extras/juce demo/build/linux/JuceDemo.make b/extras/juce demo/build/linux/JuceDemo.make index 61f547e33d..d4f7d12c9d 100644 --- a/extras/juce demo/build/linux/JuceDemo.make +++ b/extras/juce demo/build/linux/JuceDemo.make @@ -43,13 +43,13 @@ OBJECTS := \ $(OBJDIR)/BinaryData.o \ $(OBJDIR)/juce_LibrarySource.o \ $(OBJDIR)/MainDemoWindow.o \ + $(OBJDIR)/PathsAndTransformsDemo.o \ $(OBJDIR)/WidgetsDemo.o \ $(OBJDIR)/ThreadingDemo.o \ $(OBJDIR)/TreeViewDemo.o \ $(OBJDIR)/QuickTimeDemo.o \ $(OBJDIR)/TableDemo.o \ $(OBJDIR)/OpenGLDemo.o \ - $(OBJDIR)/PathsAndTransformsDemo.o \ $(OBJDIR)/FontsAndTextDemo.o \ $(OBJDIR)/InterprocessCommsDemo.o \ $(OBJDIR)/DragAndDropDemo.o \ @@ -117,6 +117,11 @@ $(OBJDIR)/MainDemoWindow.o: ../../src/MainDemoWindow.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/PathsAndTransformsDemo.o: ../../src/demos/PathsAndTransformsDemo.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/WidgetsDemo.o: ../../src/demos/WidgetsDemo.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -147,11 +152,6 @@ $(OBJDIR)/OpenGLDemo.o: ../../src/demos/OpenGLDemo.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/PathsAndTransformsDemo.o: ../../src/demos/PathsAndTransformsDemo.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/FontsAndTextDemo.o: ../../src/demos/FontsAndTextDemo.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) diff --git a/extras/juce demo/src/BinaryData.cpp b/extras/juce demo/src/BinaryData.cpp index 7e56ee4543..4c36ef1229 100644 --- a/extras/juce demo/src/BinaryData.cpp +++ b/extras/juce demo/src/BinaryData.cpp @@ -8267,3 +8267,4 @@ static const unsigned char temp19[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61 109,112,111,110,101,110,116,42,32,99,114,101,97,116,101,67,97,109,101,114,97,68,101,109,111,40,41,13,10,123,13,10,32,32,32,32,114,101,116,117, 114,110,32,110,101,119,32,67,97,109,101,114,97,68,101,109,111,40,41,59,13,10,125,13,10,13,10,35,101,110,100,105,102,13,10,0,0}; const char* BinaryData::camerademo_cpp = (const char*) temp19; + diff --git a/extras/the jucer/src/BinaryData.cpp b/extras/the jucer/src/BinaryData.cpp index 1279f531a8..c08fddd03e 100644 --- a/extras/the jucer/src/BinaryData.cpp +++ b/extras/the jucer/src/BinaryData.cpp @@ -911,3 +911,4 @@ static const unsigned char temp4[] = {137,80,78,71,13,10,26,10,0,0,0,13,73,72,68 0,98,28,9,155,95,0,2,104,68,236,11,1,8,160,17,225,73,128,0,3,0,120,52,172,151,198,78,252,63,0,0,0,0,73,69,78,68,174,66, 96,130,0,0}; const char* BinaryData::prefs_misc_png = (const char*) temp4; + diff --git a/juce.h b/juce.h index 638e101558..5161a577f7 100644 --- a/juce.h +++ b/juce.h @@ -152,7 +152,7 @@ END_JUCE_NAMESPACE // Auto-link the other win32 libs that are needed by library calls.. #if ! (defined (DONT_AUTOLINK_TO_WIN32_LIBRARIES) || defined (JUCE_DLL)) - #include "build/win32/platform_specific_code/juce_win32_AutoLinkLibraries.h" + #include "src/native/windows/juce_win32_AutoLinkLibraries.h" #endif #endif diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index a1b5aeec5e..21c9c5b82b 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -820,6 +820,8 @@ protected: END_JUCE_NAMESPACE #endif +#define JUCE_AMALGAMATED_TEMPLATE 1 + //============================================================================== /********* Start of inlined file: juce_FileLogger.cpp *********/ @@ -7319,7 +7321,7 @@ static int waitForReadiness (const int handle, const bool forReading, { int opt; -#if defined (JUCE_LINUX) || (defined (JUCE_MAC) && ! MACOS_10_2_OR_EARLIER) +#if defined (JUCE_LINUX) || defined (JUCE_MAC) socklen_t len = sizeof (opt); #else int len = sizeof (opt); @@ -7593,7 +7595,7 @@ StreamingSocket* StreamingSocket::waitForNextConnection() const { struct sockaddr address; -#if defined (JUCE_LINUX) || (defined (JUCE_MAC) && ! MACOS_10_2_OR_EARLIER) +#if defined (JUCE_LINUX) || defined (JUCE_MAC) socklen_t len = sizeof (sockaddr); #else int len = sizeof (sockaddr); @@ -7700,7 +7702,7 @@ DatagramSocket* DatagramSocket::waitForNextConnection() const { struct sockaddr address; -#if defined (JUCE_LINUX) || (defined (JUCE_MAC) && ! MACOS_10_2_OR_EARLIER) +#if defined (JUCE_LINUX) || defined (JUCE_MAC) socklen_t len = sizeof (sockaddr); #else int len = sizeof (sockaddr); @@ -9388,15 +9390,7 @@ int CharacterFunctions::length (const char* const s) throw() int CharacterFunctions::length (const juce_wchar* const s) throw() { -#if MACOS_10_2_OR_EARLIER - int n = 0; - while (s[n] != 0) - ++n; - - return n; -#else return (int) wcslen (s); -#endif } void CharacterFunctions::copy (char* dest, const char* src, const int maxChars) throw() @@ -9406,14 +9400,7 @@ void CharacterFunctions::copy (char* dest, const char* src, const int maxChars) void CharacterFunctions::copy (juce_wchar* dest, const juce_wchar* src, int maxChars) throw() { -#if MACOS_10_2_OR_EARLIER - while (--maxChars >= 0 && *src != 0) - *dest++ = *src++; - - *dest = 0; -#else wcsncpy (dest, src, maxChars); -#endif } void CharacterFunctions::copy (juce_wchar* dest, const char* src, const int maxChars) throw() @@ -9438,17 +9425,7 @@ void CharacterFunctions::append (char* dest, const char* src) throw() void CharacterFunctions::append (juce_wchar* dest, const juce_wchar* src) throw() { -#if MACOS_10_2_OR_EARLIER - while (*dest != 0) - ++dest; - - while (*src != 0) - *dest++ = *src++; - - *dest = 0; -#else wcscat (dest, src); -#endif } int CharacterFunctions::compare (const char* const s1, const char* const s2) throw() @@ -9459,57 +9436,19 @@ int CharacterFunctions::compare (const char* const s1, const char* const s2) thr int CharacterFunctions::compare (const juce_wchar* s1, const juce_wchar* s2) throw() { jassert (s1 != 0 && s2 != 0); - -#if MACOS_10_2_OR_EARLIER - for (;;) - { - if (*s1 != *s2) - { - const int diff = *s1 - *s2; - - if (diff != 0) - return diff < 0 ? -1 : 1; - } - else if (*s1 == 0) - break; - - ++s1; - ++s2; - } - - return 0; -#else return wcscmp (s1, s2); -#endif } int CharacterFunctions::compare (const char* const s1, const char* const s2, const int maxChars) throw() { jassert (s1 != 0 && s2 != 0); - return strncmp (s1, s2, maxChars); } int CharacterFunctions::compare (const juce_wchar* s1, const juce_wchar* s2, int maxChars) throw() { jassert (s1 != 0 && s2 != 0); - -#if MACOS_10_2_OR_EARLIER - while (--maxChars >= 0) - { - if (*s1 != *s2) - return (*s1 < *s2) ? -1 : 1; - else if (*s1 == 0) - break; - - ++s1; - ++s2; - } - - return 0; -#else return wcsncmp (s1, s2, maxChars); -#endif } int CharacterFunctions::compareIgnoreCase (const char* const s1, const char* const s2) throw() @@ -9595,31 +9534,7 @@ const char* CharacterFunctions::find (const char* const haystack, const char* co const juce_wchar* CharacterFunctions::find (const juce_wchar* haystack, const juce_wchar* const needle) throw() { -#if MACOS_10_2_OR_EARLIER - while (*haystack != 0) - { - const juce_wchar* s1 = haystack; - const juce_wchar* s2 = needle; - - for (;;) - { - if (*s2 == 0) - return haystack; - - if (*s1 != *s2 || *s2 == 0) - break; - - ++s1; - ++s2; - } - - ++haystack; - } - - return 0; -#else return wcsstr (haystack, needle); -#endif } int CharacterFunctions::indexOfChar (const char* const haystack, const char needle, const bool ignoreCase) throw() @@ -9762,16 +9677,7 @@ int CharacterFunctions::ftime (char* const dest, const int maxChars, const char* int CharacterFunctions::ftime (juce_wchar* const dest, const int maxChars, const juce_wchar* const format, const struct tm* const tm) throw() { -#if MACOS_10_2_OR_EARLIER - const String formatTemp (format); - size_t num = strftime ((char*) dest, maxChars, (const char*) formatTemp, tm); - String temp ((char*) dest); - temp.copyToBuffer (dest, num); - dest [num] = 0; - return (int) num; -#else return (int) wcsftime (dest, maxChars, format, tm); -#endif } int CharacterFunctions::getIntValue (const char* const s) throw() @@ -9872,13 +9778,8 @@ double CharacterFunctions::getDoubleValue (const char* const s) throw() double CharacterFunctions::getDoubleValue (const juce_wchar* const s) throw() { -#if MACOS_10_2_OR_EARLIER - String temp (s); - return atof ((const char*) temp); -#else wchar_t* endChar; return wcstod (s, &endChar); -#endif } char CharacterFunctions::toUpperCase (const char character) throw() @@ -9888,11 +9789,7 @@ char CharacterFunctions::toUpperCase (const char character) throw() juce_wchar CharacterFunctions::toUpperCase (const juce_wchar character) throw() { -#if MACOS_10_2_OR_EARLIER - return toupper ((char) character); -#else return towupper (character); -#endif } void CharacterFunctions::toUpperCase (char* s) throw() @@ -9942,11 +9839,7 @@ char CharacterFunctions::toLowerCase (const char character) throw() juce_wchar CharacterFunctions::toLowerCase (const juce_wchar character) throw() { -#if MACOS_10_2_OR_EARLIER - return tolower ((char) character); -#else return towlower (character); -#endif } void CharacterFunctions::toLowerCase (char* s) throw() @@ -9996,11 +9889,7 @@ bool CharacterFunctions::isWhitespace (const char character) throw() bool CharacterFunctions::isWhitespace (const juce_wchar character) throw() { -#if MACOS_10_2_OR_EARLIER - return isWhitespace ((char) character); -#else return iswspace (character) != 0; -#endif } bool CharacterFunctions::isDigit (const char character) throw() @@ -10010,11 +9899,7 @@ bool CharacterFunctions::isDigit (const char character) throw() bool CharacterFunctions::isDigit (const juce_wchar character) throw() { -#if MACOS_10_2_OR_EARLIER - return isdigit ((char) character) != 0; -#else return iswdigit (character) != 0; -#endif } bool CharacterFunctions::isLetter (const char character) throw() @@ -10025,11 +9910,7 @@ bool CharacterFunctions::isLetter (const char character) throw() bool CharacterFunctions::isLetter (const juce_wchar character) throw() { -#if MACOS_10_2_OR_EARLIER - return isLetter ((char) character); -#else return iswalpha (character) != 0; -#endif } bool CharacterFunctions::isLetterOrDigit (const char character) throw() @@ -10041,11 +9922,7 @@ bool CharacterFunctions::isLetterOrDigit (const char character) throw() bool CharacterFunctions::isLetterOrDigit (const juce_wchar character) throw() { -#if MACOS_10_2_OR_EARLIER - return isLetterOrDigit ((char) character); -#else return iswalnum (character) != 0; -#endif } int CharacterFunctions::getHexDigitValue (const tchar digit) throw() @@ -246366,7 +246243,7 @@ CameraDevice* CameraDevice::openDevice (int index, #endif // Auto-link the other win32 libs that are needed by library calls.. -#if defined (JUCE_DLL_BUILD) && JUCE_MSVC +#if (JUCE_AMALGAMATED_TEMPLATE || defined (JUCE_DLL_BUILD)) && JUCE_MSVC && ! DONT_AUTOLINK_TO_WIN32_LIBRARIES /********* Start of inlined file: juce_win32_AutoLinkLibraries.h *********/ // Auto-links to various win32 libs that are needed by library calls.. @@ -246403,39 +246280,8 @@ CameraDevice* CameraDevice::openDevice (int index, END_JUCE_NAMESPACE /********* End of inlined file: juce_win32_NativeCode.cpp *********/ -/********* Start of inlined file: juce_win32_AutoLinkLibraries.h *********/ -// Auto-links to various win32 libs that are needed by library calls.. -#pragma comment(lib, "kernel32.lib") -#pragma comment(lib, "user32.lib") -#pragma comment(lib, "shell32.lib") -#pragma comment(lib, "gdi32.lib") -#pragma comment(lib, "vfw32.lib") -#pragma comment(lib, "comdlg32.lib") -#pragma comment(lib, "winmm.lib") -#pragma comment(lib, "wininet.lib") -#pragma comment(lib, "ole32.lib") -#pragma comment(lib, "advapi32.lib") -#pragma comment(lib, "ws2_32.lib") -#pragma comment(lib, "comsupp.lib") -#pragma comment(lib, "version.lib") - -#if JUCE_OPENGL - #pragma comment(lib, "OpenGL32.Lib") - #pragma comment(lib, "GlU32.Lib") -#endif - -#if JUCE_QUICKTIME - #pragma comment (lib, "QTMLClient.lib") #endif -#if JUCE_USE_CAMERA - #pragma comment (lib, "Strmiids.lib") -#endif -/********* End of inlined file: juce_win32_AutoLinkLibraries.h *********/ - -#endif - -//============================================================================== #if JUCE_LINUX /********* Start of inlined file: juce_linux_NativeCode.cpp *********/ @@ -247347,7 +247193,7 @@ bool juce_launchFile (const String& fileName, #endif /********* End of inlined file: juce_linux_Files.cpp *********/ -/********* Start of inlined file: juce_mac_NamedPipe.cpp *********/ +/********* Start of inlined file: juce_posix_NamedPipe.cpp *********/ // (This file gets included by juce_mac_NativeCode.mm, rather than being // compiled on its own). #if JUCE_INCLUDED_FILE @@ -247535,7 +247381,7 @@ int NamedPipe::write (const void* sourceBuffer, int numBytesToWrite, int timeOut } #endif -/********* End of inlined file: juce_mac_NamedPipe.cpp *********/ +/********* End of inlined file: juce_posix_NamedPipe.cpp *********/ /********* Start of inlined file: juce_linux_Network.cpp *********/ // (This file gets included by juce_linux_NativeCode.cpp, rather than being @@ -254251,7 +254097,6 @@ END_JUCE_NAMESPACE #endif -//============================================================================== #if JUCE_MAC /********* Start of inlined file: juce_mac_NativeCode.mm *********/ @@ -255118,7 +254963,7 @@ int juce_seekInInternetFile (void* handle, int newPosition) #endif /********* End of inlined file: juce_mac_Network.mm *********/ -/********* Start of inlined file: juce_mac_NamedPipe.cpp *********/ +/********* Start of inlined file: juce_posix_NamedPipe.cpp *********/ // (This file gets included by juce_mac_NativeCode.mm, rather than being // compiled on its own). #if JUCE_INCLUDED_FILE @@ -255306,7 +255151,7 @@ int NamedPipe::write (const void* sourceBuffer, int numBytesToWrite, int timeOut } #endif -/********* End of inlined file: juce_mac_NamedPipe.cpp *********/ +/********* End of inlined file: juce_posix_NamedPipe.cpp *********/ /********* Start of inlined file: juce_mac_Threads.mm *********/ // (This file gets included by juce_mac_NativeCode.mm, rather than being @@ -258653,7 +258498,6 @@ static void appleRemoteQueueCallback (void* const target, const IOReturn result, bool AppleRemoteDevice::open (const bool openInExclusiveMode) throw() { -#if ! MACOS_10_2_OR_EARLIER Array cookies; CFArrayRef elements; @@ -258715,14 +258559,12 @@ bool AppleRemoteDevice::open (const bool openInExclusiveMode) throw() } } } -#endif return false; } void AppleRemoteDevice::handleCallbackInternal() { -#if ! MACOS_10_2_OR_EARLIER int totalValues = 0; AbsoluteTime nullTime = { 0, 0 }; char cookies [12]; @@ -258779,7 +258621,6 @@ void AppleRemoteDevice::handleCallbackInternal() i += strlen (buttonPatterns + i) + 1; ++buttonNum; } -#endif } #endif diff --git a/juce_amalgamated.h b/juce_amalgamated.h index bfed6919f4..1670a7bebc 100644 --- a/juce_amalgamated.h +++ b/juce_amalgamated.h @@ -305,9 +305,6 @@ - Either JUCE_INTEL or JUCE_PPC - Either JUCE_GCC or JUCE_MSVC - On the Mac, it also defines MACOS_10_2_OR_EARLIER if the build is targeting OSX10.2, - and MACOS_10_3_OR_EARLIER if it is targeting either 10.2 or 10.3 - It also includes a set of macros for debug console output and assertions. */ @@ -368,7 +365,7 @@ #endif #if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_3) - #define MACOS_10_2_OR_EARLIER 1 + #error "Building for OSX 10.2 is no longer supported!" #endif #if (! defined (MAC_OS_X_VERSION_10_4)) || (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4) @@ -1008,22 +1005,6 @@ inline void swapVariables (Type& variable1, Type& variable2) throw() /** Using juce_hypot and juce_hypotf is easier than dealing with all the different versions of these functions of various platforms and compilers. */ forcedinline float juce_hypotf (float a, float b) { return (float) _hypot (a, b); } -#elif MACOS_10_2_OR_EARLIER - /** Using juce_hypot and juce_hypotf is easier than dealing with all the different - versions of these functions of various platforms and compilers. */ - forcedinline double juce_hypot (double a, double b) { return hypot (a, b); } - - /** Using juce_hypot and juce_hypotf is easier than dealing with all the different - versions of these functions of various platforms and compilers. */ - forcedinline float juce_hypotf (float a, float b) { return (float) hypot (a, b); } - forcedinline float sinf (const float a) { return (float) sin (a); } - forcedinline float cosf (const float a) { return (float) cos (a); } - forcedinline float tanf (const float a) { return (float) tan (a); } - forcedinline float atan2f (const float a, const float b) { return (float) atan2 (a, b); } - forcedinline float sqrtf (const float a) { return (float) sqrt (a); } - forcedinline float logf (const float a) { return (float) log (a); } - forcedinline float powf (const float a, const float b) { return (float) pow (a, b); } - forcedinline float expf (const float a) { return (float) exp (a); } #else /** Using juce_hypot and juce_hypotf is easier than dealing with all the different versions of these functions of various platforms and compilers. */ @@ -1054,9 +1035,7 @@ const float float_Pi = 3.14159265358979323846f; #if JUCE_LINUX #define juce_isfinite(v) std::isfinite(v) #elif JUCE_MAC - #if MACOS_10_2_OR_EARLIER - #define juce_isfinite(v) __isfinite(v) - #elif MACOS_10_3_OR_EARLIER + #if MACOS_10_3_OR_EARLIER #ifdef isfinite #define juce_isfinite(v) isfinite(v) #else diff --git a/src/juce_amalgamated_template.cpp b/src/juce_amalgamated_template.cpp index 37c24954a8..f7e1de8303 100644 --- a/src/juce_amalgamated_template.cpp +++ b/src/juce_amalgamated_template.cpp @@ -1,350 +1,349 @@ -/* - ============================================================================== - - This file is part of the JUCE library - "Jules' Utility Class Extensions" - Copyright 2004-9 by Raw Material Software Ltd. - - ------------------------------------------------------------------------------ - - JUCE can be redistributed and/or modified under the terms of the GNU General - Public License (Version 2), as published by the Free Software Foundation. - A copy of the license is included in the JUCE distribution, or can be found - online at www.gnu.org/licenses. - - 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. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.rawmaterialsoftware.com/juce for more information. - - ============================================================================== -*/ - -/* - This monolithic file contains the entire Juce source tree! - - To build an app which uses Juce, all you need to do is to add this - file to your project, and include juce.h in your own cpp files. - -*/ - -#ifdef __JUCE_JUCEHEADER__ - /* When you add the amalgamated cpp file to your project, you mustn't include it in - a file where you've already included juce.h - just put it inside a file on its own, - possibly with your config flags preceding it, but don't include anything else. */ - #error -#endif - -#include "../juce_Config.h" // FORCE_AMALGAMATOR_INCLUDE - -//============================================================================== -#ifdef _WIN32 - #include "../build/win32/platform_specific_code/juce_win32_NativeIncludes.h" -#elif defined (LINUX) - #include "../build/linux/platform_specific_code/juce_linux_NativeIncludes.h" -#else - #include "../build/macosx/platform_specific_code/juce_mac_NativeIncludes.h" -#endif - -//============================================================================== -#define DONT_SET_USING_JUCE_NAMESPACE 1 - -#include "../juce_amalgamated.h" - -#define NO_DUMMY_DECL - -#if (defined(_MSC_VER) && (_MSC_VER <= 1200)) - #pragma warning (disable: 4309 4305) -#endif - -#if JUCE_MAC && JUCE_32BIT && JUCE_SUPPORT_CARBON && ! JUCE_ONLY_BUILD_CORE_LIBRARY - BEGIN_JUCE_NAMESPACE - #include "../build/macosx/platform_specific_code/juce_mac_CarbonViewWrapperComponent.h" - END_JUCE_NAMESPACE -#endif - -//============================================================================== -#include "juce_core/basics/juce_FileLogger.cpp" -#include "juce_core/basics/juce_Logger.cpp" -#include "juce_core/basics/juce_Random.cpp" -#include "juce_core/basics/juce_RelativeTime.cpp" -#include "juce_core/basics/juce_SystemStats.cpp" -#include "juce_core/basics/juce_Time.cpp" -#include "juce_core/containers/juce_BitArray.cpp" -#include "juce_core/containers/juce_MemoryBlock.cpp" -#include "juce_core/containers/juce_PropertySet.cpp" -#include "juce_core/containers/juce_Variant.cpp" -#include "juce_core/cryptography/juce_BlowFish.cpp" -#include "juce_core/cryptography/juce_MD5.cpp" -#include "juce_core/cryptography/juce_Primes.cpp" -#include "juce_core/cryptography/juce_RSAKey.cpp" -#include "juce_core/io/juce_InputStream.cpp" -#include "juce_core/io/juce_OutputStream.cpp" -#include "juce_core/io/files/juce_DirectoryIterator.cpp" -#include "juce_core/io/files/juce_File.cpp" -#include "juce_core/io/files/juce_FileInputStream.cpp" -#include "juce_core/io/files/juce_FileOutputStream.cpp" -#include "juce_core/io/files/juce_FileSearchPath.cpp" -#include "juce_core/io/files/juce_NamedPipe.cpp" -#include "juce_core/io/network/juce_Socket.cpp" -#include "juce_core/io/network/juce_URL.cpp" -#include "juce_core/io/streams/juce_BufferedInputStream.cpp" -#include "juce_core/io/streams/juce_FileInputSource.cpp" -#include "juce_core/io/streams/juce_MemoryInputStream.cpp" -#include "juce_core/io/streams/juce_MemoryOutputStream.cpp" -#include "juce_core/io/streams/juce_SubregionStream.cpp" -#include "juce_core/misc/juce_PerformanceCounter.cpp" -#include "juce_core/misc/juce_Uuid.cpp" -#include "juce_core/misc/juce_ZipFile.cpp" -#include "juce_core/text/juce_CharacterFunctions.cpp" -#include "juce_core/text/juce_LocalisedStrings.cpp" -#include "juce_core/text/juce_String.cpp" -#include "juce_core/text/juce_StringArray.cpp" -#include "juce_core/text/juce_StringPairArray.cpp" -#include "juce_core/text/juce_XmlDocument.cpp" -#include "juce_core/text/juce_XmlElement.cpp" -#include "juce_core/threads/juce_InterProcessLock.cpp" -#include "juce_core/threads/juce_ReadWriteLock.cpp" -#include "juce_core/threads/juce_Thread.cpp" -#include "juce_core/threads/juce_ThreadPool.cpp" -#include "juce_core/threads/juce_TimeSliceThread.cpp" - -#if ! JUCE_ONLY_BUILD_CORE_LIBRARY - -#include "juce_appframework/application/juce_Application.cpp" -#include "juce_appframework/application/juce_ApplicationCommandInfo.cpp" -#include "juce_appframework/application/juce_ApplicationCommandManager.cpp" -#include "juce_appframework/application/juce_ApplicationCommandTarget.cpp" -#include "juce_appframework/application/juce_ApplicationProperties.cpp" -#include "juce_appframework/application/juce_DeletedAtShutdown.cpp" -#include "juce_appframework/application/juce_PropertiesFile.cpp" -#include "juce_appframework/audio/audio_file_formats/juce_AiffAudioFormat.cpp" -#include "juce_appframework/audio/audio_file_formats/juce_AudioCDReader.cpp" -#include "juce_appframework/audio/audio_file_formats/juce_AudioFormat.cpp" -#include "juce_appframework/audio/audio_file_formats/juce_AudioFormatManager.cpp" -#include "juce_appframework/audio/audio_file_formats/juce_AudioSubsectionReader.cpp" -#include "juce_appframework/audio/audio_file_formats/juce_AudioThumbnail.cpp" -#include "juce_appframework/audio/audio_file_formats/juce_AudioThumbnailCache.cpp" -#include "juce_appframework/audio/audio_file_formats/juce_QuickTimeAudioFormat.cpp" -#include "juce_appframework/audio/audio_file_formats/juce_WavAudioFormat.cpp" -#include "juce_appframework/audio/audio_sources/juce_AudioFormatReaderSource.cpp" -#include "juce_appframework/audio/audio_sources/juce_AudioSourcePlayer.cpp" -#include "juce_appframework/audio/audio_sources/juce_AudioTransportSource.cpp" -#include "juce_appframework/audio/audio_sources/juce_BufferingAudioSource.cpp" -#include "juce_appframework/audio/audio_sources/juce_ChannelRemappingAudioSource.cpp" -#include "juce_appframework/audio/audio_sources/juce_IIRFilterAudioSource.cpp" -#include "juce_appframework/audio/audio_sources/juce_MixerAudioSource.cpp" -#include "juce_appframework/audio/audio_sources/juce_ResamplingAudioSource.cpp" -#include "juce_appframework/audio/audio_sources/juce_ToneGeneratorAudioSource.cpp" -#include "juce_appframework/audio/devices/juce_AudioDeviceManager.cpp" -#include "juce_appframework/audio/devices/juce_AudioIODevice.cpp" -#include "juce_appframework/audio/devices/juce_AudioIODeviceType.cpp" -#include "juce_appframework/audio/devices/juce_MidiOutput.cpp" -#include "juce_appframework/audio/dsp/juce_AudioDataConverters.cpp" -#include "juce_appframework/audio/dsp/juce_AudioSampleBuffer.cpp" -#include "juce_appframework/audio/dsp/juce_IIRFilter.cpp" -#include "juce_appframework/audio/midi/juce_MidiBuffer.cpp" -#include "juce_appframework/audio/midi/juce_MidiFile.cpp" -#include "juce_appframework/audio/midi/juce_MidiKeyboardState.cpp" -#include "juce_appframework/audio/midi/juce_MidiMessage.cpp" -#include "juce_appframework/audio/midi/juce_MidiMessageCollector.cpp" -#include "juce_appframework/audio/midi/juce_MidiMessageSequence.cpp" -#include "juce_appframework/audio/plugins/juce_AudioPluginFormat.cpp" -#include "juce_appframework/audio/plugins/juce_AudioPluginFormatManager.cpp" -#include "juce_appframework/audio/plugins/juce_AudioPluginInstance.cpp" -#include "juce_appframework/audio/plugins/juce_KnownPluginList.cpp" -#include "juce_appframework/audio/plugins/juce_PluginDescription.cpp" -#include "juce_appframework/audio/plugins/juce_PluginDirectoryScanner.cpp" -#include "juce_appframework/audio/plugins/juce_PluginListComponent.cpp" -#include "juce_appframework/audio/plugins/formats/juce_AudioUnitPluginFormat.mm" -#include "juce_appframework/audio/plugins/formats/juce_VSTPluginFormat.mm" -#include "juce_appframework/audio/processors/juce_AudioProcessor.cpp" -#include "juce_appframework/audio/processors/juce_AudioProcessorEditor.cpp" -#include "juce_appframework/audio/processors/juce_AudioProcessorGraph.cpp" -#include "juce_appframework/audio/processors/juce_AudioProcessorPlayer.cpp" -#include "juce_appframework/audio/processors/juce_GenericAudioProcessorEditor.cpp" -#include "juce_appframework/audio/synthesisers/juce_Sampler.cpp" -#include "juce_appframework/audio/synthesisers/juce_Synthesiser.cpp" -#include "juce_appframework/documents/juce_FileBasedDocument.cpp" -#include "juce_appframework/documents/juce_RecentlyOpenedFilesList.cpp" -#include "juce_appframework/documents/juce_UndoManager.cpp" -#include "juce_appframework/events/juce_ActionBroadcaster.cpp" -#include "juce_appframework/events/juce_ActionListenerList.cpp" -#include "juce_appframework/events/juce_AsyncUpdater.cpp" -#include "juce_appframework/events/juce_ChangeBroadcaster.cpp" -#include "juce_appframework/events/juce_ChangeListenerList.cpp" -#include "juce_appframework/events/juce_InterprocessConnection.cpp" -#include "juce_appframework/events/juce_InterprocessConnectionServer.cpp" -#include "juce_appframework/events/juce_Message.cpp" -#include "juce_appframework/events/juce_MessageListener.cpp" -#include "juce_appframework/events/juce_MessageManager.cpp" -#include "juce_appframework/events/juce_MultiTimer.cpp" -#include "juce_appframework/events/juce_Timer.cpp" -#include "juce_appframework/gui/components/juce_Component.cpp" -#include "juce_appframework/gui/components/juce_ComponentListener.cpp" -#include "juce_appframework/gui/components/juce_Desktop.cpp" -#include "juce_appframework/gui/components/buttons/juce_ArrowButton.cpp" -#include "juce_appframework/gui/components/buttons/juce_Button.cpp" -#include "juce_appframework/gui/components/buttons/juce_DrawableButton.cpp" -#include "juce_appframework/gui/components/buttons/juce_HyperlinkButton.cpp" -#include "juce_appframework/gui/components/buttons/juce_ImageButton.cpp" -#include "juce_appframework/gui/components/buttons/juce_ShapeButton.cpp" -#include "juce_appframework/gui/components/buttons/juce_TextButton.cpp" -#include "juce_appframework/gui/components/buttons/juce_ToggleButton.cpp" -#include "juce_appframework/gui/components/buttons/juce_ToolbarButton.cpp" -#include "juce_appframework/gui/components/controls/juce_ComboBox.cpp" -#include "juce_appframework/gui/components/controls/juce_Label.cpp" -#include "juce_appframework/gui/components/controls/juce_ListBox.cpp" -#include "juce_appframework/gui/components/controls/juce_ProgressBar.cpp" -#include "juce_appframework/gui/components/controls/juce_Slider.cpp" -#include "juce_appframework/gui/components/controls/juce_TableHeaderComponent.cpp" -#include "juce_appframework/gui/components/controls/juce_TableListBox.cpp" -#include "juce_appframework/gui/components/controls/juce_TextEditor.cpp" -#include "juce_appframework/gui/components/controls/juce_Toolbar.cpp" -#include "juce_appframework/gui/components/controls/juce_ToolbarItemComponent.cpp" -#include "juce_appframework/gui/components/controls/juce_ToolbarItemPalette.cpp" -#include "juce_appframework/gui/components/controls/juce_TreeView.cpp" -#include "juce_appframework/gui/components/filebrowser/juce_DirectoryContentsDisplayComponent.cpp" -#include "juce_appframework/gui/components/filebrowser/juce_DirectoryContentsList.cpp" -#include "juce_appframework/gui/components/filebrowser/juce_FileBrowserComponent.cpp" -#include "juce_appframework/gui/components/filebrowser/juce_FileChooser.cpp" -#include "juce_appframework/gui/components/filebrowser/juce_FileChooserDialogBox.cpp" -#include "juce_appframework/gui/components/filebrowser/juce_FileFilter.cpp" -#include "juce_appframework/gui/components/filebrowser/juce_FileListComponent.cpp" -#include "juce_appframework/gui/components/filebrowser/juce_FilenameComponent.cpp" -#include "juce_appframework/gui/components/filebrowser/juce_FileSearchPathListComponent.cpp" -#include "juce_appframework/gui/components/filebrowser/juce_FileTreeComponent.cpp" -#include "juce_appframework/gui/components/filebrowser/juce_ImagePreviewComponent.cpp" -#include "juce_appframework/gui/components/filebrowser/juce_WildcardFileFilter.cpp" -#include "juce_appframework/gui/components/keyboard/juce_KeyboardFocusTraverser.cpp" -#include "juce_appframework/gui/components/keyboard/juce_KeyListener.cpp" -#include "juce_appframework/gui/components/keyboard/juce_KeyMappingEditorComponent.cpp" -#include "juce_appframework/gui/components/keyboard/juce_KeyPress.cpp" -#include "juce_appframework/gui/components/keyboard/juce_KeyPressMappingSet.cpp" -#include "juce_appframework/gui/components/keyboard/juce_ModifierKeys.cpp" -#include "juce_appframework/gui/components/layout/juce_ComponentAnimator.cpp" -#include "juce_appframework/gui/components/layout/juce_ComponentBoundsConstrainer.cpp" -#include "juce_appframework/gui/components/layout/juce_ComponentMovementWatcher.cpp" -#include "juce_appframework/gui/components/layout/juce_GroupComponent.cpp" -#include "juce_appframework/gui/components/layout/juce_MultiDocumentPanel.cpp" -#include "juce_appframework/gui/components/layout/juce_ResizableBorderComponent.cpp" -#include "juce_appframework/gui/components/layout/juce_ResizableCornerComponent.cpp" -#include "juce_appframework/gui/components/layout/juce_ScrollBar.cpp" -#include "juce_appframework/gui/components/layout/juce_StretchableLayoutManager.cpp" -#include "juce_appframework/gui/components/layout/juce_StretchableLayoutResizerBar.cpp" -#include "juce_appframework/gui/components/layout/juce_StretchableObjectResizer.cpp" -#include "juce_appframework/gui/components/layout/juce_TabbedButtonBar.cpp" -#include "juce_appframework/gui/components/layout/juce_TabbedComponent.cpp" -#include "juce_appframework/gui/components/layout/juce_Viewport.cpp" -#include "juce_appframework/gui/components/lookandfeel/juce_LookAndFeel.cpp" -#include "juce_appframework/gui/components/lookandfeel/juce_OldSchoolLookAndFeel.cpp" -#include "juce_appframework/gui/components/menus/juce_MenuBarComponent.cpp" -#include "juce_appframework/gui/components/menus/juce_MenuBarModel.cpp" -#include "juce_appframework/gui/components/menus/juce_PopupMenu.cpp" -#include "juce_appframework/gui/components/mouse/juce_ComponentDragger.cpp" -#include "juce_appframework/gui/components/mouse/juce_DragAndDropContainer.cpp" -#include "juce_appframework/gui/components/mouse/juce_MouseCursor.cpp" -#include "juce_appframework/gui/components/mouse/juce_MouseEvent.cpp" -#include "juce_appframework/gui/components/mouse/juce_MouseHoverDetector.cpp" -#include "juce_appframework/gui/components/mouse/juce_MouseListener.cpp" -#include "juce_appframework/gui/components/properties/juce_BooleanPropertyComponent.cpp" -#include "juce_appframework/gui/components/properties/juce_ButtonPropertyComponent.cpp" -#include "juce_appframework/gui/components/properties/juce_ChoicePropertyComponent.cpp" -#include "juce_appframework/gui/components/properties/juce_PropertyComponent.cpp" -#include "juce_appframework/gui/components/properties/juce_PropertyPanel.cpp" -#include "juce_appframework/gui/components/properties/juce_SliderPropertyComponent.cpp" -#include "juce_appframework/gui/components/properties/juce_TextPropertyComponent.cpp" -#include "juce_appframework/gui/components/special/juce_AudioDeviceSelectorComponent.cpp" -#include "juce_appframework/gui/components/special/juce_BubbleComponent.cpp" -#include "juce_appframework/gui/components/special/juce_BubbleMessageComponent.cpp" -#include "juce_appframework/gui/components/special/juce_ColourSelector.cpp" -#include "juce_appframework/gui/components/special/juce_DropShadower.cpp" -#include "juce_appframework/gui/components/special/juce_MagnifierComponent.cpp" -#include "juce_appframework/gui/components/special/juce_MidiKeyboardComponent.cpp" -#include "juce_appframework/gui/components/special/juce_OpenGLComponent.cpp" -#include "juce_appframework/gui/components/special/juce_PreferencesPanel.cpp" -#include "juce_appframework/gui/components/special/juce_SystemTrayIconComponent.cpp" -#include "juce_appframework/gui/components/windows/juce_AlertWindow.cpp" -#include "juce_appframework/gui/components/windows/juce_ComponentPeer.cpp" -#include "juce_appframework/gui/components/windows/juce_DialogWindow.cpp" -#include "juce_appframework/gui/components/windows/juce_DocumentWindow.cpp" -#include "juce_appframework/gui/components/windows/juce_ResizableWindow.cpp" -#include "juce_appframework/gui/components/windows/juce_SplashScreen.cpp" -#include "juce_appframework/gui/components/windows/juce_ThreadWithProgressWindow.cpp" -#include "juce_appframework/gui/components/windows/juce_TooltipWindow.cpp" -#include "juce_appframework/gui/components/windows/juce_TopLevelWindow.cpp" -#include "juce_appframework/gui/graphics/brushes/juce_Brush.cpp" -#include "juce_appframework/gui/graphics/brushes/juce_GradientBrush.cpp" -#include "juce_appframework/gui/graphics/brushes/juce_ImageBrush.cpp" -#include "juce_appframework/gui/graphics/brushes/juce_SolidColourBrush.cpp" -#include "juce_appframework/gui/graphics/colour/juce_Colour.cpp" -#include "juce_appframework/gui/graphics/colour/juce_ColourGradient.cpp" -#include "juce_appframework/gui/graphics/colour/juce_Colours.cpp" -#include "juce_appframework/gui/graphics/contexts/juce_EdgeTable.cpp" -#include "juce_appframework/gui/graphics/contexts/juce_Graphics.cpp" -#include "juce_appframework/gui/graphics/contexts/juce_Justification.cpp" -#include "juce_appframework/gui/graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.cpp" -#include "juce_appframework/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp" -#include "juce_appframework/gui/graphics/contexts/juce_RectanglePlacement.cpp" -#include "juce_appframework/gui/graphics/drawables/juce_Drawable.cpp" -#include "juce_appframework/gui/graphics/drawables/juce_DrawableComposite.cpp" -#include "juce_appframework/gui/graphics/drawables/juce_DrawableImage.cpp" -#include "juce_appframework/gui/graphics/drawables/juce_DrawablePath.cpp" -#include "juce_appframework/gui/graphics/drawables/juce_DrawableText.cpp" -#include "juce_appframework/gui/graphics/drawables/juce_SVGParser.cpp" -#include "juce_appframework/gui/graphics/effects/juce_DropShadowEffect.cpp" -#include "juce_appframework/gui/graphics/effects/juce_GlowEffect.cpp" -#include "juce_appframework/gui/graphics/effects/juce_ReduceOpacityEffect.cpp" -#include "juce_appframework/gui/graphics/fonts/juce_Font.cpp" -#include "juce_appframework/gui/graphics/fonts/juce_GlyphArrangement.cpp" -#include "juce_appframework/gui/graphics/fonts/juce_TextLayout.cpp" -#include "juce_appframework/gui/graphics/fonts/juce_Typeface.cpp" -#include "juce_appframework/gui/graphics/geometry/juce_AffineTransform.cpp" -#include "juce_appframework/gui/graphics/geometry/juce_BorderSize.cpp" -#include "juce_appframework/gui/graphics/geometry/juce_Line.cpp" -#include "juce_appframework/gui/graphics/geometry/juce_Path.cpp" -#include "juce_appframework/gui/graphics/geometry/juce_PathIterator.cpp" -#include "juce_appframework/gui/graphics/geometry/juce_PathStrokeType.cpp" -#include "juce_appframework/gui/graphics/geometry/juce_Point.cpp" -#include "juce_appframework/gui/graphics/geometry/juce_PositionedRectangle.cpp" -#include "juce_appframework/gui/graphics/geometry/juce_Rectangle.cpp" -#include "juce_appframework/gui/graphics/geometry/juce_RectangleList.cpp" -#include "juce_appframework/gui/graphics/imaging/juce_Image.cpp" -#include "juce_appframework/gui/graphics/imaging/juce_ImageCache.cpp" -#include "juce_appframework/gui/graphics/imaging/juce_ImageConvolutionKernel.cpp" -#include "juce_appframework/gui/graphics/imaging/juce_ImageFileFormat.cpp" -#include "juce_appframework/gui/graphics/imaging/image_file_formats/juce_GIFLoader.cpp" - -#endif - -//============================================================================== -// some files include lots of library code, so leave them to the end to avoid cluttering -// up the build for the clean files. -#include "juce_core/io/streams/juce_GZIPCompressorOutputStream.cpp" -#include "juce_core/io/streams/juce_GZIPDecompressorInputStream.cpp" - -#if ! JUCE_ONLY_BUILD_CORE_LIBRARY - #include "juce_appframework/audio/audio_file_formats/juce_FlacAudioFormat.cpp" - #include "juce_appframework/audio/audio_file_formats/juce_OggVorbisAudioFormat.cpp" - #include "juce_appframework/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp" - #include "juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp" -#endif - -//============================================================================== -#if JUCE_WIN32 - #include "../build/win32/platform_specific_code/juce_win32_NativeCode.cpp" - #include "../build/win32/platform_specific_code/juce_win32_AutoLinkLibraries.h" -#endif - -//============================================================================== -#if JUCE_LINUX - #include "../build/linux/platform_specific_code/juce_linux_NativeCode.cpp" -#endif - -//============================================================================== -#if JUCE_MAC - #include "../build/macosx/platform_specific_code/juce_mac_NativeCode.mm" -#endif +/* + ============================================================================== + + This file is part of the JUCE library - "Jules' Utility Class Extensions" + Copyright 2004-9 by Raw Material Software Ltd. + + ------------------------------------------------------------------------------ + + JUCE can be redistributed and/or modified under the terms of the GNU General + Public License (Version 2), as published by the Free Software Foundation. + A copy of the license is included in the JUCE distribution, or can be found + online at www.gnu.org/licenses. + + 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. + + ------------------------------------------------------------------------------ + + To release a closed-source product which uses JUCE, commercial licenses are + available: visit www.rawmaterialsoftware.com/juce for more information. + + ============================================================================== +*/ + +/* + This monolithic file contains the entire Juce source tree! + + To build an app which uses Juce, all you need to do is to add this + file to your project, and include juce.h in your own cpp files. + +*/ + +#ifdef __JUCE_JUCEHEADER__ + /* When you add the amalgamated cpp file to your project, you mustn't include it in + a file where you've already included juce.h - just put it inside a file on its own, + possibly with your config flags preceding it, but don't include anything else. */ + #error +#endif + +#include "../juce_Config.h" // FORCE_AMALGAMATOR_INCLUDE + +//============================================================================== +#ifdef _WIN32 + #include "native/windows/juce_win32_NativeIncludes.h" +#elif defined (LINUX) + #include "native/linux/juce_linux_NativeIncludes.h" +#else + #include "native/mac/juce_mac_NativeIncludes.h" +#endif + +//============================================================================== +#define DONT_SET_USING_JUCE_NAMESPACE 1 + +#include "../juce_amalgamated.h" + +#define NO_DUMMY_DECL + +#if (defined(_MSC_VER) && (_MSC_VER <= 1200)) + #pragma warning (disable: 4309 4305) +#endif + +#if JUCE_MAC && JUCE_32BIT && JUCE_SUPPORT_CARBON && ! JUCE_ONLY_BUILD_CORE_LIBRARY + BEGIN_JUCE_NAMESPACE + #include "native/mac/juce_mac_CarbonViewWrapperComponent.h" + END_JUCE_NAMESPACE +#endif + +#define JUCE_AMALGAMATED_TEMPLATE 1 + +//============================================================================== +#include "juce_core/basics/juce_FileLogger.cpp" +#include "juce_core/basics/juce_Logger.cpp" +#include "juce_core/basics/juce_Random.cpp" +#include "juce_core/basics/juce_RelativeTime.cpp" +#include "juce_core/basics/juce_SystemStats.cpp" +#include "juce_core/basics/juce_Time.cpp" +#include "juce_core/containers/juce_BitArray.cpp" +#include "juce_core/containers/juce_MemoryBlock.cpp" +#include "juce_core/containers/juce_PropertySet.cpp" +#include "juce_core/containers/juce_Variant.cpp" +#include "juce_core/cryptography/juce_BlowFish.cpp" +#include "juce_core/cryptography/juce_MD5.cpp" +#include "juce_core/cryptography/juce_Primes.cpp" +#include "juce_core/cryptography/juce_RSAKey.cpp" +#include "juce_core/io/juce_InputStream.cpp" +#include "juce_core/io/juce_OutputStream.cpp" +#include "juce_core/io/files/juce_DirectoryIterator.cpp" +#include "juce_core/io/files/juce_File.cpp" +#include "juce_core/io/files/juce_FileInputStream.cpp" +#include "juce_core/io/files/juce_FileOutputStream.cpp" +#include "juce_core/io/files/juce_FileSearchPath.cpp" +#include "juce_core/io/files/juce_NamedPipe.cpp" +#include "juce_core/io/network/juce_Socket.cpp" +#include "juce_core/io/network/juce_URL.cpp" +#include "juce_core/io/streams/juce_BufferedInputStream.cpp" +#include "juce_core/io/streams/juce_FileInputSource.cpp" +#include "juce_core/io/streams/juce_MemoryInputStream.cpp" +#include "juce_core/io/streams/juce_MemoryOutputStream.cpp" +#include "juce_core/io/streams/juce_SubregionStream.cpp" +#include "juce_core/misc/juce_PerformanceCounter.cpp" +#include "juce_core/misc/juce_Uuid.cpp" +#include "juce_core/misc/juce_ZipFile.cpp" +#include "juce_core/text/juce_CharacterFunctions.cpp" +#include "juce_core/text/juce_LocalisedStrings.cpp" +#include "juce_core/text/juce_String.cpp" +#include "juce_core/text/juce_StringArray.cpp" +#include "juce_core/text/juce_StringPairArray.cpp" +#include "juce_core/text/juce_XmlDocument.cpp" +#include "juce_core/text/juce_XmlElement.cpp" +#include "juce_core/threads/juce_InterProcessLock.cpp" +#include "juce_core/threads/juce_ReadWriteLock.cpp" +#include "juce_core/threads/juce_Thread.cpp" +#include "juce_core/threads/juce_ThreadPool.cpp" +#include "juce_core/threads/juce_TimeSliceThread.cpp" + +#if ! JUCE_ONLY_BUILD_CORE_LIBRARY + +#include "juce_appframework/application/juce_Application.cpp" +#include "juce_appframework/application/juce_ApplicationCommandInfo.cpp" +#include "juce_appframework/application/juce_ApplicationCommandManager.cpp" +#include "juce_appframework/application/juce_ApplicationCommandTarget.cpp" +#include "juce_appframework/application/juce_ApplicationProperties.cpp" +#include "juce_appframework/application/juce_DeletedAtShutdown.cpp" +#include "juce_appframework/application/juce_PropertiesFile.cpp" +#include "juce_appframework/audio/audio_file_formats/juce_AiffAudioFormat.cpp" +#include "juce_appframework/audio/audio_file_formats/juce_AudioCDReader.cpp" +#include "juce_appframework/audio/audio_file_formats/juce_AudioFormat.cpp" +#include "juce_appframework/audio/audio_file_formats/juce_AudioFormatManager.cpp" +#include "juce_appframework/audio/audio_file_formats/juce_AudioSubsectionReader.cpp" +#include "juce_appframework/audio/audio_file_formats/juce_AudioThumbnail.cpp" +#include "juce_appframework/audio/audio_file_formats/juce_AudioThumbnailCache.cpp" +#include "juce_appframework/audio/audio_file_formats/juce_QuickTimeAudioFormat.cpp" +#include "juce_appframework/audio/audio_file_formats/juce_WavAudioFormat.cpp" +#include "juce_appframework/audio/audio_sources/juce_AudioFormatReaderSource.cpp" +#include "juce_appframework/audio/audio_sources/juce_AudioSourcePlayer.cpp" +#include "juce_appframework/audio/audio_sources/juce_AudioTransportSource.cpp" +#include "juce_appframework/audio/audio_sources/juce_BufferingAudioSource.cpp" +#include "juce_appframework/audio/audio_sources/juce_ChannelRemappingAudioSource.cpp" +#include "juce_appframework/audio/audio_sources/juce_IIRFilterAudioSource.cpp" +#include "juce_appframework/audio/audio_sources/juce_MixerAudioSource.cpp" +#include "juce_appframework/audio/audio_sources/juce_ResamplingAudioSource.cpp" +#include "juce_appframework/audio/audio_sources/juce_ToneGeneratorAudioSource.cpp" +#include "juce_appframework/audio/devices/juce_AudioDeviceManager.cpp" +#include "juce_appframework/audio/devices/juce_AudioIODevice.cpp" +#include "juce_appframework/audio/devices/juce_AudioIODeviceType.cpp" +#include "juce_appframework/audio/devices/juce_MidiOutput.cpp" +#include "juce_appframework/audio/dsp/juce_AudioDataConverters.cpp" +#include "juce_appframework/audio/dsp/juce_AudioSampleBuffer.cpp" +#include "juce_appframework/audio/dsp/juce_IIRFilter.cpp" +#include "juce_appframework/audio/midi/juce_MidiBuffer.cpp" +#include "juce_appframework/audio/midi/juce_MidiFile.cpp" +#include "juce_appframework/audio/midi/juce_MidiKeyboardState.cpp" +#include "juce_appframework/audio/midi/juce_MidiMessage.cpp" +#include "juce_appframework/audio/midi/juce_MidiMessageCollector.cpp" +#include "juce_appframework/audio/midi/juce_MidiMessageSequence.cpp" +#include "juce_appframework/audio/plugins/juce_AudioPluginFormat.cpp" +#include "juce_appframework/audio/plugins/juce_AudioPluginFormatManager.cpp" +#include "juce_appframework/audio/plugins/juce_AudioPluginInstance.cpp" +#include "juce_appframework/audio/plugins/juce_KnownPluginList.cpp" +#include "juce_appframework/audio/plugins/juce_PluginDescription.cpp" +#include "juce_appframework/audio/plugins/juce_PluginDirectoryScanner.cpp" +#include "juce_appframework/audio/plugins/juce_PluginListComponent.cpp" +#include "juce_appframework/audio/plugins/formats/juce_AudioUnitPluginFormat.mm" +#include "juce_appframework/audio/plugins/formats/juce_VSTPluginFormat.mm" +#include "juce_appframework/audio/processors/juce_AudioProcessor.cpp" +#include "juce_appframework/audio/processors/juce_AudioProcessorEditor.cpp" +#include "juce_appframework/audio/processors/juce_AudioProcessorGraph.cpp" +#include "juce_appframework/audio/processors/juce_AudioProcessorPlayer.cpp" +#include "juce_appframework/audio/processors/juce_GenericAudioProcessorEditor.cpp" +#include "juce_appframework/audio/synthesisers/juce_Sampler.cpp" +#include "juce_appframework/audio/synthesisers/juce_Synthesiser.cpp" +#include "juce_appframework/documents/juce_FileBasedDocument.cpp" +#include "juce_appframework/documents/juce_RecentlyOpenedFilesList.cpp" +#include "juce_appframework/documents/juce_UndoManager.cpp" +#include "juce_appframework/events/juce_ActionBroadcaster.cpp" +#include "juce_appframework/events/juce_ActionListenerList.cpp" +#include "juce_appframework/events/juce_AsyncUpdater.cpp" +#include "juce_appframework/events/juce_ChangeBroadcaster.cpp" +#include "juce_appframework/events/juce_ChangeListenerList.cpp" +#include "juce_appframework/events/juce_InterprocessConnection.cpp" +#include "juce_appframework/events/juce_InterprocessConnectionServer.cpp" +#include "juce_appframework/events/juce_Message.cpp" +#include "juce_appframework/events/juce_MessageListener.cpp" +#include "juce_appframework/events/juce_MessageManager.cpp" +#include "juce_appframework/events/juce_MultiTimer.cpp" +#include "juce_appframework/events/juce_Timer.cpp" +#include "juce_appframework/gui/components/juce_Component.cpp" +#include "juce_appframework/gui/components/juce_ComponentListener.cpp" +#include "juce_appframework/gui/components/juce_Desktop.cpp" +#include "juce_appframework/gui/components/buttons/juce_ArrowButton.cpp" +#include "juce_appframework/gui/components/buttons/juce_Button.cpp" +#include "juce_appframework/gui/components/buttons/juce_DrawableButton.cpp" +#include "juce_appframework/gui/components/buttons/juce_HyperlinkButton.cpp" +#include "juce_appframework/gui/components/buttons/juce_ImageButton.cpp" +#include "juce_appframework/gui/components/buttons/juce_ShapeButton.cpp" +#include "juce_appframework/gui/components/buttons/juce_TextButton.cpp" +#include "juce_appframework/gui/components/buttons/juce_ToggleButton.cpp" +#include "juce_appframework/gui/components/buttons/juce_ToolbarButton.cpp" +#include "juce_appframework/gui/components/controls/juce_ComboBox.cpp" +#include "juce_appframework/gui/components/controls/juce_Label.cpp" +#include "juce_appframework/gui/components/controls/juce_ListBox.cpp" +#include "juce_appframework/gui/components/controls/juce_ProgressBar.cpp" +#include "juce_appframework/gui/components/controls/juce_Slider.cpp" +#include "juce_appframework/gui/components/controls/juce_TableHeaderComponent.cpp" +#include "juce_appframework/gui/components/controls/juce_TableListBox.cpp" +#include "juce_appframework/gui/components/controls/juce_TextEditor.cpp" +#include "juce_appframework/gui/components/controls/juce_Toolbar.cpp" +#include "juce_appframework/gui/components/controls/juce_ToolbarItemComponent.cpp" +#include "juce_appframework/gui/components/controls/juce_ToolbarItemPalette.cpp" +#include "juce_appframework/gui/components/controls/juce_TreeView.cpp" +#include "juce_appframework/gui/components/filebrowser/juce_DirectoryContentsDisplayComponent.cpp" +#include "juce_appframework/gui/components/filebrowser/juce_DirectoryContentsList.cpp" +#include "juce_appframework/gui/components/filebrowser/juce_FileBrowserComponent.cpp" +#include "juce_appframework/gui/components/filebrowser/juce_FileChooser.cpp" +#include "juce_appframework/gui/components/filebrowser/juce_FileChooserDialogBox.cpp" +#include "juce_appframework/gui/components/filebrowser/juce_FileFilter.cpp" +#include "juce_appframework/gui/components/filebrowser/juce_FileListComponent.cpp" +#include "juce_appframework/gui/components/filebrowser/juce_FilenameComponent.cpp" +#include "juce_appframework/gui/components/filebrowser/juce_FileSearchPathListComponent.cpp" +#include "juce_appframework/gui/components/filebrowser/juce_FileTreeComponent.cpp" +#include "juce_appframework/gui/components/filebrowser/juce_ImagePreviewComponent.cpp" +#include "juce_appframework/gui/components/filebrowser/juce_WildcardFileFilter.cpp" +#include "juce_appframework/gui/components/keyboard/juce_KeyboardFocusTraverser.cpp" +#include "juce_appframework/gui/components/keyboard/juce_KeyListener.cpp" +#include "juce_appframework/gui/components/keyboard/juce_KeyMappingEditorComponent.cpp" +#include "juce_appframework/gui/components/keyboard/juce_KeyPress.cpp" +#include "juce_appframework/gui/components/keyboard/juce_KeyPressMappingSet.cpp" +#include "juce_appframework/gui/components/keyboard/juce_ModifierKeys.cpp" +#include "juce_appframework/gui/components/layout/juce_ComponentAnimator.cpp" +#include "juce_appframework/gui/components/layout/juce_ComponentBoundsConstrainer.cpp" +#include "juce_appframework/gui/components/layout/juce_ComponentMovementWatcher.cpp" +#include "juce_appframework/gui/components/layout/juce_GroupComponent.cpp" +#include "juce_appframework/gui/components/layout/juce_MultiDocumentPanel.cpp" +#include "juce_appframework/gui/components/layout/juce_ResizableBorderComponent.cpp" +#include "juce_appframework/gui/components/layout/juce_ResizableCornerComponent.cpp" +#include "juce_appframework/gui/components/layout/juce_ScrollBar.cpp" +#include "juce_appframework/gui/components/layout/juce_StretchableLayoutManager.cpp" +#include "juce_appframework/gui/components/layout/juce_StretchableLayoutResizerBar.cpp" +#include "juce_appframework/gui/components/layout/juce_StretchableObjectResizer.cpp" +#include "juce_appframework/gui/components/layout/juce_TabbedButtonBar.cpp" +#include "juce_appframework/gui/components/layout/juce_TabbedComponent.cpp" +#include "juce_appframework/gui/components/layout/juce_Viewport.cpp" +#include "juce_appframework/gui/components/lookandfeel/juce_LookAndFeel.cpp" +#include "juce_appframework/gui/components/lookandfeel/juce_OldSchoolLookAndFeel.cpp" +#include "juce_appframework/gui/components/menus/juce_MenuBarComponent.cpp" +#include "juce_appframework/gui/components/menus/juce_MenuBarModel.cpp" +#include "juce_appframework/gui/components/menus/juce_PopupMenu.cpp" +#include "juce_appframework/gui/components/mouse/juce_ComponentDragger.cpp" +#include "juce_appframework/gui/components/mouse/juce_DragAndDropContainer.cpp" +#include "juce_appframework/gui/components/mouse/juce_MouseCursor.cpp" +#include "juce_appframework/gui/components/mouse/juce_MouseEvent.cpp" +#include "juce_appframework/gui/components/mouse/juce_MouseHoverDetector.cpp" +#include "juce_appframework/gui/components/mouse/juce_MouseListener.cpp" +#include "juce_appframework/gui/components/properties/juce_BooleanPropertyComponent.cpp" +#include "juce_appframework/gui/components/properties/juce_ButtonPropertyComponent.cpp" +#include "juce_appframework/gui/components/properties/juce_ChoicePropertyComponent.cpp" +#include "juce_appframework/gui/components/properties/juce_PropertyComponent.cpp" +#include "juce_appframework/gui/components/properties/juce_PropertyPanel.cpp" +#include "juce_appframework/gui/components/properties/juce_SliderPropertyComponent.cpp" +#include "juce_appframework/gui/components/properties/juce_TextPropertyComponent.cpp" +#include "juce_appframework/gui/components/special/juce_AudioDeviceSelectorComponent.cpp" +#include "juce_appframework/gui/components/special/juce_BubbleComponent.cpp" +#include "juce_appframework/gui/components/special/juce_BubbleMessageComponent.cpp" +#include "juce_appframework/gui/components/special/juce_ColourSelector.cpp" +#include "juce_appframework/gui/components/special/juce_DropShadower.cpp" +#include "juce_appframework/gui/components/special/juce_MagnifierComponent.cpp" +#include "juce_appframework/gui/components/special/juce_MidiKeyboardComponent.cpp" +#include "juce_appframework/gui/components/special/juce_OpenGLComponent.cpp" +#include "juce_appframework/gui/components/special/juce_PreferencesPanel.cpp" +#include "juce_appframework/gui/components/special/juce_SystemTrayIconComponent.cpp" +#include "juce_appframework/gui/components/windows/juce_AlertWindow.cpp" +#include "juce_appframework/gui/components/windows/juce_ComponentPeer.cpp" +#include "juce_appframework/gui/components/windows/juce_DialogWindow.cpp" +#include "juce_appframework/gui/components/windows/juce_DocumentWindow.cpp" +#include "juce_appframework/gui/components/windows/juce_ResizableWindow.cpp" +#include "juce_appframework/gui/components/windows/juce_SplashScreen.cpp" +#include "juce_appframework/gui/components/windows/juce_ThreadWithProgressWindow.cpp" +#include "juce_appframework/gui/components/windows/juce_TooltipWindow.cpp" +#include "juce_appframework/gui/components/windows/juce_TopLevelWindow.cpp" +#include "juce_appframework/gui/graphics/brushes/juce_Brush.cpp" +#include "juce_appframework/gui/graphics/brushes/juce_GradientBrush.cpp" +#include "juce_appframework/gui/graphics/brushes/juce_ImageBrush.cpp" +#include "juce_appframework/gui/graphics/brushes/juce_SolidColourBrush.cpp" +#include "juce_appframework/gui/graphics/colour/juce_Colour.cpp" +#include "juce_appframework/gui/graphics/colour/juce_ColourGradient.cpp" +#include "juce_appframework/gui/graphics/colour/juce_Colours.cpp" +#include "juce_appframework/gui/graphics/contexts/juce_EdgeTable.cpp" +#include "juce_appframework/gui/graphics/contexts/juce_Graphics.cpp" +#include "juce_appframework/gui/graphics/contexts/juce_Justification.cpp" +#include "juce_appframework/gui/graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.cpp" +#include "juce_appframework/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp" +#include "juce_appframework/gui/graphics/contexts/juce_RectanglePlacement.cpp" +#include "juce_appframework/gui/graphics/drawables/juce_Drawable.cpp" +#include "juce_appframework/gui/graphics/drawables/juce_DrawableComposite.cpp" +#include "juce_appframework/gui/graphics/drawables/juce_DrawableImage.cpp" +#include "juce_appframework/gui/graphics/drawables/juce_DrawablePath.cpp" +#include "juce_appframework/gui/graphics/drawables/juce_DrawableText.cpp" +#include "juce_appframework/gui/graphics/drawables/juce_SVGParser.cpp" +#include "juce_appframework/gui/graphics/effects/juce_DropShadowEffect.cpp" +#include "juce_appframework/gui/graphics/effects/juce_GlowEffect.cpp" +#include "juce_appframework/gui/graphics/effects/juce_ReduceOpacityEffect.cpp" +#include "juce_appframework/gui/graphics/fonts/juce_Font.cpp" +#include "juce_appframework/gui/graphics/fonts/juce_GlyphArrangement.cpp" +#include "juce_appframework/gui/graphics/fonts/juce_TextLayout.cpp" +#include "juce_appframework/gui/graphics/fonts/juce_Typeface.cpp" +#include "juce_appframework/gui/graphics/geometry/juce_AffineTransform.cpp" +#include "juce_appframework/gui/graphics/geometry/juce_BorderSize.cpp" +#include "juce_appframework/gui/graphics/geometry/juce_Line.cpp" +#include "juce_appframework/gui/graphics/geometry/juce_Path.cpp" +#include "juce_appframework/gui/graphics/geometry/juce_PathIterator.cpp" +#include "juce_appframework/gui/graphics/geometry/juce_PathStrokeType.cpp" +#include "juce_appframework/gui/graphics/geometry/juce_Point.cpp" +#include "juce_appframework/gui/graphics/geometry/juce_PositionedRectangle.cpp" +#include "juce_appframework/gui/graphics/geometry/juce_Rectangle.cpp" +#include "juce_appframework/gui/graphics/geometry/juce_RectangleList.cpp" +#include "juce_appframework/gui/graphics/imaging/juce_Image.cpp" +#include "juce_appframework/gui/graphics/imaging/juce_ImageCache.cpp" +#include "juce_appframework/gui/graphics/imaging/juce_ImageConvolutionKernel.cpp" +#include "juce_appframework/gui/graphics/imaging/juce_ImageFileFormat.cpp" +#include "juce_appframework/gui/graphics/imaging/image_file_formats/juce_GIFLoader.cpp" + +#endif + +//============================================================================== +// some files include lots of library code, so leave them to the end to avoid cluttering +// up the build for the clean files. +#include "juce_core/io/streams/juce_GZIPCompressorOutputStream.cpp" +#include "juce_core/io/streams/juce_GZIPDecompressorInputStream.cpp" + +#if ! JUCE_ONLY_BUILD_CORE_LIBRARY + #include "juce_appframework/audio/audio_file_formats/juce_FlacAudioFormat.cpp" + #include "juce_appframework/audio/audio_file_formats/juce_OggVorbisAudioFormat.cpp" + #include "juce_appframework/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp" + #include "juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp" +#endif + +//============================================================================== +#if JUCE_WIN32 + #include "native/juce_win32_NativeCode.cpp" +#endif + +#if JUCE_LINUX + #include "native/juce_linux_NativeCode.cpp" +#endif + +#if JUCE_MAC + #include "native/juce_mac_NativeCode.mm" +#endif diff --git a/src/juce_appframework/audio/plugins/formats/juce_AudioUnitPluginFormat.mm b/src/juce_appframework/audio/plugins/formats/juce_AudioUnitPluginFormat.mm index e0b21d9418..4034c77ff3 100644 --- a/src/juce_appframework/audio/plugins/formats/juce_AudioUnitPluginFormat.mm +++ b/src/juce_appframework/audio/plugins/formats/juce_AudioUnitPluginFormat.mm @@ -48,7 +48,7 @@ BEGIN_JUCE_NAMESPACE #include "../../../../juce_appframework/gui/components/layout/juce_ComponentMovementWatcher.h" #include "../../../../juce_appframework/gui/components/special/juce_NSViewComponent.h" #if JUCE_MAC && JUCE_SUPPORT_CARBON - #include "../../../../../build/macosx/platform_specific_code/juce_mac_CarbonViewWrapperComponent.h" + #include "../../../../native/mac/juce_mac_CarbonViewWrapperComponent.h" #endif #if JUCE_MAC diff --git a/src/juce_appframework/audio/plugins/formats/juce_VSTPluginFormat.cpp b/src/juce_appframework/audio/plugins/formats/juce_VSTPluginFormat.cpp index 287cc21863..d0a14cf392 100644 --- a/src/juce_appframework/audio/plugins/formats/juce_VSTPluginFormat.cpp +++ b/src/juce_appframework/audio/plugins/formats/juce_VSTPluginFormat.cpp @@ -75,7 +75,7 @@ BEGIN_JUCE_NAMESPACE #include "../../../../juce_core/misc/juce_PlatformUtilities.h" #if JUCE_MAC && JUCE_SUPPORT_CARBON - #include "../../../../../build/macosx/platform_specific_code/juce_mac_CarbonViewWrapperComponent.h" + #include "../../../../native/mac/juce_mac_CarbonViewWrapperComponent.h" #endif //============================================================================== diff --git a/src/juce_core/basics/juce_MathsFunctions.h b/src/juce_core/basics/juce_MathsFunctions.h index df05eb505c..3c0bd63a49 100644 --- a/src/juce_core/basics/juce_MathsFunctions.h +++ b/src/juce_core/basics/juce_MathsFunctions.h @@ -215,22 +215,6 @@ inline void swapVariables (Type& variable1, Type& variable2) throw() /** Using juce_hypot and juce_hypotf is easier than dealing with all the different versions of these functions of various platforms and compilers. */ forcedinline float juce_hypotf (float a, float b) { return (float) _hypot (a, b); } -#elif MACOS_10_2_OR_EARLIER - /** Using juce_hypot and juce_hypotf is easier than dealing with all the different - versions of these functions of various platforms and compilers. */ - forcedinline double juce_hypot (double a, double b) { return hypot (a, b); } - - /** Using juce_hypot and juce_hypotf is easier than dealing with all the different - versions of these functions of various platforms and compilers. */ - forcedinline float juce_hypotf (float a, float b) { return (float) hypot (a, b); } - forcedinline float sinf (const float a) { return (float) sin (a); } - forcedinline float cosf (const float a) { return (float) cos (a); } - forcedinline float tanf (const float a) { return (float) tan (a); } - forcedinline float atan2f (const float a, const float b) { return (float) atan2 (a, b); } - forcedinline float sqrtf (const float a) { return (float) sqrt (a); } - forcedinline float logf (const float a) { return (float) log (a); } - forcedinline float powf (const float a, const float b) { return (float) pow (a, b); } - forcedinline float expf (const float a) { return (float) exp (a); } #else /** Using juce_hypot and juce_hypotf is easier than dealing with all the different versions of these functions of various platforms and compilers. */ @@ -265,9 +249,7 @@ const float float_Pi = 3.14159265358979323846f; #if JUCE_LINUX #define juce_isfinite(v) std::isfinite(v) #elif JUCE_MAC - #if MACOS_10_2_OR_EARLIER - #define juce_isfinite(v) __isfinite(v) - #elif MACOS_10_3_OR_EARLIER + #if MACOS_10_3_OR_EARLIER #ifdef isfinite #define juce_isfinite(v) isfinite(v) #else diff --git a/src/juce_core/basics/juce_PlatformDefs.h b/src/juce_core/basics/juce_PlatformDefs.h index 72bb75149b..89f49504d2 100644 --- a/src/juce_core/basics/juce_PlatformDefs.h +++ b/src/juce_core/basics/juce_PlatformDefs.h @@ -38,9 +38,6 @@ - Either JUCE_INTEL or JUCE_PPC - Either JUCE_GCC or JUCE_MSVC - On the Mac, it also defines MACOS_10_2_OR_EARLIER if the build is targeting OSX10.2, - and MACOS_10_3_OR_EARLIER if it is targeting either 10.2 or 10.3 - It also includes a set of macros for debug console output and assertions. */ @@ -104,7 +101,7 @@ #endif #if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_3) - #define MACOS_10_2_OR_EARLIER 1 + #error "Building for OSX 10.2 is no longer supported!" #endif #if (! defined (MAC_OS_X_VERSION_10_4)) || (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4) diff --git a/src/juce_core/io/network/juce_Socket.cpp b/src/juce_core/io/network/juce_Socket.cpp index 307c3b1e74..ff901a794b 100644 --- a/src/juce_core/io/network/juce_Socket.cpp +++ b/src/juce_core/io/network/juce_Socket.cpp @@ -192,7 +192,7 @@ static int waitForReadiness (const int handle, const bool forReading, { int opt; -#if defined (JUCE_LINUX) || (defined (JUCE_MAC) && ! MACOS_10_2_OR_EARLIER) +#if defined (JUCE_LINUX) || defined (JUCE_MAC) socklen_t len = sizeof (opt); #else int len = sizeof (opt); @@ -471,7 +471,7 @@ StreamingSocket* StreamingSocket::waitForNextConnection() const { struct sockaddr address; -#if defined (JUCE_LINUX) || (defined (JUCE_MAC) && ! MACOS_10_2_OR_EARLIER) +#if defined (JUCE_LINUX) || defined (JUCE_MAC) socklen_t len = sizeof (sockaddr); #else int len = sizeof (sockaddr); @@ -581,7 +581,7 @@ DatagramSocket* DatagramSocket::waitForNextConnection() const { struct sockaddr address; -#if defined (JUCE_LINUX) || (defined (JUCE_MAC) && ! MACOS_10_2_OR_EARLIER) +#if defined (JUCE_LINUX) || defined (JUCE_MAC) socklen_t len = sizeof (sockaddr); #else int len = sizeof (sockaddr); diff --git a/src/juce_core/text/juce_CharacterFunctions.cpp b/src/juce_core/text/juce_CharacterFunctions.cpp index b2f5d14639..505b06c9f9 100644 --- a/src/juce_core/text/juce_CharacterFunctions.cpp +++ b/src/juce_core/text/juce_CharacterFunctions.cpp @@ -50,15 +50,7 @@ int CharacterFunctions::length (const char* const s) throw() int CharacterFunctions::length (const juce_wchar* const s) throw() { -#if MACOS_10_2_OR_EARLIER - int n = 0; - while (s[n] != 0) - ++n; - - return n; -#else return (int) wcslen (s); -#endif } void CharacterFunctions::copy (char* dest, const char* src, const int maxChars) throw() @@ -68,14 +60,7 @@ void CharacterFunctions::copy (char* dest, const char* src, const int maxChars) void CharacterFunctions::copy (juce_wchar* dest, const juce_wchar* src, int maxChars) throw() { -#if MACOS_10_2_OR_EARLIER - while (--maxChars >= 0 && *src != 0) - *dest++ = *src++; - - *dest = 0; -#else wcsncpy (dest, src, maxChars); -#endif } void CharacterFunctions::copy (juce_wchar* dest, const char* src, const int maxChars) throw() @@ -100,17 +85,7 @@ void CharacterFunctions::append (char* dest, const char* src) throw() void CharacterFunctions::append (juce_wchar* dest, const juce_wchar* src) throw() { -#if MACOS_10_2_OR_EARLIER - while (*dest != 0) - ++dest; - - while (*src != 0) - *dest++ = *src++; - - *dest = 0; -#else wcscat (dest, src); -#endif } int CharacterFunctions::compare (const char* const s1, const char* const s2) throw() @@ -121,57 +96,19 @@ int CharacterFunctions::compare (const char* const s1, const char* const s2) thr int CharacterFunctions::compare (const juce_wchar* s1, const juce_wchar* s2) throw() { jassert (s1 != 0 && s2 != 0); - -#if MACOS_10_2_OR_EARLIER - for (;;) - { - if (*s1 != *s2) - { - const int diff = *s1 - *s2; - - if (diff != 0) - return diff < 0 ? -1 : 1; - } - else if (*s1 == 0) - break; - - ++s1; - ++s2; - } - - return 0; -#else return wcscmp (s1, s2); -#endif } int CharacterFunctions::compare (const char* const s1, const char* const s2, const int maxChars) throw() { jassert (s1 != 0 && s2 != 0); - return strncmp (s1, s2, maxChars); } int CharacterFunctions::compare (const juce_wchar* s1, const juce_wchar* s2, int maxChars) throw() { jassert (s1 != 0 && s2 != 0); - -#if MACOS_10_2_OR_EARLIER - while (--maxChars >= 0) - { - if (*s1 != *s2) - return (*s1 < *s2) ? -1 : 1; - else if (*s1 == 0) - break; - - ++s1; - ++s2; - } - - return 0; -#else return wcsncmp (s1, s2, maxChars); -#endif } int CharacterFunctions::compareIgnoreCase (const char* const s1, const char* const s2) throw() @@ -257,31 +194,7 @@ const char* CharacterFunctions::find (const char* const haystack, const char* co const juce_wchar* CharacterFunctions::find (const juce_wchar* haystack, const juce_wchar* const needle) throw() { -#if MACOS_10_2_OR_EARLIER - while (*haystack != 0) - { - const juce_wchar* s1 = haystack; - const juce_wchar* s2 = needle; - - for (;;) - { - if (*s2 == 0) - return haystack; - - if (*s1 != *s2 || *s2 == 0) - break; - - ++s1; - ++s2; - } - - ++haystack; - } - - return 0; -#else return wcsstr (haystack, needle); -#endif } int CharacterFunctions::indexOfChar (const char* const haystack, const char needle, const bool ignoreCase) throw() @@ -424,16 +337,7 @@ int CharacterFunctions::ftime (char* const dest, const int maxChars, const char* int CharacterFunctions::ftime (juce_wchar* const dest, const int maxChars, const juce_wchar* const format, const struct tm* const tm) throw() { -#if MACOS_10_2_OR_EARLIER - const String formatTemp (format); - size_t num = strftime ((char*) dest, maxChars, (const char*) formatTemp, tm); - String temp ((char*) dest); - temp.copyToBuffer (dest, num); - dest [num] = 0; - return (int) num; -#else return (int) wcsftime (dest, maxChars, format, tm); -#endif } int CharacterFunctions::getIntValue (const char* const s) throw() @@ -534,13 +438,8 @@ double CharacterFunctions::getDoubleValue (const char* const s) throw() double CharacterFunctions::getDoubleValue (const juce_wchar* const s) throw() { -#if MACOS_10_2_OR_EARLIER - String temp (s); - return atof ((const char*) temp); -#else wchar_t* endChar; return wcstod (s, &endChar); -#endif } //============================================================================== @@ -551,11 +450,7 @@ char CharacterFunctions::toUpperCase (const char character) throw() juce_wchar CharacterFunctions::toUpperCase (const juce_wchar character) throw() { -#if MACOS_10_2_OR_EARLIER - return toupper ((char) character); -#else return towupper (character); -#endif } void CharacterFunctions::toUpperCase (char* s) throw() @@ -606,11 +501,7 @@ char CharacterFunctions::toLowerCase (const char character) throw() juce_wchar CharacterFunctions::toLowerCase (const juce_wchar character) throw() { -#if MACOS_10_2_OR_EARLIER - return tolower ((char) character); -#else return towlower (character); -#endif } void CharacterFunctions::toLowerCase (char* s) throw() @@ -661,11 +552,7 @@ bool CharacterFunctions::isWhitespace (const char character) throw() bool CharacterFunctions::isWhitespace (const juce_wchar character) throw() { -#if MACOS_10_2_OR_EARLIER - return isWhitespace ((char) character); -#else return iswspace (character) != 0; -#endif } bool CharacterFunctions::isDigit (const char character) throw() @@ -675,11 +562,7 @@ bool CharacterFunctions::isDigit (const char character) throw() bool CharacterFunctions::isDigit (const juce_wchar character) throw() { -#if MACOS_10_2_OR_EARLIER - return isdigit ((char) character) != 0; -#else return iswdigit (character) != 0; -#endif } bool CharacterFunctions::isLetter (const char character) throw() @@ -690,11 +573,7 @@ bool CharacterFunctions::isLetter (const char character) throw() bool CharacterFunctions::isLetter (const juce_wchar character) throw() { -#if MACOS_10_2_OR_EARLIER - return isLetter ((char) character); -#else return iswalpha (character) != 0; -#endif } bool CharacterFunctions::isLetterOrDigit (const char character) throw() @@ -706,11 +585,7 @@ bool CharacterFunctions::isLetterOrDigit (const char character) throw() bool CharacterFunctions::isLetterOrDigit (const juce_wchar character) throw() { -#if MACOS_10_2_OR_EARLIER - return isLetterOrDigit ((char) character); -#else return iswalnum (character) != 0; -#endif } int CharacterFunctions::getHexDigitValue (const tchar digit) throw() diff --git a/build/macosx/platform_specific_code/juce_mac_NamedPipe.cpp b/src/native/common/juce_posix_NamedPipe.cpp similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_NamedPipe.cpp rename to src/native/common/juce_posix_NamedPipe.cpp diff --git a/build/macosx/platform_specific_code/juce_posix_SharedCode.h b/src/native/common/juce_posix_SharedCode.h similarity index 100% rename from build/macosx/platform_specific_code/juce_posix_SharedCode.h rename to src/native/common/juce_posix_SharedCode.h diff --git a/src/native/juce_linux_NativeCode.cpp b/src/native/juce_linux_NativeCode.cpp new file mode 100644 index 0000000000..c34c35f8df --- /dev/null +++ b/src/native/juce_linux_NativeCode.cpp @@ -0,0 +1,114 @@ +/* + ============================================================================== + + This file is part of the JUCE library - "Jules' Utility Class Extensions" + Copyright 2004-9 by Raw Material Software Ltd. + + ------------------------------------------------------------------------------ + + JUCE can be redistributed and/or modified under the terms of the GNU General + Public License (Version 2), as published by the Free Software Foundation. + A copy of the license is included in the JUCE distribution, or can be found + online at www.gnu.org/licenses. + + 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. + + ------------------------------------------------------------------------------ + + To release a closed-source product which uses JUCE, commercial licenses are + available: visit www.rawmaterialsoftware.com/juce for more information. + + ============================================================================== +*/ + +/* + This file wraps together all the mac-specific code, so that + we can include all the native headers just once, and compile all our + platform-specific stuff in one big lump, keeping it out of the way of + the rest of the codebase. +*/ + +#include "linux/juce_linux_NativeIncludes.h" + + +BEGIN_JUCE_NAMESPACE + +#include "../juce_core/io/files/juce_FileInputStream.h" +#include "../juce_core/io/files/juce_FileOutputStream.h" +#include "../juce_core/basics/juce_SystemStats.h" +#include "../juce_core/basics/juce_Time.h" +#include "../juce_core/basics/juce_Random.h" +#include "../juce_core/io/network/juce_URL.h" +#include "../juce_core/io/files/juce_NamedPipe.h" +#include "../juce_core/threads/juce_InterProcessLock.h" +#include "../juce_appframework/audio/devices/juce_AudioIODeviceType.h" +#include "../juce_core/threads/juce_Thread.h" +#include "../juce_core/threads/juce_ScopedLock.h" +#include "../juce_core/io/files/juce_File.h" +#include "../juce_core/basics/juce_Singleton.h" +#include "../juce_appframework/audio/dsp/juce_AudioDataConverters.h" +#include "../juce_appframework/audio/audio_file_formats/juce_AudioCDReader.h" +#include "../juce_appframework/gui/graphics/fonts/juce_Font.h" +#include "../juce_core/io/streams/juce_MemoryInputStream.h" +#include "../juce_core/io/files/juce_DirectoryIterator.h" +#include "../juce_core/text/juce_XmlDocument.h" +#include "../juce_appframework/application/juce_DeletedAtShutdown.h" +#include "../juce_appframework/events/juce_MessageManager.h" +#include "../juce_core/threads/juce_WaitableEvent.h" +#include "../juce_core/threads/juce_Process.h" +#include "../juce_appframework/gui/components/filebrowser/juce_FileChooser.h" +#include "../juce_appframework/audio/devices/juce_MidiOutput.h" +#include "../juce_appframework/audio/devices/juce_MidiInput.h" +#include "../juce_core/text/juce_StringArray.h" +#include "../juce_core/containers/juce_MemoryBlock.h" +#include "../juce_core/misc/juce_PlatformUtilities.h" +#include "../juce_core/threads/juce_CriticalSection.h" +#include "../juce_appframework/events/juce_Timer.h" +#include "../juce_appframework/gui/components/special/juce_WebBrowserComponent.h" +#include "../juce_appframework/gui/components/keyboard/juce_KeyPress.h" +#include "../juce_appframework/application/juce_SystemClipboard.h" +#include "../juce_appframework/gui/components/windows/juce_AlertWindow.h" +#include "../juce_appframework/gui/components/special/juce_OpenGLComponent.h" +#include "../juce_appframework/gui/components/juce_Desktop.h" +#include "../juce_appframework/gui/components/juce_ComponentDeletionWatcher.h" +#include "../juce_appframework/gui/graphics/geometry/juce_RectangleList.h" +#include "../juce_appframework/gui/graphics/imaging/juce_ImageFileFormat.h" +#include "../juce_appframework/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h" +#include "../juce_appframework/gui/components/mouse/juce_DragAndDropContainer.h" +#include "../juce_appframework/gui/components/special/juce_SystemTrayIconComponent.h" +#include "../juce_appframework/application/juce_Application.h" + +/* Remove this macro if you're having problems compiling the cpu affinity + calls (the API for these has changed about quite a bit in various Linux + versions, and a lot of distros seem to ship with obsolete versions) +*/ +#if defined (CPU_ISSET) && ! defined (SUPPORT_AFFINITIES) + #define SUPPORT_AFFINITIES 1 +#endif + +//============================================================================== +#define JUCE_INCLUDED_FILE 1 + +// Now include the actual code files.. + +#include "common/juce_posix_SharedCode.h" +#include "linux/juce_linux_Files.cpp" +#include "common/juce_posix_NamedPipe.cpp" +#include "linux/juce_linux_Network.cpp" +#include "linux/juce_linux_SystemStats.cpp" +#include "linux/juce_linux_Threads.cpp" + +#if ! JUCE_ONLY_BUILD_CORE_LIBRARY + #include "linux/juce_linux_Messaging.cpp" + #include "linux/juce_linux_Fonts.cpp" + #include "linux/juce_linux_Windowing.cpp" + #include "linux/juce_linux_Audio.cpp" + #include "linux/juce_linux_Midi.cpp" + #include "linux/juce_linux_AudioCDReader.cpp" + #include "linux/juce_linux_FileChooser.cpp" + #include "linux/juce_linux_WebBrowserComponent.cpp" +#endif + +END_JUCE_NAMESPACE diff --git a/src/native/juce_mac_NativeCode.mm b/src/native/juce_mac_NativeCode.mm new file mode 100644 index 0000000000..046a636436 --- /dev/null +++ b/src/native/juce_mac_NativeCode.mm @@ -0,0 +1,131 @@ +/* + ============================================================================== + + This file is part of the JUCE library - "Jules' Utility Class Extensions" + Copyright 2004-9 by Raw Material Software Ltd. + + ------------------------------------------------------------------------------ + + JUCE can be redistributed and/or modified under the terms of the GNU General + Public License (Version 2), as published by the Free Software Foundation. + A copy of the license is included in the JUCE distribution, or can be found + online at www.gnu.org/licenses. + + 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. + + ------------------------------------------------------------------------------ + + To release a closed-source product which uses JUCE, commercial licenses are + available: visit www.rawmaterialsoftware.com/juce for more information. + + ============================================================================== +*/ + +/* + This file wraps together all the mac-specific code, so that + we can include all the native headers just once, and compile all our + platform-specific stuff in one big lump, keeping it out of the way of + the rest of the codebase. +*/ + +#include "mac/juce_mac_NativeIncludes.h" + +BEGIN_JUCE_NAMESPACE + +//============================================================================== +#include "../juce_core/basics/juce_Singleton.h" +#include "../juce_core/basics/juce_Random.h" +#include "../juce_core/basics/juce_SystemStats.h" +#include "../juce_core/threads/juce_Process.h" +#include "../juce_core/threads/juce_Thread.h" +#include "../juce_core/threads/juce_InterProcessLock.h" +#include "../juce_core/io/files/juce_FileInputStream.h" +#include "../juce_core/io/files/juce_NamedPipe.h" +#include "../juce_core/io/network/juce_URL.h" +#include "../juce_core/misc/juce_PlatformUtilities.h" +#include "../juce_core/text/juce_LocalisedStrings.h" +#include "../juce_appframework/application/juce_DeletedAtShutdown.h" +#include "../juce_appframework/application/juce_Application.h" +#include "../juce_appframework/application/juce_SystemClipboard.h" +#include "../juce_appframework/events/juce_MessageManager.h" +#include "../juce_appframework/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h" +#include "../juce_appframework/gui/graphics/imaging/juce_ImageFileFormat.h" +#include "../juce_appframework/gui/graphics/imaging/juce_CameraDevice.h" +#include "../juce_appframework/gui/components/windows/juce_AlertWindow.h" +#include "../juce_appframework/gui/components/juce_Desktop.h" +#include "../juce_appframework/gui/components/menus/juce_MenuBarModel.h" +#include "../juce_appframework/gui/components/special/juce_OpenGLComponent.h" +#include "../juce_appframework/gui/components/special/juce_QuickTimeMovieComponent.h" +#include "../juce_appframework/gui/components/mouse/juce_DragAndDropContainer.h" +#include "../juce_appframework/gui/components/keyboard/juce_KeyPressMappingSet.h" +#include "../juce_appframework/gui/components/special/juce_NSViewComponent.h" +#include "../juce_appframework/gui/components/layout/juce_ComponentMovementWatcher.h" +#include "../juce_appframework/gui/components/special/juce_WebBrowserComponent.h" +#include "../juce_appframework/gui/components/filebrowser/juce_FileChooser.h" +#include "../juce_appframework/audio/audio_file_formats/juce_AudioCDBurner.h" +#include "../juce_appframework/audio/audio_file_formats/juce_AudioCDReader.h" +#include "../juce_appframework/audio/audio_sources/juce_AudioSource.h" +#include "../juce_appframework/audio/dsp/juce_AudioDataConverters.h" +#include "../juce_appframework/audio/devices/juce_AudioIODeviceType.h" +#include "../juce_appframework/audio/devices/juce_MidiOutput.h" +#include "../juce_appframework/audio/devices/juce_MidiInput.h" +#undef Point + +//============================================================================== +/** This suffix is used for naming all Obj-C classes that are used inside juce. + + Because of the flat naming structure used by Obj-C, you can get horrible situations where + two DLLs are loaded into a host, each of which uses classes with the same names, and these get + cross-linked so that when you make a call to a class that you thought was private, it ends up + actually calling into a similarly named class in the other module's address space. + + By changing this macro to a unique value, you ensure that all the obj-C classes in your app + have unique names, and should avoid this problem. + + If you're using the amalgamated version, you can just set this macro to something unique before + you include juce_amalgamated.cpp. +*/ +#ifndef JUCE_ObjCExtraSuffix + #define JUCE_ObjCExtraSuffix 3 +#endif + +#define appendMacro1(a, b, c, d) a ## _ ## b ## _ ## c ## _ ## d +#define appendMacro2(a, b, c, d) appendMacro1(a, b, c, d) +#define MakeObjCClassName(rootName) appendMacro2 (rootName, JUCE_MAJOR_VERSION, JUCE_MINOR_VERSION, JUCE_ObjCExtraSuffix) + +//============================================================================== +#define JUCE_INCLUDED_FILE 1 + +// Now include the actual code files.. + +#include "mac/juce_mac_Strings.mm" +#include "mac/juce_mac_SystemStats.mm" +#include "mac/juce_mac_Network.mm" +#include "common/juce_posix_NamedPipe.cpp" +#include "mac/juce_mac_Threads.mm" +#include "common/juce_posix_SharedCode.h" +#include "mac/juce_mac_Files.mm" +#include "mac/juce_mac_MiscUtilities.mm" +#include "mac/juce_mac_Debugging.mm" + +#if ! JUCE_ONLY_BUILD_CORE_LIBRARY + #include "mac/juce_mac_NSViewComponentPeer.mm" + #include "mac/juce_mac_MouseCursor.mm" + #include "mac/juce_mac_NSViewComponent.mm" + #include "mac/juce_mac_AppleRemote.mm" + #include "mac/juce_mac_OpenGLComponent.mm" + #include "mac/juce_mac_MainMenu.mm" + #include "mac/juce_mac_FileChooser.mm" + #include "mac/juce_mac_QuickTimeMovieComponent.mm" + #include "mac/juce_mac_AudioCDBurner.mm" + #include "mac/juce_mac_Fonts.mm" + #include "mac/juce_mac_MessageManager.mm" + #include "mac/juce_mac_WebBrowserComponent.mm" + #include "mac/juce_mac_CoreAudio.cpp" + #include "mac/juce_mac_CoreMidi.cpp" + #include "mac/juce_mac_CameraDevice.mm" +#endif + +END_JUCE_NAMESPACE diff --git a/src/native/juce_win32_NativeCode.cpp b/src/native/juce_win32_NativeCode.cpp new file mode 100644 index 0000000000..a1a65800b5 --- /dev/null +++ b/src/native/juce_win32_NativeCode.cpp @@ -0,0 +1,117 @@ +/* + ============================================================================== + + This file is part of the JUCE library - "Jules' Utility Class Extensions" + Copyright 2004-9 by Raw Material Software Ltd. + + ------------------------------------------------------------------------------ + + JUCE can be redistributed and/or modified under the terms of the GNU General + Public License (Version 2), as published by the Free Software Foundation. + A copy of the license is included in the JUCE distribution, or can be found + online at www.gnu.org/licenses. + + 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. + + ------------------------------------------------------------------------------ + + To release a closed-source product which uses JUCE, commercial licenses are + available: visit www.rawmaterialsoftware.com/juce for more information. + + ============================================================================== +*/ + +//============================================================================== +/* + This file wraps together all the win32-specific code, so that + we can include all the native headers just once, and compile all our + platform-specific stuff in one big lump, keeping it out of the way of + the rest of the codebase. +*/ + +//============================================================================== +#include "windows/juce_win32_NativeIncludes.h" + +#include "../juce_core/basics/juce_StandardHeader.h" + +BEGIN_JUCE_NAMESPACE + +//============================================================================== +#include "../juce_core/basics/juce_Singleton.h" +#include "../juce_core/basics/juce_Random.h" +#include "../juce_core/basics/juce_SystemStats.h" +#include "../juce_core/threads/juce_Process.h" +#include "../juce_core/threads/juce_Thread.h" +#include "../juce_core/threads/juce_InterProcessLock.h" +#include "../juce_core/io/files/juce_FileInputStream.h" +#include "../juce_core/io/files/juce_NamedPipe.h" +#include "../juce_core/io/network/juce_URL.h" +#include "../juce_core/misc/juce_PlatformUtilities.h" +#include "../juce_core/text/juce_LocalisedStrings.h" +#include "../juce_appframework/application/juce_DeletedAtShutdown.h" +#include "../juce_appframework/application/juce_Application.h" +#include "../juce_appframework/application/juce_SystemClipboard.h" +#include "../juce_appframework/events/juce_MessageManager.h" +#include "../juce_appframework/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h" +#include "../juce_appframework/gui/graphics/imaging/juce_ImageFileFormat.h" +#include "../juce_appframework/gui/graphics/imaging/juce_CameraDevice.h" +#include "../juce_appframework/gui/components/windows/juce_AlertWindow.h" +#include "../juce_appframework/gui/components/juce_Desktop.h" +#include "../juce_appframework/gui/components/menus/juce_MenuBarModel.h" +#include "../juce_appframework/gui/components/special/juce_OpenGLComponent.h" +#include "../juce_appframework/gui/components/special/juce_QuickTimeMovieComponent.h" +#include "../juce_appframework/gui/components/mouse/juce_DragAndDropContainer.h" +#include "../juce_appframework/gui/components/keyboard/juce_KeyPressMappingSet.h" +#include "../juce_appframework/gui/components/layout/juce_ComponentMovementWatcher.h" +#include "../juce_appframework/gui/components/special/juce_ActiveXControlComponent.h" +#include "../juce_appframework/gui/components/special/juce_WebBrowserComponent.h" +#include "../juce_appframework/gui/components/special/juce_DropShadower.h" +#include "../juce_appframework/gui/components/special/juce_SystemTrayIconComponent.h" +#include "../juce_appframework/gui/components/filebrowser/juce_FileChooser.h" +#include "../juce_appframework/gui/components/lookandfeel/juce_LookAndFeel.h" +#include "../juce_appframework/audio/audio_file_formats/juce_AudioCDBurner.h" +#include "../juce_appframework/audio/audio_file_formats/juce_AudioCDReader.h" +#include "../juce_appframework/audio/audio_sources/juce_AudioSource.h" +#include "../juce_appframework/audio/dsp/juce_AudioDataConverters.h" +#include "../juce_appframework/audio/devices/juce_AudioIODeviceType.h" +#include "../juce_appframework/audio/devices/juce_MidiOutput.h" +#include "../juce_appframework/audio/devices/juce_MidiInput.h" + + +//============================================================================== +#define JUCE_INCLUDED_FILE 1 + +// Now include the actual code files.. +#include "windows/juce_win32_DynamicLibraryLoader.cpp" +#include "windows/juce_win32_SystemStats.cpp" +#include "windows/juce_win32_Threads.cpp" +#include "windows/juce_win32_Files.cpp" +#include "windows/juce_win32_Network.cpp" +#include "windows/juce_win32_PlatformUtils.cpp" + +#if ! JUCE_ONLY_BUILD_CORE_LIBRARY + #include "windows/juce_win32_Messaging.cpp" + #include "windows/juce_win32_Windowing.cpp" + #include "windows/juce_win32_Fonts.cpp" + #include "windows/juce_win32_FileChooser.cpp" + #include "windows/juce_win32_Misc.cpp" + #include "windows/juce_win32_ActiveXComponent.cpp" + #include "windows/juce_win32_QuickTimeMovieComponent.cpp" + #include "windows/juce_win32_WebBrowserComponent.cpp" + #include "windows/juce_win32_OpenGLComponent.cpp" + #include "windows/juce_win32_AudioCDReader.cpp" + #include "windows/juce_win32_Midi.cpp" + #include "windows/juce_win32_ASIO.cpp" + #include "windows/juce_win32_DirectSound.cpp" + #include "windows/juce_win32_CameraDevice.cpp" +#endif + +//============================================================================== +// Auto-link the other win32 libs that are needed by library calls.. +#if (JUCE_AMALGAMATED_TEMPLATE || defined (JUCE_DLL_BUILD)) && JUCE_MSVC && ! DONT_AUTOLINK_TO_WIN32_LIBRARIES + #include "windows/juce_win32_AutoLinkLibraries.h" +#endif + +END_JUCE_NAMESPACE diff --git a/build/linux/platform_specific_code/juce_linux_Audio.cpp b/src/native/linux/juce_linux_Audio.cpp similarity index 100% rename from build/linux/platform_specific_code/juce_linux_Audio.cpp rename to src/native/linux/juce_linux_Audio.cpp diff --git a/build/linux/platform_specific_code/juce_linux_AudioCDReader.cpp b/src/native/linux/juce_linux_AudioCDReader.cpp similarity index 100% rename from build/linux/platform_specific_code/juce_linux_AudioCDReader.cpp rename to src/native/linux/juce_linux_AudioCDReader.cpp diff --git a/build/linux/platform_specific_code/juce_linux_FileChooser.cpp b/src/native/linux/juce_linux_FileChooser.cpp similarity index 100% rename from build/linux/platform_specific_code/juce_linux_FileChooser.cpp rename to src/native/linux/juce_linux_FileChooser.cpp diff --git a/build/linux/platform_specific_code/juce_linux_Files.cpp b/src/native/linux/juce_linux_Files.cpp similarity index 100% rename from build/linux/platform_specific_code/juce_linux_Files.cpp rename to src/native/linux/juce_linux_Files.cpp diff --git a/build/linux/platform_specific_code/juce_linux_Fonts.cpp b/src/native/linux/juce_linux_Fonts.cpp similarity index 100% rename from build/linux/platform_specific_code/juce_linux_Fonts.cpp rename to src/native/linux/juce_linux_Fonts.cpp diff --git a/build/linux/platform_specific_code/juce_linux_Messaging.cpp b/src/native/linux/juce_linux_Messaging.cpp similarity index 100% rename from build/linux/platform_specific_code/juce_linux_Messaging.cpp rename to src/native/linux/juce_linux_Messaging.cpp diff --git a/build/linux/platform_specific_code/juce_linux_Midi.cpp b/src/native/linux/juce_linux_Midi.cpp similarity index 100% rename from build/linux/platform_specific_code/juce_linux_Midi.cpp rename to src/native/linux/juce_linux_Midi.cpp diff --git a/build/linux/platform_specific_code/juce_linux_NativeIncludes.h b/src/native/linux/juce_linux_NativeIncludes.h similarity index 100% rename from build/linux/platform_specific_code/juce_linux_NativeIncludes.h rename to src/native/linux/juce_linux_NativeIncludes.h diff --git a/build/linux/platform_specific_code/juce_linux_Network.cpp b/src/native/linux/juce_linux_Network.cpp similarity index 100% rename from build/linux/platform_specific_code/juce_linux_Network.cpp rename to src/native/linux/juce_linux_Network.cpp diff --git a/build/linux/platform_specific_code/juce_linux_SystemStats.cpp b/src/native/linux/juce_linux_SystemStats.cpp similarity index 100% rename from build/linux/platform_specific_code/juce_linux_SystemStats.cpp rename to src/native/linux/juce_linux_SystemStats.cpp diff --git a/build/linux/platform_specific_code/juce_linux_Threads.cpp b/src/native/linux/juce_linux_Threads.cpp similarity index 100% rename from build/linux/platform_specific_code/juce_linux_Threads.cpp rename to src/native/linux/juce_linux_Threads.cpp diff --git a/build/linux/platform_specific_code/juce_linux_WebBrowserComponent.cpp b/src/native/linux/juce_linux_WebBrowserComponent.cpp similarity index 100% rename from build/linux/platform_specific_code/juce_linux_WebBrowserComponent.cpp rename to src/native/linux/juce_linux_WebBrowserComponent.cpp diff --git a/build/linux/platform_specific_code/juce_linux_Windowing.cpp b/src/native/linux/juce_linux_Windowing.cpp similarity index 100% rename from build/linux/platform_specific_code/juce_linux_Windowing.cpp rename to src/native/linux/juce_linux_Windowing.cpp diff --git a/build/macosx/platform_specific_code/juce_mac_AppleRemote.mm b/src/native/mac/juce_mac_AppleRemote.mm similarity index 96% rename from build/macosx/platform_specific_code/juce_mac_AppleRemote.mm rename to src/native/mac/juce_mac_AppleRemote.mm index ea9bcfb414..0376f9fc8e 100644 --- a/build/macosx/platform_specific_code/juce_mac_AppleRemote.mm +++ b/src/native/mac/juce_mac_AppleRemote.mm @@ -140,7 +140,6 @@ static void appleRemoteQueueCallback (void* const target, const IOReturn result, bool AppleRemoteDevice::open (const bool openInExclusiveMode) throw() { -#if ! MACOS_10_2_OR_EARLIER Array cookies; CFArrayRef elements; @@ -202,14 +201,12 @@ bool AppleRemoteDevice::open (const bool openInExclusiveMode) throw() } } } -#endif return false; } void AppleRemoteDevice::handleCallbackInternal() { -#if ! MACOS_10_2_OR_EARLIER int totalValues = 0; AbsoluteTime nullTime = { 0, 0 }; char cookies [12]; @@ -266,7 +263,6 @@ void AppleRemoteDevice::handleCallbackInternal() i += strlen (buttonPatterns + i) + 1; ++buttonNum; } -#endif } #endif diff --git a/build/macosx/platform_specific_code/juce_mac_AudioCDBurner.mm b/src/native/mac/juce_mac_AudioCDBurner.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_AudioCDBurner.mm rename to src/native/mac/juce_mac_AudioCDBurner.mm diff --git a/build/macosx/platform_specific_code/juce_mac_CameraDevice.mm b/src/native/mac/juce_mac_CameraDevice.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_CameraDevice.mm rename to src/native/mac/juce_mac_CameraDevice.mm diff --git a/build/macosx/platform_specific_code/juce_mac_CarbonViewWrapperComponent.h b/src/native/mac/juce_mac_CarbonViewWrapperComponent.h similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_CarbonViewWrapperComponent.h rename to src/native/mac/juce_mac_CarbonViewWrapperComponent.h diff --git a/build/macosx/platform_specific_code/juce_mac_CoreAudio.cpp b/src/native/mac/juce_mac_CoreAudio.cpp similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_CoreAudio.cpp rename to src/native/mac/juce_mac_CoreAudio.cpp diff --git a/build/macosx/platform_specific_code/juce_mac_CoreMidi.cpp b/src/native/mac/juce_mac_CoreMidi.cpp similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_CoreMidi.cpp rename to src/native/mac/juce_mac_CoreMidi.cpp diff --git a/build/macosx/platform_specific_code/juce_mac_Debugging.mm b/src/native/mac/juce_mac_Debugging.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_Debugging.mm rename to src/native/mac/juce_mac_Debugging.mm diff --git a/build/macosx/platform_specific_code/juce_mac_FileChooser.mm b/src/native/mac/juce_mac_FileChooser.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_FileChooser.mm rename to src/native/mac/juce_mac_FileChooser.mm diff --git a/build/macosx/platform_specific_code/juce_mac_Files.mm b/src/native/mac/juce_mac_Files.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_Files.mm rename to src/native/mac/juce_mac_Files.mm diff --git a/build/macosx/platform_specific_code/juce_mac_Fonts.mm b/src/native/mac/juce_mac_Fonts.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_Fonts.mm rename to src/native/mac/juce_mac_Fonts.mm diff --git a/build/macosx/platform_specific_code/juce_mac_MainMenu.mm b/src/native/mac/juce_mac_MainMenu.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_MainMenu.mm rename to src/native/mac/juce_mac_MainMenu.mm diff --git a/build/macosx/platform_specific_code/juce_mac_MessageManager.mm b/src/native/mac/juce_mac_MessageManager.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_MessageManager.mm rename to src/native/mac/juce_mac_MessageManager.mm diff --git a/build/macosx/platform_specific_code/juce_mac_MiscUtilities.mm b/src/native/mac/juce_mac_MiscUtilities.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_MiscUtilities.mm rename to src/native/mac/juce_mac_MiscUtilities.mm diff --git a/build/macosx/platform_specific_code/juce_mac_MouseCursor.mm b/src/native/mac/juce_mac_MouseCursor.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_MouseCursor.mm rename to src/native/mac/juce_mac_MouseCursor.mm diff --git a/build/macosx/platform_specific_code/juce_mac_NSViewComponent.mm b/src/native/mac/juce_mac_NSViewComponent.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_NSViewComponent.mm rename to src/native/mac/juce_mac_NSViewComponent.mm diff --git a/build/macosx/platform_specific_code/juce_mac_NSViewComponentPeer.mm b/src/native/mac/juce_mac_NSViewComponentPeer.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_NSViewComponentPeer.mm rename to src/native/mac/juce_mac_NSViewComponentPeer.mm diff --git a/build/macosx/platform_specific_code/juce_mac_NativeIncludes.h b/src/native/mac/juce_mac_NativeIncludes.h similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_NativeIncludes.h rename to src/native/mac/juce_mac_NativeIncludes.h diff --git a/build/macosx/platform_specific_code/juce_mac_Network.mm b/src/native/mac/juce_mac_Network.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_Network.mm rename to src/native/mac/juce_mac_Network.mm diff --git a/build/macosx/platform_specific_code/juce_mac_OpenGLComponent.mm b/src/native/mac/juce_mac_OpenGLComponent.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_OpenGLComponent.mm rename to src/native/mac/juce_mac_OpenGLComponent.mm diff --git a/build/macosx/platform_specific_code/juce_mac_QuickTimeMovieComponent.mm b/src/native/mac/juce_mac_QuickTimeMovieComponent.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_QuickTimeMovieComponent.mm rename to src/native/mac/juce_mac_QuickTimeMovieComponent.mm diff --git a/build/macosx/platform_specific_code/juce_mac_Strings.mm b/src/native/mac/juce_mac_Strings.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_Strings.mm rename to src/native/mac/juce_mac_Strings.mm diff --git a/build/macosx/platform_specific_code/juce_mac_SystemStats.mm b/src/native/mac/juce_mac_SystemStats.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_SystemStats.mm rename to src/native/mac/juce_mac_SystemStats.mm diff --git a/build/macosx/platform_specific_code/juce_mac_Threads.mm b/src/native/mac/juce_mac_Threads.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_Threads.mm rename to src/native/mac/juce_mac_Threads.mm diff --git a/build/macosx/platform_specific_code/juce_mac_WebBrowserComponent.mm b/src/native/mac/juce_mac_WebBrowserComponent.mm similarity index 100% rename from build/macosx/platform_specific_code/juce_mac_WebBrowserComponent.mm rename to src/native/mac/juce_mac_WebBrowserComponent.mm diff --git a/build/win32/platform_specific_code/juce_win32_ASIO.cpp b/src/native/windows/juce_win32_ASIO.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_ASIO.cpp rename to src/native/windows/juce_win32_ASIO.cpp diff --git a/build/win32/platform_specific_code/juce_win32_ActiveXComponent.cpp b/src/native/windows/juce_win32_ActiveXComponent.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_ActiveXComponent.cpp rename to src/native/windows/juce_win32_ActiveXComponent.cpp diff --git a/build/win32/platform_specific_code/juce_win32_AudioCDReader.cpp b/src/native/windows/juce_win32_AudioCDReader.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_AudioCDReader.cpp rename to src/native/windows/juce_win32_AudioCDReader.cpp diff --git a/build/win32/platform_specific_code/juce_win32_AutoLinkLibraries.h b/src/native/windows/juce_win32_AutoLinkLibraries.h similarity index 100% rename from build/win32/platform_specific_code/juce_win32_AutoLinkLibraries.h rename to src/native/windows/juce_win32_AutoLinkLibraries.h diff --git a/build/win32/platform_specific_code/juce_win32_CameraDevice.cpp b/src/native/windows/juce_win32_CameraDevice.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_CameraDevice.cpp rename to src/native/windows/juce_win32_CameraDevice.cpp diff --git a/build/win32/platform_specific_code/juce_win32_DirectSound.cpp b/src/native/windows/juce_win32_DirectSound.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_DirectSound.cpp rename to src/native/windows/juce_win32_DirectSound.cpp diff --git a/build/win32/platform_specific_code/juce_win32_DynamicLibraryLoader.cpp b/src/native/windows/juce_win32_DynamicLibraryLoader.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_DynamicLibraryLoader.cpp rename to src/native/windows/juce_win32_DynamicLibraryLoader.cpp diff --git a/build/win32/platform_specific_code/juce_win32_DynamicLibraryLoader.h b/src/native/windows/juce_win32_DynamicLibraryLoader.h similarity index 100% rename from build/win32/platform_specific_code/juce_win32_DynamicLibraryLoader.h rename to src/native/windows/juce_win32_DynamicLibraryLoader.h diff --git a/build/win32/platform_specific_code/juce_win32_FileChooser.cpp b/src/native/windows/juce_win32_FileChooser.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_FileChooser.cpp rename to src/native/windows/juce_win32_FileChooser.cpp diff --git a/build/win32/platform_specific_code/juce_win32_Files.cpp b/src/native/windows/juce_win32_Files.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_Files.cpp rename to src/native/windows/juce_win32_Files.cpp diff --git a/build/win32/platform_specific_code/juce_win32_Fonts.cpp b/src/native/windows/juce_win32_Fonts.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_Fonts.cpp rename to src/native/windows/juce_win32_Fonts.cpp diff --git a/build/win32/platform_specific_code/juce_win32_Messaging.cpp b/src/native/windows/juce_win32_Messaging.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_Messaging.cpp rename to src/native/windows/juce_win32_Messaging.cpp diff --git a/build/win32/platform_specific_code/juce_win32_Midi.cpp b/src/native/windows/juce_win32_Midi.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_Midi.cpp rename to src/native/windows/juce_win32_Midi.cpp diff --git a/build/win32/platform_specific_code/juce_win32_Misc.cpp b/src/native/windows/juce_win32_Misc.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_Misc.cpp rename to src/native/windows/juce_win32_Misc.cpp diff --git a/build/win32/platform_specific_code/juce_win32_NativeIncludes.h b/src/native/windows/juce_win32_NativeIncludes.h similarity index 100% rename from build/win32/platform_specific_code/juce_win32_NativeIncludes.h rename to src/native/windows/juce_win32_NativeIncludes.h diff --git a/build/win32/platform_specific_code/juce_win32_Network.cpp b/src/native/windows/juce_win32_Network.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_Network.cpp rename to src/native/windows/juce_win32_Network.cpp diff --git a/build/win32/platform_specific_code/juce_win32_OpenGLComponent.cpp b/src/native/windows/juce_win32_OpenGLComponent.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_OpenGLComponent.cpp rename to src/native/windows/juce_win32_OpenGLComponent.cpp diff --git a/build/win32/platform_specific_code/juce_win32_PlatformUtils.cpp b/src/native/windows/juce_win32_PlatformUtils.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_PlatformUtils.cpp rename to src/native/windows/juce_win32_PlatformUtils.cpp diff --git a/build/win32/platform_specific_code/juce_win32_QuickTimeMovieComponent.cpp b/src/native/windows/juce_win32_QuickTimeMovieComponent.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_QuickTimeMovieComponent.cpp rename to src/native/windows/juce_win32_QuickTimeMovieComponent.cpp diff --git a/build/win32/platform_specific_code/juce_win32_SystemStats.cpp b/src/native/windows/juce_win32_SystemStats.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_SystemStats.cpp rename to src/native/windows/juce_win32_SystemStats.cpp diff --git a/build/win32/platform_specific_code/juce_win32_Threads.cpp b/src/native/windows/juce_win32_Threads.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_Threads.cpp rename to src/native/windows/juce_win32_Threads.cpp diff --git a/build/win32/platform_specific_code/juce_win32_WebBrowserComponent.cpp b/src/native/windows/juce_win32_WebBrowserComponent.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_WebBrowserComponent.cpp rename to src/native/windows/juce_win32_WebBrowserComponent.cpp diff --git a/build/win32/platform_specific_code/juce_win32_Windowing.cpp b/src/native/windows/juce_win32_Windowing.cpp similarity index 100% rename from build/win32/platform_specific_code/juce_win32_Windowing.cpp rename to src/native/windows/juce_win32_Windowing.cpp