diff --git a/build/linux/JUCE.make b/build/linux/JUCE.make index 488d033eff..6bb1a7fa02 100644 --- a/build/linux/JUCE.make +++ b/build/linux/JUCE.make @@ -39,275 +39,275 @@ ifeq ($(CONFIG),Release) endif OBJECTS := \ + $(OBJDIR)/juce_Random.o \ + $(OBJDIR)/juce_SystemStats.o \ + $(OBJDIR)/juce_RelativeTime.o \ + $(OBJDIR)/juce_Time.o \ + $(OBJDIR)/juce_Uuid.o \ $(OBJDIR)/juce_FileLogger.o \ $(OBJDIR)/juce_Logger.o \ $(OBJDIR)/juce_PerformanceCounter.o \ - $(OBJDIR)/juce_Random.o \ - $(OBJDIR)/juce_RelativeTime.o \ - $(OBJDIR)/juce_SystemStats.o \ - $(OBJDIR)/juce_Time.o \ - $(OBJDIR)/juce_Uuid.o \ - $(OBJDIR)/juce_BlowFish.o \ $(OBJDIR)/juce_MD5.o \ $(OBJDIR)/juce_Primes.o \ $(OBJDIR)/juce_RSAKey.o \ - $(OBJDIR)/juce_BitArray.o \ - $(OBJDIR)/juce_DynamicObject.o \ + $(OBJDIR)/juce_BlowFish.o \ $(OBJDIR)/juce_MemoryBlock.o \ - $(OBJDIR)/juce_NamedValueSet.o \ - $(OBJDIR)/juce_PropertySet.o \ - $(OBJDIR)/juce_Value.o \ $(OBJDIR)/juce_ValueTree.o \ $(OBJDIR)/juce_Variant.o \ - $(OBJDIR)/juce_DirectoryIterator.o \ + $(OBJDIR)/juce_Value.o \ + $(OBJDIR)/juce_NamedValueSet.o \ + $(OBJDIR)/juce_BitArray.o \ + $(OBJDIR)/juce_PropertySet.o \ + $(OBJDIR)/juce_DynamicObject.o \ + $(OBJDIR)/juce_FileOutputStream.o \ $(OBJDIR)/juce_File.o \ $(OBJDIR)/juce_FileInputStream.o \ - $(OBJDIR)/juce_FileOutputStream.o \ - $(OBJDIR)/juce_FileSearchPath.o \ $(OBJDIR)/juce_NamedPipe.o \ + $(OBJDIR)/juce_DirectoryIterator.o \ $(OBJDIR)/juce_TemporaryFile.o \ + $(OBJDIR)/juce_FileSearchPath.o \ $(OBJDIR)/juce_ZipFile.o \ - $(OBJDIR)/juce_Socket.o \ $(OBJDIR)/juce_URL.o \ + $(OBJDIR)/juce_Socket.o \ $(OBJDIR)/juce_BufferedInputStream.o \ - $(OBJDIR)/juce_FileInputSource.o \ $(OBJDIR)/juce_GZIPCompressorOutputStream.o \ - $(OBJDIR)/juce_GZIPDecompressorInputStream.o \ - $(OBJDIR)/juce_InputStream.o \ - $(OBJDIR)/juce_MemoryInputStream.o \ - $(OBJDIR)/juce_MemoryOutputStream.o \ - $(OBJDIR)/juce_OutputStream.o \ + $(OBJDIR)/juce_FileInputSource.o \ $(OBJDIR)/juce_SubregionStream.o \ - $(OBJDIR)/juce_CharacterFunctions.o \ - $(OBJDIR)/juce_LocalisedStrings.o \ - $(OBJDIR)/juce_String.o \ + $(OBJDIR)/juce_GZIPDecompressorInputStream.o \ + $(OBJDIR)/juce_MemoryInputStream.o \ + $(OBJDIR)/juce_InputStream.o \ + $(OBJDIR)/juce_OutputStream.o \ + $(OBJDIR)/juce_MemoryOutputStream.o \ $(OBJDIR)/juce_StringArray.o \ - $(OBJDIR)/juce_StringPairArray.o \ $(OBJDIR)/juce_XmlDocument.o \ $(OBJDIR)/juce_XmlElement.o \ + $(OBJDIR)/juce_CharacterFunctions.o \ + $(OBJDIR)/juce_String.o \ + $(OBJDIR)/juce_LocalisedStrings.o \ + $(OBJDIR)/juce_StringPairArray.o \ $(OBJDIR)/juce_ReadWriteLock.o \ - $(OBJDIR)/juce_Thread.o \ $(OBJDIR)/juce_ThreadPool.o \ $(OBJDIR)/juce_TimeSliceThread.o \ - $(OBJDIR)/juce_Application.o \ + $(OBJDIR)/juce_Thread.o \ + $(OBJDIR)/juce_ApplicationProperties.o \ $(OBJDIR)/juce_ApplicationCommandInfo.o \ + $(OBJDIR)/juce_Application.o \ $(OBJDIR)/juce_ApplicationCommandManager.o \ $(OBJDIR)/juce_ApplicationCommandTarget.o \ - $(OBJDIR)/juce_ApplicationProperties.o \ - $(OBJDIR)/juce_AudioDataConverters.o \ $(OBJDIR)/juce_AudioSampleBuffer.o \ $(OBJDIR)/juce_IIRFilter.o \ - $(OBJDIR)/juce_MidiBuffer.o \ - $(OBJDIR)/juce_MidiFile.o \ + $(OBJDIR)/juce_AudioDataConverters.o \ $(OBJDIR)/juce_MidiKeyboardState.o \ + $(OBJDIR)/juce_MidiBuffer.o \ + $(OBJDIR)/juce_MidiMessageSequence.o \ + $(OBJDIR)/juce_MidiFile.o \ $(OBJDIR)/juce_MidiMessage.o \ $(OBJDIR)/juce_MidiMessageCollector.o \ - $(OBJDIR)/juce_MidiMessageSequence.o \ - $(OBJDIR)/juce_AudioProcessor.o \ $(OBJDIR)/juce_AudioProcessorEditor.o \ - $(OBJDIR)/juce_AudioProcessorGraph.o \ - $(OBJDIR)/juce_AudioProcessorPlayer.o \ $(OBJDIR)/juce_GenericAudioProcessorEditor.o \ - $(OBJDIR)/juce_AudioPluginFormat.o \ + $(OBJDIR)/juce_AudioProcessorPlayer.o \ + $(OBJDIR)/juce_AudioProcessorGraph.o \ + $(OBJDIR)/juce_AudioProcessor.o \ $(OBJDIR)/juce_AudioPluginFormatManager.o \ - $(OBJDIR)/juce_AudioPluginInstance.o \ $(OBJDIR)/juce_KnownPluginList.o \ - $(OBJDIR)/juce_PluginDescription.o \ - $(OBJDIR)/juce_PluginDirectoryScanner.o \ $(OBJDIR)/juce_PluginListComponent.o \ + $(OBJDIR)/juce_AudioPluginFormat.o \ + $(OBJDIR)/juce_PluginDirectoryScanner.o \ + $(OBJDIR)/juce_PluginDescription.o \ + $(OBJDIR)/juce_AudioPluginInstance.o \ $(OBJDIR)/juce_VSTPluginFormat.o \ + $(OBJDIR)/juce_WavAudioFormat.o \ + $(OBJDIR)/juce_FlacAudioFormat.o \ + $(OBJDIR)/juce_AudioThumbnail.o \ + $(OBJDIR)/juce_AudioFormat.o \ $(OBJDIR)/juce_AiffAudioFormat.o \ $(OBJDIR)/juce_AudioCDReader.o \ - $(OBJDIR)/juce_AudioFormat.o \ + $(OBJDIR)/juce_QuickTimeAudioFormat.o \ $(OBJDIR)/juce_AudioFormatManager.o \ $(OBJDIR)/juce_AudioSubsectionReader.o \ - $(OBJDIR)/juce_AudioThumbnail.o \ $(OBJDIR)/juce_AudioThumbnailCache.o \ - $(OBJDIR)/juce_FlacAudioFormat.o \ $(OBJDIR)/juce_OggVorbisAudioFormat.o \ - $(OBJDIR)/juce_QuickTimeAudioFormat.o \ - $(OBJDIR)/juce_WavAudioFormat.o \ - $(OBJDIR)/juce_AudioFormatReaderSource.o \ - $(OBJDIR)/juce_AudioSourcePlayer.o \ - $(OBJDIR)/juce_AudioTransportSource.o \ - $(OBJDIR)/juce_BufferingAudioSource.o \ $(OBJDIR)/juce_ChannelRemappingAudioSource.o \ - $(OBJDIR)/juce_IIRFilterAudioSource.o \ - $(OBJDIR)/juce_MixerAudioSource.o \ - $(OBJDIR)/juce_ResamplingAudioSource.o \ + $(OBJDIR)/juce_AudioTransportSource.o \ $(OBJDIR)/juce_ToneGeneratorAudioSource.o \ - $(OBJDIR)/juce_AudioDeviceManager.o \ - $(OBJDIR)/juce_AudioIODevice.o \ - $(OBJDIR)/juce_AudioIODeviceType.o \ + $(OBJDIR)/juce_AudioSourcePlayer.o \ + $(OBJDIR)/juce_AudioFormatReaderSource.o \ + $(OBJDIR)/juce_ResamplingAudioSource.o \ + $(OBJDIR)/juce_MixerAudioSource.o \ + $(OBJDIR)/juce_IIRFilterAudioSource.o \ + $(OBJDIR)/juce_BufferingAudioSource.o \ $(OBJDIR)/juce_MidiOutput.o \ - $(OBJDIR)/juce_Sampler.o \ + $(OBJDIR)/juce_AudioDeviceManager.o \ + $(OBJDIR)/juce_AudioIODeviceType.o \ + $(OBJDIR)/juce_AudioIODevice.o \ $(OBJDIR)/juce_Synthesiser.o \ + $(OBJDIR)/juce_Sampler.o \ $(OBJDIR)/juce_ActionBroadcaster.o \ - $(OBJDIR)/juce_ActionListenerList.o \ $(OBJDIR)/juce_AsyncUpdater.o \ - $(OBJDIR)/juce_ChangeBroadcaster.o \ $(OBJDIR)/juce_ChangeListenerList.o \ - $(OBJDIR)/juce_InterprocessConnection.o \ - $(OBJDIR)/juce_InterprocessConnectionServer.o \ - $(OBJDIR)/juce_Message.o \ - $(OBJDIR)/juce_MessageListener.o \ $(OBJDIR)/juce_MessageManager.o \ + $(OBJDIR)/juce_InterprocessConnection.o \ + $(OBJDIR)/juce_Message.o \ $(OBJDIR)/juce_MultiTimer.o \ + $(OBJDIR)/juce_InterprocessConnectionServer.o \ + $(OBJDIR)/juce_ChangeBroadcaster.o \ $(OBJDIR)/juce_Timer.o \ - $(OBJDIR)/juce_DeletedAtShutdown.o \ - $(OBJDIR)/juce_FileBasedDocument.o \ + $(OBJDIR)/juce_MessageListener.o \ + $(OBJDIR)/juce_ActionListenerList.o \ $(OBJDIR)/juce_PropertiesFile.o \ - $(OBJDIR)/juce_RecentlyOpenedFilesList.o \ + $(OBJDIR)/juce_DeletedAtShutdown.o \ $(OBJDIR)/juce_UndoManager.o \ + $(OBJDIR)/juce_FileBasedDocument.o \ + $(OBJDIR)/juce_RecentlyOpenedFilesList.o \ $(OBJDIR)/juce_Colour.o \ - $(OBJDIR)/juce_ColourGradient.o \ $(OBJDIR)/juce_Colours.o \ + $(OBJDIR)/juce_ColourGradient.o \ + $(OBJDIR)/juce_LowLevelGraphicsSoftwareRenderer.o \ + $(OBJDIR)/juce_Graphics.o \ $(OBJDIR)/juce_EdgeTable.o \ $(OBJDIR)/juce_FillType.o \ - $(OBJDIR)/juce_Graphics.o \ + $(OBJDIR)/juce_RectanglePlacement.o \ $(OBJDIR)/juce_Justification.o \ $(OBJDIR)/juce_LowLevelGraphicsPostScriptRenderer.o \ - $(OBJDIR)/juce_LowLevelGraphicsSoftwareRenderer.o \ - $(OBJDIR)/juce_RectanglePlacement.o \ $(OBJDIR)/juce_Drawable.o \ $(OBJDIR)/juce_DrawableComposite.o \ - $(OBJDIR)/juce_DrawableImage.o \ $(OBJDIR)/juce_DrawablePath.o \ $(OBJDIR)/juce_DrawableText.o \ + $(OBJDIR)/juce_DrawableImage.o \ $(OBJDIR)/juce_SVGParser.o \ - $(OBJDIR)/juce_DropShadowEffect.o \ $(OBJDIR)/juce_GlowEffect.o \ $(OBJDIR)/juce_ReduceOpacityEffect.o \ - $(OBJDIR)/juce_Font.o \ + $(OBJDIR)/juce_DropShadowEffect.o \ $(OBJDIR)/juce_GlyphArrangement.o \ - $(OBJDIR)/juce_TextLayout.o \ $(OBJDIR)/juce_Typeface.o \ + $(OBJDIR)/juce_Font.o \ + $(OBJDIR)/juce_TextLayout.o \ $(OBJDIR)/juce_AffineTransform.o \ - $(OBJDIR)/juce_BorderSize.o \ - $(OBJDIR)/juce_Line.o \ - $(OBJDIR)/juce_Path.o \ - $(OBJDIR)/juce_PathIterator.o \ - $(OBJDIR)/juce_PathStrokeType.o \ - $(OBJDIR)/juce_PositionedRectangle.o \ $(OBJDIR)/juce_RectangleList.o \ + $(OBJDIR)/juce_Path.o \ + $(OBJDIR)/juce_Line.o \ + $(OBJDIR)/juce_PositionedRectangle.o \ + $(OBJDIR)/juce_PathIterator.o \ + $(OBJDIR)/juce_BorderSize.o \ + $(OBJDIR)/juce_PathStrokeType.o \ + $(OBJDIR)/juce_ImageFileFormat.o \ + $(OBJDIR)/juce_ImageConvolutionKernel.o \ $(OBJDIR)/juce_Image.o \ $(OBJDIR)/juce_ImageCache.o \ - $(OBJDIR)/juce_ImageConvolutionKernel.o \ - $(OBJDIR)/juce_ImageFileFormat.o \ $(OBJDIR)/juce_GIFLoader.o \ $(OBJDIR)/juce_JPEGLoader.o \ $(OBJDIR)/juce_PNGLoader.o \ + $(OBJDIR)/juce_Desktop.o \ $(OBJDIR)/juce_Component.o \ $(OBJDIR)/juce_ComponentListener.o \ - $(OBJDIR)/juce_Desktop.o \ - $(OBJDIR)/juce_ArrowButton.o \ - $(OBJDIR)/juce_Button.o \ - $(OBJDIR)/juce_DrawableButton.o \ - $(OBJDIR)/juce_HyperlinkButton.o \ $(OBJDIR)/juce_ImageButton.o \ + $(OBJDIR)/juce_HyperlinkButton.o \ $(OBJDIR)/juce_ShapeButton.o \ + $(OBJDIR)/juce_DrawableButton.o \ $(OBJDIR)/juce_TextButton.o \ + $(OBJDIR)/juce_Button.o \ + $(OBJDIR)/juce_ArrowButton.o \ $(OBJDIR)/juce_ToggleButton.o \ $(OBJDIR)/juce_ToolbarButton.o \ - $(OBJDIR)/juce_ComboBox.o \ - $(OBJDIR)/juce_Label.o \ - $(OBJDIR)/juce_ListBox.o \ - $(OBJDIR)/juce_ProgressBar.o \ - $(OBJDIR)/juce_Slider.o \ - $(OBJDIR)/juce_TableHeaderComponent.o \ - $(OBJDIR)/juce_TableListBox.o \ - $(OBJDIR)/juce_TextEditor.o \ - $(OBJDIR)/juce_Toolbar.o \ $(OBJDIR)/juce_ToolbarItemComponent.o \ + $(OBJDIR)/juce_TableHeaderComponent.o \ + $(OBJDIR)/juce_ListBox.o \ + $(OBJDIR)/juce_Label.o \ + $(OBJDIR)/juce_TableListBox.o \ + $(OBJDIR)/juce_Slider.o \ $(OBJDIR)/juce_ToolbarItemPalette.o \ + $(OBJDIR)/juce_ComboBox.o \ + $(OBJDIR)/juce_Toolbar.o \ + $(OBJDIR)/juce_ProgressBar.o \ + $(OBJDIR)/juce_TextEditor.o \ $(OBJDIR)/juce_TreeView.o \ - $(OBJDIR)/juce_CPlusPlusCodeTokeniser.o \ - $(OBJDIR)/juce_CodeDocument.o \ $(OBJDIR)/juce_CodeEditorComponent.o \ - $(OBJDIR)/juce_DirectoryContentsDisplayComponent.o \ - $(OBJDIR)/juce_DirectoryContentsList.o \ - $(OBJDIR)/juce_FileBrowserComponent.o \ - $(OBJDIR)/juce_FileChooser.o \ + $(OBJDIR)/juce_CodeDocument.o \ + $(OBJDIR)/juce_CPlusPlusCodeTokeniser.o \ $(OBJDIR)/juce_FileChooserDialogBox.o \ - $(OBJDIR)/juce_FileFilter.o \ - $(OBJDIR)/juce_FileListComponent.o \ - $(OBJDIR)/juce_FileSearchPathListComponent.o \ - $(OBJDIR)/juce_FileTreeComponent.o \ $(OBJDIR)/juce_FilenameComponent.o \ - $(OBJDIR)/juce_ImagePreviewComponent.o \ $(OBJDIR)/juce_WildcardFileFilter.o \ + $(OBJDIR)/juce_FileChooser.o \ + $(OBJDIR)/juce_DirectoryContentsList.o \ + $(OBJDIR)/juce_FileFilter.o \ + $(OBJDIR)/juce_FileTreeComponent.o \ + $(OBJDIR)/juce_FileSearchPathListComponent.o \ + $(OBJDIR)/juce_ImagePreviewComponent.o \ + $(OBJDIR)/juce_FileBrowserComponent.o \ + $(OBJDIR)/juce_DirectoryContentsDisplayComponent.o \ + $(OBJDIR)/juce_FileListComponent.o \ $(OBJDIR)/juce_KeyListener.o \ - $(OBJDIR)/juce_KeyMappingEditorComponent.o \ - $(OBJDIR)/juce_KeyPress.o \ - $(OBJDIR)/juce_KeyPressMappingSet.o \ $(OBJDIR)/juce_KeyboardFocusTraverser.o \ $(OBJDIR)/juce_ModifierKeys.o \ - $(OBJDIR)/juce_ComponentAnimator.o \ + $(OBJDIR)/juce_KeyPressMappingSet.o \ + $(OBJDIR)/juce_KeyPress.o \ + $(OBJDIR)/juce_KeyMappingEditorComponent.o \ + $(OBJDIR)/juce_MultiDocumentPanel.o \ $(OBJDIR)/juce_ComponentBoundsConstrainer.o \ + $(OBJDIR)/juce_StretchableObjectResizer.o \ + $(OBJDIR)/juce_StretchableLayoutResizerBar.o \ + $(OBJDIR)/juce_TabbedButtonBar.o \ $(OBJDIR)/juce_ComponentMovementWatcher.o \ $(OBJDIR)/juce_GroupComponent.o \ - $(OBJDIR)/juce_MultiDocumentPanel.o \ - $(OBJDIR)/juce_ResizableBorderComponent.o \ - $(OBJDIR)/juce_ResizableCornerComponent.o \ - $(OBJDIR)/juce_ScrollBar.o \ - $(OBJDIR)/juce_StretchableLayoutManager.o \ - $(OBJDIR)/juce_StretchableLayoutResizerBar.o \ - $(OBJDIR)/juce_StretchableObjectResizer.o \ - $(OBJDIR)/juce_TabbedButtonBar.o \ - $(OBJDIR)/juce_TabbedComponent.o \ + $(OBJDIR)/juce_ComponentAnimator.o \ $(OBJDIR)/juce_Viewport.o \ + $(OBJDIR)/juce_ResizableBorderComponent.o \ + $(OBJDIR)/juce_TabbedComponent.o \ + $(OBJDIR)/juce_ResizableCornerComponent.o \ + $(OBJDIR)/juce_StretchableLayoutManager.o \ + $(OBJDIR)/juce_ScrollBar.o \ $(OBJDIR)/juce_LookAndFeel.o \ $(OBJDIR)/juce_OldSchoolLookAndFeel.o \ - $(OBJDIR)/juce_MenuBarComponent.o \ $(OBJDIR)/juce_MenuBarModel.o \ $(OBJDIR)/juce_PopupMenu.o \ - $(OBJDIR)/juce_ComponentDragger.o \ - $(OBJDIR)/juce_DragAndDropContainer.o \ - $(OBJDIR)/juce_MouseCursor.o \ + $(OBJDIR)/juce_MenuBarComponent.o \ $(OBJDIR)/juce_MouseEvent.o \ - $(OBJDIR)/juce_MouseHoverDetector.o \ - $(OBJDIR)/juce_MouseInputSource.o \ + $(OBJDIR)/juce_ComponentDragger.o \ $(OBJDIR)/juce_MouseListener.o \ - $(OBJDIR)/juce_BooleanPropertyComponent.o \ - $(OBJDIR)/juce_ButtonPropertyComponent.o \ - $(OBJDIR)/juce_ChoicePropertyComponent.o \ + $(OBJDIR)/juce_MouseCursor.o \ + $(OBJDIR)/juce_MouseHoverDetector.o \ + $(OBJDIR)/juce_DragAndDropContainer.o \ + $(OBJDIR)/juce_MouseInputSource.o \ $(OBJDIR)/juce_PropertyComponent.o \ + $(OBJDIR)/juce_ChoicePropertyComponent.o \ + $(OBJDIR)/juce_ButtonPropertyComponent.o \ $(OBJDIR)/juce_PropertyPanel.o \ - $(OBJDIR)/juce_SliderPropertyComponent.o \ $(OBJDIR)/juce_TextPropertyComponent.o \ - $(OBJDIR)/juce_AudioDeviceSelectorComponent.o \ - $(OBJDIR)/juce_BubbleComponent.o \ - $(OBJDIR)/juce_BubbleMessageComponent.o \ + $(OBJDIR)/juce_BooleanPropertyComponent.o \ + $(OBJDIR)/juce_SliderPropertyComponent.o \ $(OBJDIR)/juce_ColourSelector.o \ - $(OBJDIR)/juce_DropShadower.o \ - $(OBJDIR)/juce_MagnifierComponent.o \ - $(OBJDIR)/juce_MidiKeyboardComponent.o \ $(OBJDIR)/juce_OpenGLComponent.o \ - $(OBJDIR)/juce_PreferencesPanel.o \ + $(OBJDIR)/juce_BubbleMessageComponent.o \ + $(OBJDIR)/juce_BubbleComponent.o \ + $(OBJDIR)/juce_MagnifierComponent.o \ $(OBJDIR)/juce_SystemTrayIconComponent.o \ - $(OBJDIR)/juce_AlertWindow.o \ + $(OBJDIR)/juce_AudioDeviceSelectorComponent.o \ + $(OBJDIR)/juce_MidiKeyboardComponent.o \ + $(OBJDIR)/juce_DropShadower.o \ + $(OBJDIR)/juce_PreferencesPanel.o \ $(OBJDIR)/juce_ComponentPeer.o \ + $(OBJDIR)/juce_AlertWindow.o \ $(OBJDIR)/juce_DialogWindow.o \ - $(OBJDIR)/juce_DocumentWindow.o \ $(OBJDIR)/juce_ResizableWindow.o \ - $(OBJDIR)/juce_SplashScreen.o \ $(OBJDIR)/juce_ThreadWithProgressWindow.o \ - $(OBJDIR)/juce_TooltipWindow.o \ + $(OBJDIR)/juce_SplashScreen.o \ + $(OBJDIR)/juce_DocumentWindow.o \ $(OBJDIR)/juce_TopLevelWindow.o \ - $(OBJDIR)/juce_linux_Audio.o \ - $(OBJDIR)/juce_linux_AudioCDReader.o \ + $(OBJDIR)/juce_TooltipWindow.o \ $(OBJDIR)/juce_linux_Clipboard.o \ - $(OBJDIR)/juce_linux_FileChooser.o \ - $(OBJDIR)/juce_linux_Files.o \ $(OBJDIR)/juce_linux_Fonts.o \ - $(OBJDIR)/juce_linux_JackAudio.o \ - $(OBJDIR)/juce_linux_Messaging.o \ - $(OBJDIR)/juce_linux_Midi.o \ + $(OBJDIR)/juce_linux_Files.o \ $(OBJDIR)/juce_linux_Network.o \ - $(OBJDIR)/juce_linux_SystemStats.o \ - $(OBJDIR)/juce_linux_Threads.o \ $(OBJDIR)/juce_linux_WebBrowserComponent.o \ + $(OBJDIR)/juce_linux_FileChooser.o \ + $(OBJDIR)/juce_linux_AudioCDReader.o \ + $(OBJDIR)/juce_linux_Threads.o \ $(OBJDIR)/juce_linux_Windowing.o \ + $(OBJDIR)/juce_linux_Midi.o \ + $(OBJDIR)/juce_linux_Messaging.o \ + $(OBJDIR)/juce_linux_JackAudio.o \ + $(OBJDIR)/juce_linux_Audio.o \ + $(OBJDIR)/juce_linux_SystemStats.o \ $(OBJDIR)/juce_linux_NativeCode.o \ MKDIR_TYPE := msdos @@ -350,32 +350,17 @@ else -@if exist $(subst /,\,$(OBJDIR)) rmdir /s /q $(subst /,\,$(OBJDIR)) endif -$(OBJDIR)/juce_FileLogger.o: ../../src/core/juce_FileLogger.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_Logger.o: ../../src/core/juce_Logger.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_PerformanceCounter.o: ../../src/core/juce_PerformanceCounter.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_Random.o: ../../src/core/juce_Random.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_RelativeTime.o: ../../src/core/juce_RelativeTime.cpp +$(OBJDIR)/juce_SystemStats.o: ../../src/core/juce_SystemStats.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_SystemStats.o: ../../src/core/juce_SystemStats.cpp +$(OBJDIR)/juce_RelativeTime.o: ../../src/core/juce_RelativeTime.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -390,7 +375,17 @@ $(OBJDIR)/juce_Uuid.o: ../../src/core/juce_Uuid.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_BlowFish.o: ../../src/cryptography/juce_BlowFish.cpp +$(OBJDIR)/juce_FileLogger.o: ../../src/core/juce_FileLogger.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_Logger.o: ../../src/core/juce_Logger.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_PerformanceCounter.o: ../../src/core/juce_PerformanceCounter.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -410,12 +405,7 @@ $(OBJDIR)/juce_RSAKey.o: ../../src/cryptography/juce_RSAKey.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_BitArray.o: ../../src/containers/juce_BitArray.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_DynamicObject.o: ../../src/containers/juce_DynamicObject.cpp +$(OBJDIR)/juce_BlowFish.o: ../../src/cryptography/juce_BlowFish.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -425,21 +415,6 @@ $(OBJDIR)/juce_MemoryBlock.o: ../../src/containers/juce_MemoryBlock.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_NamedValueSet.o: ../../src/containers/juce_NamedValueSet.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_PropertySet.o: ../../src/containers/juce_PropertySet.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_Value.o: ../../src/containers/juce_Value.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_ValueTree.o: ../../src/containers/juce_ValueTree.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -450,7 +425,32 @@ $(OBJDIR)/juce_Variant.o: ../../src/containers/juce_Variant.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_DirectoryIterator.o: ../../src/io/files/juce_DirectoryIterator.cpp +$(OBJDIR)/juce_Value.o: ../../src/containers/juce_Value.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_NamedValueSet.o: ../../src/containers/juce_NamedValueSet.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_BitArray.o: ../../src/containers/juce_BitArray.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_PropertySet.o: ../../src/containers/juce_PropertySet.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_DynamicObject.o: ../../src/containers/juce_DynamicObject.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_FileOutputStream.o: ../../src/io/files/juce_FileOutputStream.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -465,32 +465,27 @@ $(OBJDIR)/juce_FileInputStream.o: ../../src/io/files/juce_FileInputStream.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_FileOutputStream.o: ../../src/io/files/juce_FileOutputStream.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_FileSearchPath.o: ../../src/io/files/juce_FileSearchPath.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_NamedPipe.o: ../../src/io/files/juce_NamedPipe.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_DirectoryIterator.o: ../../src/io/files/juce_DirectoryIterator.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_TemporaryFile.o: ../../src/io/files/juce_TemporaryFile.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ZipFile.o: ../../src/io/files/juce_ZipFile.cpp +$(OBJDIR)/juce_FileSearchPath.o: ../../src/io/files/juce_FileSearchPath.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Socket.o: ../../src/io/network/juce_Socket.cpp +$(OBJDIR)/juce_ZipFile.o: ../../src/io/files/juce_ZipFile.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -500,12 +495,12 @@ $(OBJDIR)/juce_URL.o: ../../src/io/network/juce_URL.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_BufferedInputStream.o: ../../src/io/streams/juce_BufferedInputStream.cpp +$(OBJDIR)/juce_Socket.o: ../../src/io/network/juce_Socket.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_FileInputSource.o: ../../src/io/streams/juce_FileInputSource.cpp +$(OBJDIR)/juce_BufferedInputStream.o: ../../src/io/streams/juce_BufferedInputStream.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -515,27 +510,7 @@ $(OBJDIR)/juce_GZIPCompressorOutputStream.o: ../../src/io/streams/juce_GZIPCompr @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_GZIPDecompressorInputStream.o: ../../src/io/streams/juce_GZIPDecompressorInputStream.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_BufferedInputStream.o: ../../src/io/streams/juce_BufferedInputStream.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_MemoryInputStream.o: ../../src/io/streams/juce_MemoryInputStream.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_MemoryOutputStream.o: ../../src/io/streams/juce_MemoryOutputStream.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_OutputStream.o: ../../src/io/streams/juce_OutputStream.cpp +$(OBJDIR)/juce_FileInputSource.o: ../../src/io/streams/juce_FileInputSource.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -545,17 +520,27 @@ $(OBJDIR)/juce_SubregionStream.o: ../../src/io/streams/juce_SubregionStream.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_CharacterFunctions.o: ../../src/text/juce_CharacterFunctions.cpp +$(OBJDIR)/juce_GZIPDecompressorInputStream.o: ../../src/io/streams/juce_GZIPDecompressorInputStream.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_LocalisedStrings.o: ../../src/text/juce_LocalisedStrings.cpp +$(OBJDIR)/juce_MemoryInputStream.o: ../../src/io/streams/juce_MemoryInputStream.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_String.o: ../../src/text/juce_String.cpp +$(OBJDIR)/juce_InputStream.o: ../../src/io/streams/juce_InputStream.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_OutputStream.o: ../../src/io/streams/juce_OutputStream.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_MemoryOutputStream.o: ../../src/io/streams/juce_MemoryOutputStream.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -565,11 +550,6 @@ $(OBJDIR)/juce_StringArray.o: ../../src/text/juce_StringArray.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_StringPairArray.o: ../../src/text/juce_StringPairArray.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_XmlDocument.o: ../../src/text/juce_XmlDocument.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -580,12 +560,27 @@ $(OBJDIR)/juce_XmlElement.o: ../../src/text/juce_XmlElement.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ReadWriteLock.o: ../../src/threads/juce_ReadWriteLock.cpp +$(OBJDIR)/juce_CharacterFunctions.o: ../../src/text/juce_CharacterFunctions.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Thread.o: ../../src/threads/juce_Thread.cpp +$(OBJDIR)/juce_String.o: ../../src/text/juce_String.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_LocalisedStrings.o: ../../src/text/juce_LocalisedStrings.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_StringPairArray.o: ../../src/text/juce_StringPairArray.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_ReadWriteLock.o: ../../src/threads/juce_ReadWriteLock.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -600,7 +595,12 @@ $(OBJDIR)/juce_TimeSliceThread.o: ../../src/threads/juce_TimeSliceThread.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Application.o: ../../src/application/juce_Application.cpp +$(OBJDIR)/juce_Thread.o: ../../src/threads/juce_Thread.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_ApplicationProperties.o: ../../src/application/juce_ApplicationProperties.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -610,6 +610,11 @@ $(OBJDIR)/juce_ApplicationCommandInfo.o: ../../src/application/juce_ApplicationC @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_Application.o: ../../src/application/juce_Application.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_ApplicationCommandManager.o: ../../src/application/juce_ApplicationCommandManager.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -620,16 +625,6 @@ $(OBJDIR)/juce_ApplicationCommandTarget.o: ../../src/application/juce_Applicatio @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ApplicationProperties.o: ../../src/application/juce_ApplicationProperties.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_AudioDataConverters.o: ../../src/audio/dsp/juce_AudioDataConverters.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_AudioSampleBuffer.o: ../../src/audio/dsp/juce_AudioSampleBuffer.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -640,12 +635,7 @@ $(OBJDIR)/juce_IIRFilter.o: ../../src/audio/dsp/juce_IIRFilter.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_MidiBuffer.o: ../../src/audio/midi/juce_MidiBuffer.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_MidiFile.o: ../../src/audio/midi/juce_MidiFile.cpp +$(OBJDIR)/juce_AudioDataConverters.o: ../../src/audio/dsp/juce_AudioDataConverters.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -655,6 +645,21 @@ $(OBJDIR)/juce_MidiKeyboardState.o: ../../src/audio/midi/juce_MidiKeyboardState. @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_MidiBuffer.o: ../../src/audio/midi/juce_MidiBuffer.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_MidiMessageSequence.o: ../../src/audio/midi/juce_MidiMessageSequence.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_MidiFile.o: ../../src/audio/midi/juce_MidiFile.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_MidiMessage.o: ../../src/audio/midi/juce_MidiMessage.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -665,37 +670,27 @@ $(OBJDIR)/juce_MidiMessageCollector.o: ../../src/audio/midi/juce_MidiMessageColl @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_MidiMessageSequence.o: ../../src/audio/midi/juce_MidiMessageSequence.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_AudioProcessor.o: ../../src/audio/processors/juce_AudioProcessor.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_AudioProcessorEditor.o: ../../src/audio/processors/juce_AudioProcessorEditor.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AudioProcessorGraph.o: ../../src/audio/processors/juce_AudioProcessorGraph.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_AudioProcessorPlayer.o: ../../src/audio/processors/juce_AudioProcessorPlayer.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_GenericAudioProcessorEditor.o: ../../src/audio/processors/juce_GenericAudioProcessorEditor.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AudioPluginFormat.o: ../../src/audio/plugins/juce_AudioPluginFormat.cpp +$(OBJDIR)/juce_AudioProcessorPlayer.o: ../../src/audio/processors/juce_AudioProcessorPlayer.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_AudioProcessorGraph.o: ../../src/audio/processors/juce_AudioProcessorGraph.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_AudioProcessor.o: ../../src/audio/processors/juce_AudioProcessor.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -705,41 +700,61 @@ $(OBJDIR)/juce_AudioPluginFormatManager.o: ../../src/audio/plugins/juce_AudioPlu @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AudioPluginInstance.o: ../../src/audio/plugins/juce_AudioPluginInstance.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_KnownPluginList.o: ../../src/audio/plugins/juce_KnownPluginList.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_PluginDescription.o: ../../src/audio/plugins/juce_PluginDescription.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_PluginDescription.o: ../../src/audio/plugins/juce_PluginDescription.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_PluginDirectoryScanner.o: ../../src/audio/plugins/juce_PluginDirectoryScanner.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_PluginListComponent.o: ../../src/audio/plugins/juce_PluginListComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_AudioPluginFormat.o: ../../src/audio/plugins/juce_AudioPluginFormat.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_PluginDirectoryScanner.o: ../../src/audio/plugins/juce_PluginDirectoryScanner.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_PluginDescription.o: ../../src/audio/plugins/juce_PluginDescription.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_AudioPluginInstance.o: ../../src/audio/plugins/juce_AudioPluginInstance.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_VSTPluginFormat.o: ../../src/audio/plugins/formats/juce_VSTPluginFormat.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_WavAudioFormat.o: ../../src/audio/audio_file_formats/juce_WavAudioFormat.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_FlacAudioFormat.o: ../../src/audio/audio_file_formats/juce_FlacAudioFormat.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_AudioThumbnail.o: ../../src/audio/audio_file_formats/juce_AudioThumbnail.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_AudioFormat.o: ../../src/audio/audio_file_formats/juce_AudioFormat.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_AiffAudioFormat.o: ../../src/audio/audio_file_formats/juce_AiffAudioFormat.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -750,7 +765,7 @@ $(OBJDIR)/juce_AudioCDReader.o: ../../src/audio/audio_file_formats/juce_AudioCDR @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AudioFormat.o: ../../src/audio/audio_file_formats/juce_AudioFormat.cpp +$(OBJDIR)/juce_QuickTimeAudioFormat.o: ../../src/audio/audio_file_formats/juce_QuickTimeAudioFormat.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -765,42 +780,17 @@ $(OBJDIR)/juce_AudioSubsectionReader.o: ../../src/audio/audio_file_formats/juce_ @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AudioThumbnail.o: ../../src/audio/audio_file_formats/juce_AudioThumbnail.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_AudioThumbnailCache.o: ../../src/audio/audio_file_formats/juce_AudioThumbnailCache.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_FlacAudioFormat.o: ../../src/audio/audio_file_formats/juce_FlacAudioFormat.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_OggVorbisAudioFormat.o: ../../src/audio/audio_file_formats/juce_OggVorbisAudioFormat.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_QuickTimeAudioFormat.o: ../../src/audio/audio_file_formats/juce_QuickTimeAudioFormat.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_WavAudioFormat.o: ../../src/audio/audio_file_formats/juce_WavAudioFormat.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_AudioFormatReaderSource.o: ../../src/audio/audio_sources/juce_AudioFormatReaderSource.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_AudioSourcePlayer.o: ../../src/audio/audio_sources/juce_AudioSourcePlayer.cpp +$(OBJDIR)/juce_ChannelRemappingAudioSource.o: ../../src/audio/audio_sources/juce_ChannelRemappingAudioSource.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -810,22 +800,17 @@ $(OBJDIR)/juce_AudioTransportSource.o: ../../src/audio/audio_sources/juce_AudioT @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_BufferingAudioSource.o: ../../src/audio/audio_sources/juce_BufferingAudioSource.cpp +$(OBJDIR)/juce_ToneGeneratorAudioSource.o: ../../src/audio/audio_sources/juce_ToneGeneratorAudioSource.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ChannelRemappingAudioSource.o: ../../src/audio/audio_sources/juce_ChannelRemappingAudioSource.cpp +$(OBJDIR)/juce_AudioSourcePlayer.o: ../../src/audio/audio_sources/juce_AudioSourcePlayer.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_IIRFilterAudioSource.o: ../../src/audio/audio_sources/juce_IIRFilterAudioSource.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_MixerAudioSource.o: ../../src/audio/audio_sources/juce_MixerAudioSource.cpp +$(OBJDIR)/juce_AudioFormatReaderSource.o: ../../src/audio/audio_sources/juce_AudioFormatReaderSource.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -835,22 +820,17 @@ $(OBJDIR)/juce_ResamplingAudioSource.o: ../../src/audio/audio_sources/juce_Resam @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ToneGeneratorAudioSource.o: ../../src/audio/audio_sources/juce_ToneGeneratorAudioSource.cpp +$(OBJDIR)/juce_MixerAudioSource.o: ../../src/audio/audio_sources/juce_MixerAudioSource.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AudioDeviceManager.o: ../../src/audio/devices/juce_AudioDeviceManager.cpp +$(OBJDIR)/juce_IIRFilterAudioSource.o: ../../src/audio/audio_sources/juce_IIRFilterAudioSource.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AudioIODevice.o: ../../src/audio/devices/juce_AudioIODevice.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_AudioIODeviceType.o: ../../src/audio/devices/juce_AudioIODeviceType.cpp +$(OBJDIR)/juce_BufferingAudioSource.o: ../../src/audio/audio_sources/juce_BufferingAudioSource.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -860,7 +840,17 @@ $(OBJDIR)/juce_MidiOutput.o: ../../src/audio/devices/juce_MidiOutput.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Sampler.o: ../../src/audio/synthesisers/juce_Sampler.cpp +$(OBJDIR)/juce_AudioDeviceManager.o: ../../src/audio/devices/juce_AudioDeviceManager.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_AudioIODeviceType.o: ../../src/audio/devices/juce_AudioIODeviceType.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_AudioIODevice.o: ../../src/audio/devices/juce_AudioIODevice.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -870,77 +860,67 @@ $(OBJDIR)/juce_Synthesiser.o: ../../src/audio/synthesisers/juce_Synthesiser.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_Sampler.o: ../../src/audio/synthesisers/juce_Sampler.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_ActionBroadcaster.o: ../../src/events/juce_ActionBroadcaster.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ActionListenerList.o: ../../src/events/juce_ActionListenerList.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_ActionListenerList.o: ../../src/events/juce_ActionListenerList.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_AsyncUpdater.o: ../../src/events/juce_AsyncUpdater.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ChangeBroadcaster.o: ../../src/events/juce_ChangeBroadcaster.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_ChangeListenerList.o: ../../src/events/juce_ChangeListenerList.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_InterprocessConnection.o: ../../src/events/juce_InterprocessConnection.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_InterprocessConnectionServer.o: ../../src/events/juce_InterprocessConnectionServer.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_Message.o: ../../src/events/juce_Message.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_MessageListener.o: ../../src/events/juce_MessageListener.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_MessageManager.o: ../../src/events/juce_MessageManager.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_InterprocessConnection.o: ../../src/events/juce_InterprocessConnection.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_Message.o: ../../src/events/juce_Message.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_MultiTimer.o: ../../src/events/juce_MultiTimer.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_InterprocessConnectionServer.o: ../../src/events/juce_InterprocessConnectionServer.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_ChangeBroadcaster.o: ../../src/events/juce_ChangeBroadcaster.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_Timer.o: ../../src/events/juce_Timer.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_DeletedAtShutdown.o: ../../src/utilities/juce_DeletedAtShutdown.cpp +$(OBJDIR)/juce_MessageListener.o: ../../src/events/juce_MessageListener.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_FileBasedDocument.o: ../../src/utilities/juce_FileBasedDocument.cpp +$(OBJDIR)/juce_ActionListenerList.o: ../../src/events/juce_ActionListenerList.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -950,7 +930,7 @@ $(OBJDIR)/juce_PropertiesFile.o: ../../src/utilities/juce_PropertiesFile.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_RecentlyOpenedFilesList.o: ../../src/utilities/juce_RecentlyOpenedFilesList.cpp +$(OBJDIR)/juce_DeletedAtShutdown.o: ../../src/utilities/juce_DeletedAtShutdown.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -960,7 +940,12 @@ $(OBJDIR)/juce_UndoManager.o: ../../src/utilities/juce_UndoManager.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Colour.o: ../../src/gui/graphics/colour/juce_Colour.cpp +$(OBJDIR)/juce_FileBasedDocument.o: ../../src/utilities/juce_FileBasedDocument.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_RecentlyOpenedFilesList.o: ../../src/utilities/juce_RecentlyOpenedFilesList.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -970,12 +955,22 @@ $(OBJDIR)/juce_Colour.o: ../../src/gui/graphics/colour/juce_Colour.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_Colours.o: ../../src/gui/graphics/colour/juce_Colours.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_ColourGradient.o: ../../src/gui/graphics/colour/juce_ColourGradient.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Colours.o: ../../src/gui/graphics/colour/juce_Colours.cpp +$(OBJDIR)/juce_LowLevelGraphicsSoftwareRenderer.o: ../../src/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_Graphics.o: ../../src/gui/graphics/contexts/juce_Graphics.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -990,7 +985,7 @@ $(OBJDIR)/juce_FillType.o: ../../src/gui/graphics/contexts/juce_FillType.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Graphics.o: ../../src/gui/graphics/contexts/juce_Graphics.cpp +$(OBJDIR)/juce_RectanglePlacement.o: ../../src/gui/graphics/contexts/juce_RectanglePlacement.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1005,16 +1000,6 @@ $(OBJDIR)/juce_LowLevelGraphicsPostScriptRenderer.o: ../../src/gui/graphics/cont @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_LowLevelGraphicsSoftwareRenderer.o: ../../src/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_RectanglePlacement.o: ../../src/gui/graphics/contexts/juce_RectanglePlacement.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_Drawable.o: ../../src/gui/graphics/drawables/juce_Drawable.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -1025,11 +1010,6 @@ $(OBJDIR)/juce_DrawableComposite.o: ../../src/gui/graphics/drawables/juce_Drawab @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_DrawableImage.o: ../../src/gui/graphics/drawables/juce_DrawableImage.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_DrawablePath.o: ../../src/gui/graphics/drawables/juce_DrawablePath.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -1040,12 +1020,12 @@ $(OBJDIR)/juce_DrawableText.o: ../../src/gui/graphics/drawables/juce_DrawableTex @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_SVGParser.o: ../../src/gui/graphics/drawables/juce_SVGParser.cpp +$(OBJDIR)/juce_DrawableImage.o: ../../src/gui/graphics/drawables/juce_DrawableImage.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_DropShadowEffect.o: ../../src/gui/graphics/effects/juce_DropShadowEffect.cpp +$(OBJDIR)/juce_SVGParser.o: ../../src/gui/graphics/drawables/juce_SVGParser.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1060,7 +1040,7 @@ $(OBJDIR)/juce_ReduceOpacityEffect.o: ../../src/gui/graphics/effects/juce_Reduce @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Font.o: ../../src/gui/graphics/fonts/juce_Font.cpp +$(OBJDIR)/juce_DropShadowEffect.o: ../../src/gui/graphics/effects/juce_DropShadowEffect.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1070,12 +1050,17 @@ $(OBJDIR)/juce_GlyphArrangement.o: ../../src/gui/graphics/fonts/juce_GlyphArrang @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_TextLayout.o: ../../src/gui/graphics/fonts/juce_TextLayout.cpp +$(OBJDIR)/juce_Typeface.o: ../../src/gui/graphics/fonts/juce_Typeface.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Typeface.o: ../../src/gui/graphics/fonts/juce_Typeface.cpp +$(OBJDIR)/juce_Font.o: ../../src/gui/graphics/fonts/juce_Font.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_TextLayout.o: ../../src/gui/graphics/fonts/juce_TextLayout.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1085,12 +1070,7 @@ $(OBJDIR)/juce_AffineTransform.o: ../../src/gui/graphics/geometry/juce_AffineTra @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_BorderSize.o: ../../src/gui/graphics/geometry/juce_BorderSize.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_Line.o: ../../src/gui/graphics/geometry/juce_Line.cpp +$(OBJDIR)/juce_RectangleList.o: ../../src/gui/graphics/geometry/juce_RectangleList.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1100,12 +1080,7 @@ $(OBJDIR)/juce_Path.o: ../../src/gui/graphics/geometry/juce_Path.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_PathIterator.o: ../../src/gui/graphics/geometry/juce_PathIterator.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_PathStrokeType.o: ../../src/gui/graphics/geometry/juce_PathStrokeType.cpp +$(OBJDIR)/juce_Line.o: ../../src/gui/graphics/geometry/juce_Line.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1115,7 +1090,17 @@ $(OBJDIR)/juce_PositionedRectangle.o: ../../src/gui/graphics/geometry/juce_Posit @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_RectangleList.o: ../../src/gui/graphics/geometry/juce_RectangleList.cpp +$(OBJDIR)/juce_PathIterator.o: ../../src/gui/graphics/geometry/juce_PathIterator.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_BorderSize.o: ../../src/gui/graphics/geometry/juce_BorderSize.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_PathStrokeType.o: ../../src/gui/graphics/geometry/juce_PathStrokeType.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1125,17 +1110,17 @@ $(OBJDIR)/juce_ImageFileFormat.o: ../../src/gui/graphics/imaging/juce_ImageFileF @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ImageCache.o: ../../src/gui/graphics/imaging/juce_ImageCache.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_ImageConvolutionKernel.o: ../../src/gui/graphics/imaging/juce_ImageConvolutionKernel.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ImageFileFormat.o: ../../src/gui/graphics/imaging/juce_ImageFileFormat.cpp +$(OBJDIR)/juce_Image.o: ../../src/gui/graphics/imaging/juce_Image.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_ImageCache.o: ../../src/gui/graphics/imaging/juce_ImageCache.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1155,7 +1140,7 @@ $(OBJDIR)/juce_PNGLoader.o: ../../src/gui/graphics/imaging/image_file_formats/ju @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Component.o: ../../src/gui/components/juce_Component.cpp +$(OBJDIR)/juce_Desktop.o: ../../src/gui/components/juce_Desktop.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1170,22 +1155,7 @@ $(OBJDIR)/juce_ComponentListener.o: ../../src/gui/components/juce_ComponentListe @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Desktop.o: ../../src/gui/components/juce_Desktop.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_ArrowButton.o: ../../src/gui/components/buttons/juce_ArrowButton.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_Button.o: ../../src/gui/components/buttons/juce_Button.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_DrawableButton.o: ../../src/gui/components/buttons/juce_DrawableButton.cpp +$(OBJDIR)/juce_ImageButton.o: ../../src/gui/components/buttons/juce_ImageButton.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1195,21 +1165,31 @@ $(OBJDIR)/juce_HyperlinkButton.o: ../../src/gui/components/buttons/juce_Hyperlin @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ImageButton.o: ../../src/gui/components/buttons/juce_ImageButton.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_ShapeButton.o: ../../src/gui/components/buttons/juce_ShapeButton.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_DrawableButton.o: ../../src/gui/components/buttons/juce_DrawableButton.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_TextButton.o: ../../src/gui/components/buttons/juce_TextButton.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_Button.o: ../../src/gui/components/buttons/juce_Button.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_ArrowButton.o: ../../src/gui/components/buttons/juce_ArrowButton.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_ToggleButton.o: ../../src/gui/components/buttons/juce_ToggleButton.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -1220,27 +1200,7 @@ $(OBJDIR)/juce_ToolbarButton.o: ../../src/gui/components/buttons/juce_ToolbarBut @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ComboBox.o: ../../src/gui/components/controls/juce_ComboBox.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_Label.o: ../../src/gui/components/controls/juce_Label.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_ListBox.o: ../../src/gui/components/controls/juce_ListBox.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_ProgressBar.o: ../../src/gui/components/controls/juce_ProgressBar.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_Slider.o: ../../src/gui/components/controls/juce_Slider.cpp +$(OBJDIR)/juce_ToolbarItemComponent.o: ../../src/gui/components/controls/juce_ToolbarItemComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1250,22 +1210,22 @@ $(OBJDIR)/juce_TableHeaderComponent.o: ../../src/gui/components/controls/juce_Ta @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_ListBox.o: ../../src/gui/components/controls/juce_ListBox.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_Label.o: ../../src/gui/components/controls/juce_Label.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_TableListBox.o: ../../src/gui/components/controls/juce_TableListBox.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_TextEditor.o: ../../src/gui/components/controls/juce_TextEditor.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_Toolbar.o: ../../src/gui/components/controls/juce_Toolbar.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_ToolbarItemComponent.o: ../../src/gui/components/controls/juce_ToolbarItemComponent.cpp +$(OBJDIR)/juce_Slider.o: ../../src/gui/components/controls/juce_Slider.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1275,42 +1235,42 @@ $(OBJDIR)/juce_ToolbarItemPalette.o: ../../src/gui/components/controls/juce_Tool @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_ComboBox.o: ../../src/gui/components/controls/juce_ComboBox.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_Toolbar.o: ../../src/gui/components/controls/juce_Toolbar.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_ProgressBar.o: ../../src/gui/components/controls/juce_ProgressBar.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_TextEditor.o: ../../src/gui/components/controls/juce_TextEditor.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_TreeView.o: ../../src/gui/components/controls/juce_TreeView.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_CPlusPlusCodeTokeniser.o: ../../src/gui/components/code_editor/juce_CPlusPlusCodeTokeniser.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_DirectoryContentsDisplayComponent.o: ../../src/gui/components/filebrowser/juce_DirectoryContentsDisplayComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_CodeEditorComponent.o: ../../src/gui/components/code_editor/juce_CodeEditorComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_DirectoryContentsDisplayComponent.o: ../../src/gui/components/filebrowser/juce_DirectoryContentsDisplayComponent.cpp +$(OBJDIR)/juce_CodeDocument.o: ../../src/gui/components/code_editor/juce_CodeDocument.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_DirectoryContentsList.o: ../../src/gui/components/filebrowser/juce_DirectoryContentsList.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_FileBrowserComponent.o: ../../src/gui/components/filebrowser/juce_FileBrowserComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_FileChooser.o: ../../src/gui/components/filebrowser/juce_FileChooser.cpp +$(OBJDIR)/juce_CPlusPlusCodeTokeniser.o: ../../src/gui/components/code_editor/juce_CPlusPlusCodeTokeniser.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1320,61 +1280,66 @@ $(OBJDIR)/juce_FileChooserDialogBox.o: ../../src/gui/components/filebrowser/juce @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_FileFilter.o: ../../src/gui/components/filebrowser/juce_FileFilter.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_FileListComponent.o: ../../src/gui/components/filebrowser/juce_FileListComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_FileSearchPathListComponent.o: ../../src/gui/components/filebrowser/juce_FileSearchPathListComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_FileTreeComponent.o: ../../src/gui/components/filebrowser/juce_FileTreeComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_FilenameComponent.o: ../../src/gui/components/filebrowser/juce_FilenameComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ImagePreviewComponent.o: ../../src/gui/components/filebrowser/juce_ImagePreviewComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_WildcardFileFilter.o: ../../src/gui/components/filebrowser/juce_WildcardFileFilter.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_FileChooser.o: ../../src/gui/components/filebrowser/juce_FileChooser.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_DirectoryContentsList.o: ../../src/gui/components/filebrowser/juce_DirectoryContentsList.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_FileFilter.o: ../../src/gui/components/filebrowser/juce_FileFilter.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_FileTreeComponent.o: ../../src/gui/components/filebrowser/juce_FileTreeComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_FileSearchPathListComponent.o: ../../src/gui/components/filebrowser/juce_FileSearchPathListComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_ImagePreviewComponent.o: ../../src/gui/components/filebrowser/juce_ImagePreviewComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_FileBrowserComponent.o: ../../src/gui/components/filebrowser/juce_FileBrowserComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_DirectoryContentsDisplayComponent.o: ../../src/gui/components/filebrowser/juce_DirectoryContentsDisplayComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_FileListComponent.o: ../../src/gui/components/filebrowser/juce_FileListComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_KeyListener.o: ../../src/gui/components/keyboard/juce_KeyListener.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_KeyMappingEditorComponent.o: ../../src/gui/components/keyboard/juce_KeyMappingEditorComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_KeyPress.o: ../../src/gui/components/keyboard/juce_KeyPress.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_KeyPressMappingSet.o: ../../src/gui/components/keyboard/juce_KeyPressMappingSet.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_KeyboardFocusTraverser.o: ../../src/gui/components/keyboard/juce_KeyboardFocusTraverser.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -1385,7 +1350,22 @@ $(OBJDIR)/juce_ModifierKeys.o: ../../src/gui/components/keyboard/juce_ModifierKe @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ComponentAnimator.o: ../../src/gui/components/layout/juce_ComponentAnimator.cpp +$(OBJDIR)/juce_KeyPressMappingSet.o: ../../src/gui/components/keyboard/juce_KeyPressMappingSet.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_KeyPress.o: ../../src/gui/components/keyboard/juce_KeyPress.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_KeyMappingEditorComponent.o: ../../src/gui/components/keyboard/juce_KeyMappingEditorComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_MultiDocumentPanel.o: ../../src/gui/components/layout/juce_MultiDocumentPanel.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1395,6 +1375,21 @@ $(OBJDIR)/juce_ComponentBoundsConstrainer.o: ../../src/gui/components/layout/juc @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_StretchableObjectResizer.o: ../../src/gui/components/layout/juce_StretchableObjectResizer.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_StretchableLayoutResizerBar.o: ../../src/gui/components/layout/juce_StretchableLayoutResizerBar.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_TabbedButtonBar.o: ../../src/gui/components/layout/juce_TabbedButtonBar.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_ComponentMovementWatcher.o: ../../src/gui/components/layout/juce_ComponentMovementWatcher.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -1405,7 +1400,12 @@ $(OBJDIR)/juce_GroupComponent.o: ../../src/gui/components/layout/juce_GroupCompo @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_MultiDocumentPanel.o: ../../src/gui/components/layout/juce_MultiDocumentPanel.cpp +$(OBJDIR)/juce_ComponentAnimator.o: ../../src/gui/components/layout/juce_ComponentAnimator.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_Viewport.o: ../../src/gui/components/layout/juce_Viewport.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1415,12 +1415,12 @@ $(OBJDIR)/juce_ResizableBorderComponent.o: ../../src/gui/components/layout/juce_ @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ResizableCornerComponent.o: ../../src/gui/components/layout/juce_ResizableCornerComponent.cpp +$(OBJDIR)/juce_TabbedComponent.o: ../../src/gui/components/layout/juce_TabbedComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ScrollBar.o: ../../src/gui/components/layout/juce_ScrollBar.cpp +$(OBJDIR)/juce_ResizableCornerComponent.o: ../../src/gui/components/layout/juce_ResizableCornerComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1430,27 +1430,7 @@ $(OBJDIR)/juce_StretchableLayoutManager.o: ../../src/gui/components/layout/juce_ @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_StretchableLayoutResizerBar.o: ../../src/gui/components/layout/juce_StretchableLayoutResizerBar.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_StretchableObjectResizer.o: ../../src/gui/components/layout/juce_StretchableObjectResizer.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_TabbedButtonBar.o: ../../src/gui/components/layout/juce_TabbedButtonBar.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_TabbedComponent.o: ../../src/gui/components/layout/juce_TabbedComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_Viewport.o: ../../src/gui/components/layout/juce_Viewport.cpp +$(OBJDIR)/juce_ScrollBar.o: ../../src/gui/components/layout/juce_ScrollBar.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1465,11 +1445,6 @@ $(OBJDIR)/juce_OldSchoolLookAndFeel.o: ../../src/gui/components/lookandfeel/juce @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_MenuBarComponent.o: ../../src/gui/components/menus/juce_MenuBarComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_MenuBarModel.o: ../../src/gui/components/menus/juce_MenuBarModel.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -1480,17 +1455,7 @@ $(OBJDIR)/juce_PopupMenu.o: ../../src/gui/components/menus/juce_PopupMenu.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ComponentDragger.o: ../../src/gui/components/mouse/juce_ComponentDragger.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_DragAndDropContainer.o: ../../src/gui/components/mouse/juce_DragAndDropContainer.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_MouseCursor.o: ../../src/gui/components/mouse/juce_MouseCursor.cpp +$(OBJDIR)/juce_MenuBarComponent.o: ../../src/gui/components/menus/juce_MenuBarComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1500,12 +1465,7 @@ $(OBJDIR)/juce_MouseEvent.o: ../../src/gui/components/mouse/juce_MouseEvent.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_MouseHoverDetector.o: ../../src/gui/components/mouse/juce_MouseHoverDetector.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_MouseInputSource.o: ../../src/gui/components/mouse/juce_MouseInputSource.cpp +$(OBJDIR)/juce_ComponentDragger.o: ../../src/gui/components/mouse/juce_ComponentDragger.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1515,17 +1475,22 @@ $(OBJDIR)/juce_MouseListener.o: ../../src/gui/components/mouse/juce_MouseListene @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_BooleanPropertyComponent.o: ../../src/gui/components/properties/juce_BooleanPropertyComponent.cpp +$(OBJDIR)/juce_MouseCursor.o: ../../src/gui/components/mouse/juce_MouseCursor.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ButtonPropertyComponent.o: ../../src/gui/components/properties/juce_ButtonPropertyComponent.cpp +$(OBJDIR)/juce_MouseHoverDetector.o: ../../src/gui/components/mouse/juce_MouseHoverDetector.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ChoicePropertyComponent.o: ../../src/gui/components/properties/juce_ChoicePropertyComponent.cpp +$(OBJDIR)/juce_DragAndDropContainer.o: ../../src/gui/components/mouse/juce_DragAndDropContainer.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_MouseInputSource.o: ../../src/gui/components/mouse/juce_MouseInputSource.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1535,12 +1500,17 @@ $(OBJDIR)/juce_PropertyComponent.o: ../../src/gui/components/properties/juce_Pro @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_PropertyPanel.o: ../../src/gui/components/properties/juce_PropertyPanel.cpp +$(OBJDIR)/juce_ChoicePropertyComponent.o: ../../src/gui/components/properties/juce_ChoicePropertyComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_SliderPropertyComponent.o: ../../src/gui/components/properties/juce_SliderPropertyComponent.cpp +$(OBJDIR)/juce_ButtonPropertyComponent.o: ../../src/gui/components/properties/juce_ButtonPropertyComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_PropertyPanel.o: ../../src/gui/components/properties/juce_PropertyPanel.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1550,17 +1520,12 @@ $(OBJDIR)/juce_TextPropertyComponent.o: ../../src/gui/components/properties/juce @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AudioDeviceSelectorComponent.o: ../../src/gui/components/special/juce_AudioDeviceSelectorComponent.cpp +$(OBJDIR)/juce_BooleanPropertyComponent.o: ../../src/gui/components/properties/juce_BooleanPropertyComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_BubbleComponent.o: ../../src/gui/components/special/juce_BubbleComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_BubbleMessageComponent.o: ../../src/gui/components/special/juce_BubbleMessageComponent.cpp +$(OBJDIR)/juce_SliderPropertyComponent.o: ../../src/gui/components/properties/juce_SliderPropertyComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1570,7 +1535,17 @@ $(OBJDIR)/juce_ColourSelector.o: ../../src/gui/components/special/juce_ColourSel @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_DropShadower.o: ../../src/gui/components/special/juce_DropShadower.cpp +$(OBJDIR)/juce_OpenGLComponent.o: ../../src/gui/components/special/juce_OpenGLComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_BubbleMessageComponent.o: ../../src/gui/components/special/juce_BubbleMessageComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_BubbleComponent.o: ../../src/gui/components/special/juce_BubbleComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1580,12 +1555,22 @@ $(OBJDIR)/juce_MagnifierComponent.o: ../../src/gui/components/special/juce_Magni @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_SystemTrayIconComponent.o: ../../src/gui/components/special/juce_SystemTrayIconComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_AudioDeviceSelectorComponent.o: ../../src/gui/components/special/juce_AudioDeviceSelectorComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_MidiKeyboardComponent.o: ../../src/gui/components/special/juce_MidiKeyboardComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_OpenGLComponent.o: ../../src/gui/components/special/juce_OpenGLComponent.cpp +$(OBJDIR)/juce_DropShadower.o: ../../src/gui/components/special/juce_DropShadower.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1595,7 +1580,7 @@ $(OBJDIR)/juce_PreferencesPanel.o: ../../src/gui/components/special/juce_Prefere @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_SystemTrayIconComponent.o: ../../src/gui/components/special/juce_SystemTrayIconComponent.cpp +$(OBJDIR)/juce_ComponentPeer.o: ../../src/gui/components/windows/juce_ComponentPeer.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1605,37 +1590,27 @@ $(OBJDIR)/juce_AlertWindow.o: ../../src/gui/components/windows/juce_AlertWindow. @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ComponentPeer.o: ../../src/gui/components/windows/juce_ComponentPeer.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_DialogWindow.o: ../../src/gui/components/windows/juce_DialogWindow.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_DocumentWindow.o: ../../src/gui/components/windows/juce_DocumentWindow.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_ResizableWindow.o: ../../src/gui/components/windows/juce_ResizableWindow.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_SplashScreen.o: ../../src/gui/components/windows/juce_SplashScreen.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_ThreadWithProgressWindow.o: ../../src/gui/components/windows/juce_ThreadWithProgressWindow.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_TooltipWindow.o: ../../src/gui/components/windows/juce_TooltipWindow.cpp +$(OBJDIR)/juce_SplashScreen.o: ../../src/gui/components/windows/juce_SplashScreen.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_DocumentWindow.o: ../../src/gui/components/windows/juce_DocumentWindow.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1645,12 +1620,7 @@ $(OBJDIR)/juce_TopLevelWindow.o: ../../src/gui/components/windows/juce_TopLevelW @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_Audio.o: ../../src/native/linux/juce_linux_Audio.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_linux_AudioCDReader.o: ../../src/native/linux/juce_linux_AudioCDReader.cpp +$(OBJDIR)/juce_TooltipWindow.o: ../../src/gui/components/windows/juce_TooltipWindow.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1660,7 +1630,7 @@ $(OBJDIR)/juce_linux_Clipboard.o: ../../src/native/linux/juce_linux_Clipboard.cp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_FileChooser.o: ../../src/native/linux/juce_linux_FileChooser.cpp +$(OBJDIR)/juce_linux_Fonts.o: ../../src/native/linux/juce_linux_Fonts.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1670,51 +1640,61 @@ $(OBJDIR)/juce_linux_Files.o: ../../src/native/linux/juce_linux_Files.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_Fonts.o: ../../src/native/linux/juce_linux_Fonts.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_linux_JackAudio.o: ../../src/native/linux/juce_linux_JackAudio.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_linux_Messaging.o: ../../src/native/linux/juce_linux_Messaging.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_linux_Midi.o: ../../src/native/linux/juce_linux_Midi.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_linux_Network.o: ../../src/native/linux/juce_linux_Network.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_SystemStats.o: ../../src/native/linux/juce_linux_SystemStats.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_linux_Threads.o: ../../src/native/linux/juce_linux_Threads.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_linux_WebBrowserComponent.o: ../../src/native/linux/juce_linux_WebBrowserComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_linux_FileChooser.o: ../../src/native/linux/juce_linux_FileChooser.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_linux_AudioCDReader.o: ../../src/native/linux/juce_linux_AudioCDReader.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_linux_Threads.o: ../../src/native/linux/juce_linux_Threads.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_linux_Windowing.o: ../../src/native/linux/juce_linux_Windowing.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_linux_Midi.o: ../../src/native/linux/juce_linux_Midi.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_linux_Messaging.o: ../../src/native/linux/juce_linux_Messaging.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_linux_JackAudio.o: ../../src/native/linux/juce_linux_JackAudio.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_linux_Audio.o: ../../src/native/linux/juce_linux_Audio.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_linux_SystemStats.o: ../../src/native/linux/juce_linux_SystemStats.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_linux_NativeCode.o: ../../src/native/juce_linux_NativeCode.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index 2843a834b4..7ce496694d 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -7491,7 +7491,9 @@ bool StreamingSocket::connect (const String& remoteHostName, void StreamingSocket::close() { #if JUCE_WINDOWS - closesocket (handle); + if (handle != SOCKET_ERROR || connected) + closesocket (handle); + connected = false; #else if (connected) @@ -7506,7 +7508,8 @@ void StreamingSocket::close() } } - ::close (handle); + if (handle != -1) + ::close (handle); #endif hostName = String::empty; @@ -17409,7 +17412,7 @@ ApplicationCommandTarget::CommandTargetMessageInvoker::~CommandTargetMessageInvo void ApplicationCommandTarget::CommandTargetMessageInvoker::handleMessage (const Message& message) { - const ScopedPointer info ((InvocationInfo*) message.pointerParameter); + const ScopedPointer info (static_cast (message.pointerParameter)); owner->tryToInvoke (*info, false); } @@ -25909,7 +25912,7 @@ void AudioSampleBuffer::readFromAudioReader (AudioFormatReader* reader, { for (int j = 0; j < 2; ++j) { - float* const d = (float*) (chans[j]); + float* const d = reinterpret_cast (chans[j]); if (d != 0) { @@ -36216,7 +36219,7 @@ void SamplerVoice::controllerMoved (const int /*controllerNumber*/, void SamplerVoice::renderNextBlock (AudioSampleBuffer& outputBuffer, int startSample, int numSamples) { - const SamplerSound* const playingSound = (SamplerSound*) (SynthesiserSound*) getCurrentlyPlayingSound(); + const SamplerSound* const playingSound = static_cast (getCurrentlyPlayingSound().getObject()); if (playingSound != 0) { @@ -36732,10 +36735,7 @@ void ActionListenerList::sendActionMessage (const String& message) const const ScopedLock sl (actionListenerLock_); for (int i = actionListeners_.size(); --i >= 0;) - { - postMessage (new ActionMessage (message, - (ActionListener*) actionListeners_.getUnchecked(i))); - } + postMessage (new ActionMessage (message, static_cast (actionListeners_.getUnchecked(i)))); } void ActionListenerList::handleMessage (const Message& message) @@ -36743,7 +36743,7 @@ void ActionListenerList::handleMessage (const Message& message) const ActionMessage& am = (const ActionMessage&) message; if (actionListeners_.contains (am.pointerParameter)) - ((ActionListener*) am.pointerParameter)->actionListenerCallback (am.message); + static_cast (am.pointerParameter)->actionListenerCallback (am.message); } END_JUCE_NAMESPACE @@ -36906,7 +36906,7 @@ void ChangeListenerList::sendSynchronousChangeMessage (void* const objectThatHas for (int i = listeners.size(); --i >= 0;) { - ChangeListener* const l = (ChangeListener*) listeners.getUnchecked (i); + ChangeListener* const l = static_cast (listeners.getUnchecked (i)); { const ScopedUnlock tempUnlocker (lock); @@ -39447,7 +39447,7 @@ void Component::internalHierarchyChanged() void* Component::runModalLoopCallback (void* userData) { - return (void*) (pointer_sized_int) ((Component*) userData)->runModalLoop(); + return (void*) (pointer_sized_int) static_cast (userData)->runModalLoop(); } int Component::runModalLoop() @@ -40201,7 +40201,7 @@ void Component::addMouseListener (MouseListener* const newListener, checkMessageManagerIsLocked if (mouseListeners_ == 0) - mouseListeners_ = new VoidArray(); + mouseListeners_ = new Array(); if (! mouseListeners_->contains (newListener)) { @@ -40276,7 +40276,7 @@ void Component::internalMouseEnter (MouseInputSource& source, const Point& { for (int i = mouseListeners_->size(); --i >= 0;) { - ((MouseListener*) mouseListeners_->getUnchecked(i))->mouseEnter (me); + mouseListeners_->getUnchecked(i)->mouseEnter (me); if (checker.shouldBailOut()) return; @@ -40295,7 +40295,7 @@ void Component::internalMouseEnter (MouseInputSource& source, const Point& for (int i = p->numDeepMouseListeners; --i >= 0;) { - ((MouseListener*) (p->mouseListeners_->getUnchecked(i)))->mouseEnter (me); + p->mouseListeners_->getUnchecked(i)->mouseEnter (me); if (checker.shouldBailOut()) return; @@ -40367,7 +40367,7 @@ void Component::internalMouseExit (MouseInputSource& source, const Point& r for (int i = p->numDeepMouseListeners; --i >= 0;) { - ((MouseListener*) (p->mouseListeners_->getUnchecked (i)))->mouseExit (me); + p->mouseListeners_->getUnchecked (i)->mouseExit (me); if (checker.shouldBailOut()) return; @@ -40531,7 +40531,7 @@ void Component::internalMouseDown (MouseInputSource& source, const Point& r for (int i = p->numDeepMouseListeners; --i >= 0;) { - ((MouseListener*) (p->mouseListeners_->getUnchecked (i)))->mouseDown (me); + p->mouseListeners_->getUnchecked (i)->mouseDown (me); if (checker.shouldBailOut()) return; @@ -40599,7 +40599,7 @@ void Component::internalMouseUp (MouseInputSource& source, const Point& rel for (int i = p->numDeepMouseListeners; --i >= 0;) { - ((MouseListener*) (p->mouseListeners_->getUnchecked (i)))->mouseUp (me); + p->mouseListeners_->getUnchecked (i)->mouseUp (me); if (checker.shouldBailOut()) return; @@ -40650,7 +40650,7 @@ void Component::internalMouseUp (MouseInputSource& source, const Point& rel for (int i = p->numDeepMouseListeners; --i >= 0;) { - ((MouseListener*) (p->mouseListeners_->getUnchecked (i)))->mouseDoubleClick (me); + p->mouseListeners_->getUnchecked (i)->mouseDoubleClick (me); if (checker.shouldBailOut()) return; @@ -40716,7 +40716,7 @@ void Component::internalMouseDrag (MouseInputSource& source, const Point& r for (int i = p->numDeepMouseListeners; --i >= 0;) { - ((MouseListener*) (p->mouseListeners_->getUnchecked (i)))->mouseDrag (me); + p->mouseListeners_->getUnchecked (i)->mouseDrag (me); if (checker.shouldBailOut()) return; @@ -40782,7 +40782,7 @@ void Component::internalMouseMove (MouseInputSource& source, const Point& r for (int i = p->numDeepMouseListeners; --i >= 0;) { - ((MouseListener*) (p->mouseListeners_->getUnchecked (i)))->mouseMove (me); + p->mouseListeners_->getUnchecked (i)->mouseMove (me); if (checker.shouldBailOut()) return; @@ -40848,7 +40848,7 @@ void Component::internalMouseWheel (MouseInputSource& source, const Point& for (int i = p->numDeepMouseListeners; --i >= 0;) { - ((MouseListener*) (p->mouseListeners_->getUnchecked (i)))->mouseWheelMove (me, wheelIncrementX, wheelIncrementY); + p->mouseListeners_->getUnchecked (i)->mouseWheelMove (me, wheelIncrementX, wheelIncrementY); if (checker.shouldBailOut()) return; @@ -50706,7 +50706,7 @@ struct TextAtom }; // a run of text with a single font and colour -class UniformTextSection +class TextEditor::UniformTextSection { public: @@ -50727,7 +50727,7 @@ public: atoms.ensureStorageAllocated (other.atoms.size()); for (int i = 0; i < other.atoms.size(); ++i) - atoms.add (new TextAtom (*(const TextAtom*) other.atoms.getUnchecked(i))); + atoms.add (new TextAtom (*other.atoms.getUnchecked(i))); } ~UniformTextSection() @@ -50748,16 +50748,16 @@ public: return atoms.size(); } - TextAtom* getAtom (const int index) const + TextAtom* getAtom (const int index) const throw() { - return (TextAtom*) atoms.getUnchecked (index); + return atoms.getUnchecked (index); } void append (const UniformTextSection& other, const juce_wchar passwordCharacter) { if (other.atoms.size() > 0) { - TextAtom* const lastAtom = (TextAtom*) atoms.getLast(); + TextAtom* const lastAtom = atoms.getLast(); int i = 0; if (lastAtom != 0) @@ -50891,7 +50891,7 @@ public: for (int i = atoms.size(); --i >= 0;) { - TextAtom* const atom = (TextAtom*) atoms.getUnchecked(i); + TextAtom* const atom = atoms.getUnchecked(i); atom->width = newFont.getStringWidthFloat (atom->getText (passwordCharacter)); } } @@ -50903,7 +50903,7 @@ public: Colour colour; private: - VoidArray atoms; + Array atoms; void initialiseAtoms (const String& textToParse, const juce_wchar passwordCharacter) @@ -50965,13 +50965,13 @@ private: UniformTextSection& operator= (const UniformTextSection& other); }; -class TextEditorIterator +class TextEditor::Iterator { public: - TextEditorIterator (const VoidArray& sections_, - const float wordWrapWidth_, - const juce_wchar passwordCharacter_) + Iterator (const Array & sections_, + const float wordWrapWidth_, + const juce_wchar passwordCharacter_) : indexInText (0), lineY (0), lineHeight (0), @@ -50990,14 +50990,14 @@ public: if (sections.size() > 0) { - currentSection = (const UniformTextSection*) sections.getUnchecked (sectionIndex); + currentSection = sections.getUnchecked (sectionIndex); if (currentSection != 0) beginNewLine(); } } - TextEditorIterator (const TextEditorIterator& other) + Iterator (const Iterator& other) : indexInText (other.indexInText), lineY (other.lineY), lineHeight (other.lineHeight), @@ -51015,7 +51015,7 @@ public: { } - ~TextEditorIterator() + ~Iterator() { } @@ -51072,7 +51072,7 @@ public: } atomIndex = 0; - currentSection = (const UniformTextSection*) sections.getUnchecked (sectionIndex); + currentSection = sections.getUnchecked (sectionIndex); } else { @@ -51088,7 +51088,7 @@ public: for (int section = sectionIndex + 1; section < sections.size(); ++section) { - const UniformTextSection* const s = (const UniformTextSection*) sections.getUnchecked (section); + const UniformTextSection* const s = sections.getUnchecked (section); if (s->getNumAtoms() == 0) break; @@ -51171,7 +51171,7 @@ public: int tempSectionIndex = sectionIndex; int tempAtomIndex = atomIndex; - const UniformTextSection* section = (const UniformTextSection*) sections.getUnchecked (tempSectionIndex); + const UniformTextSection* section = sections.getUnchecked (tempSectionIndex); lineHeight = section->font.getHeight(); maxDescent = section->font.getDescent(); @@ -51191,7 +51191,7 @@ public: break; tempAtomIndex = 0; - section = (const UniformTextSection*) sections.getUnchecked (tempSectionIndex); + section = sections.getUnchecked (tempSectionIndex); checkSize = true; } @@ -51354,13 +51354,13 @@ public: const UniformTextSection* currentSection; private: - const VoidArray& sections; + const Array & sections; int sectionIndex, atomIndex; const float wordWrapWidth; const juce_wchar passwordCharacter; TextAtom tempAtom; - TextEditorIterator& operator= (const TextEditorIterator&); + Iterator& operator= (const Iterator&); void moveToEndOfLastAtom() { @@ -51382,7 +51382,7 @@ private: } }; -class TextEditorInsertAction : public UndoableAction +class TextEditor::InsertAction : public UndoableAction { TextEditor& owner; const String text; @@ -51390,17 +51390,17 @@ class TextEditorInsertAction : public UndoableAction const Font font; const Colour colour; - TextEditorInsertAction (const TextEditorInsertAction&); - TextEditorInsertAction& operator= (const TextEditorInsertAction&); + InsertAction (const InsertAction&); + InsertAction& operator= (const InsertAction&); public: - TextEditorInsertAction (TextEditor& owner_, - const String& text_, - const int insertIndex_, - const Font& font_, - const Colour& colour_, - const int oldCaretPos_, - const int newCaretPos_) + InsertAction (TextEditor& owner_, + const String& text_, + const int insertIndex_, + const Font& font_, + const Colour& colour_, + const int oldCaretPos_, + const int newCaretPos_) : owner (owner_), text (text_), insertIndex (insertIndex_), @@ -51411,7 +51411,7 @@ public: { } - ~TextEditorInsertAction() + ~InsertAction() { } @@ -51433,22 +51433,22 @@ public: } }; -class TextEditorRemoveAction : public UndoableAction +class TextEditor::RemoveAction : public UndoableAction { TextEditor& owner; const Range range; const int oldCaretPos, newCaretPos; - VoidArray removedSections; + Array removedSections; - TextEditorRemoveAction (const TextEditorRemoveAction&); - TextEditorRemoveAction& operator= (const TextEditorRemoveAction&); + RemoveAction (const RemoveAction&); + RemoveAction& operator= (const RemoveAction&); public: - TextEditorRemoveAction (TextEditor& owner_, - const Range range_, - const int oldCaretPos_, - const int newCaretPos_, - const VoidArray& removedSections_) + RemoveAction (TextEditor& owner_, + const Range range_, + const int oldCaretPos_, + const int newCaretPos_, + const Array & removedSections_) : owner (owner_), range (range_), oldCaretPos (oldCaretPos_), @@ -51457,11 +51457,11 @@ public: { } - ~TextEditorRemoveAction() + ~RemoveAction() { for (int i = removedSections.size(); --i >= 0;) { - UniformTextSection* const section = (UniformTextSection*) removedSections.getUnchecked (i); + UniformTextSection* const section = removedSections.getUnchecked (i); section->clear(); delete section; } @@ -51485,24 +51485,16 @@ public: int n = 0; for (int i = removedSections.size(); --i >= 0;) - { - UniformTextSection* const section = (UniformTextSection*) removedSections.getUnchecked (i); - n += section->getTotalLength(); - } + n += removedSections.getUnchecked (i)->getTotalLength(); return n + 16; } }; -class TextHolderComponent : public Component, - public Timer, - public Value::Listener +class TextEditor::TextHolderComponent : public Component, + public Timer, + public Value::Listener { - TextEditor& owner; - - TextHolderComponent (const TextHolderComponent&); - TextHolderComponent& operator= (const TextHolderComponent&); - public: TextHolderComponent (TextEditor& owner_) : owner (owner_) @@ -51537,16 +51529,16 @@ public: { owner.textWasChangedByValue(); } + +private: + TextEditor& owner; + + TextHolderComponent (const TextHolderComponent&); + TextHolderComponent& operator= (const TextHolderComponent&); }; class TextEditorViewport : public Viewport { - TextEditor* const owner; - float lastWordWrapWidth; - - TextEditorViewport (const TextEditorViewport&); - TextEditorViewport& operator= (const TextEditorViewport&); - public: TextEditorViewport (TextEditor* const owner_) : owner (owner_), @@ -51568,6 +51560,13 @@ public: owner->updateTextHolderSize(); } } + +private: + TextEditor* const owner; + float lastWordWrapWidth; + + TextEditorViewport (const TextEditorViewport&); + TextEditorViewport& operator= (const TextEditorViewport&); }; namespace TextEditorDefs @@ -51730,7 +51729,7 @@ void TextEditor::applyFontToAllText (const Font& newFont) for (int i = sections.size(); --i >= 0;) { - UniformTextSection* const uts = (UniformTextSection*) sections.getUnchecked(i); + UniformTextSection* const uts = sections.getUnchecked (i); uts->setFont (newFont, passwordCharacter); uts->colour = overallColour; } @@ -51924,7 +51923,7 @@ void TextEditor::repaintText (const Range& range) if (wordWrapWidth > 0) { - TextEditorIterator i (sections, wordWrapWidth, passwordCharacter); + Iterator i (sections, wordWrapWidth, passwordCharacter); i.getCharPosition (range.getStart(), x, y, lh); @@ -52040,7 +52039,7 @@ void TextEditor::updateTextHolderSize() { float maxWidth = 0.0f; - TextEditorIterator i (sections, wordWrapWidth, passwordCharacter); + Iterator i (sections, wordWrapWidth, passwordCharacter); while (i.next()) maxWidth = jmax (maxWidth, i.atomRight); @@ -52274,7 +52273,7 @@ void TextEditor::drawContent (Graphics& g) const Rectangle clip (g.getClipBounds()); Colour selectedTextColour; - TextEditorIterator i (sections, wordWrapWidth, passwordCharacter); + Iterator i (sections, wordWrapWidth, passwordCharacter); while (i.lineY + 200.0 < clip.getY() && i.next()) {} @@ -52286,7 +52285,7 @@ void TextEditor::drawContent (Graphics& g) selectedTextColour = findColour (highlightedTextColourId); - TextEditorIterator i2 (i); + Iterator i2 (i); while (i2.next() && i2.lineY < clip.getBottom()) { @@ -52826,13 +52825,8 @@ void TextEditor::insert (const String& text, if (um->getNumActionsInCurrentTransaction() > TextEditorDefs::maxActionsPerTransaction) newTransaction(); - um->perform (new TextEditorInsertAction (*this, - text, - insertIndex, - font, - colour, - caretPosition, - caretPositionToMoveTo)); + um->perform (new InsertAction (*this, text, insertIndex, font, colour, + caretPosition, caretPositionToMoveTo)); } else { @@ -52844,7 +52838,7 @@ void TextEditor::insert (const String& text, for (int i = 0; i < sections.size(); ++i) { - nextIndex = index + ((UniformTextSection*) sections.getUnchecked(i))->getTotalLength(); + nextIndex = index + sections.getUnchecked (i)->getTotalLength(); if (insertIndex == index) { @@ -52882,19 +52876,19 @@ void TextEditor::insert (const String& text, } void TextEditor::reinsert (const int insertIndex, - const VoidArray& sectionsToInsert) + const Array & sectionsToInsert) { int index = 0; int nextIndex = 0; for (int i = 0; i < sections.size(); ++i) { - nextIndex = index + ((UniformTextSection*) sections.getUnchecked(i))->getTotalLength(); + nextIndex = index + sections.getUnchecked (i)->getTotalLength(); if (insertIndex == index) { for (int j = sectionsToInsert.size(); --j >= 0;) - sections.insert (i, new UniformTextSection (*(UniformTextSection*) sectionsToInsert.getUnchecked(j))); + sections.insert (i, new UniformTextSection (*sectionsToInsert.getUnchecked(j))); break; } @@ -52903,7 +52897,7 @@ void TextEditor::reinsert (const int insertIndex, splitSection (i, insertIndex - index); for (int j = sectionsToInsert.size(); --j >= 0;) - sections.insert (i + 1, new UniformTextSection (*(UniformTextSection*) sectionsToInsert.getUnchecked(j))); + sections.insert (i + 1, new UniformTextSection (*sectionsToInsert.getUnchecked(j))); break; } @@ -52914,7 +52908,7 @@ void TextEditor::reinsert (const int insertIndex, if (nextIndex == insertIndex) { for (int j = 0; j < sectionsToInsert.size(); ++j) - sections.add (new UniformTextSection (*(UniformTextSection*) sectionsToInsert.getUnchecked(j))); + sections.add (new UniformTextSection (*sectionsToInsert.getUnchecked(j))); } coalesceSimilarSections(); @@ -52932,7 +52926,7 @@ void TextEditor::remove (const Range& range, for (int i = 0; i < sections.size(); ++i) { - const int nextIndex = index + ((UniformTextSection*) sections[i])->getTotalLength(); + const int nextIndex = index + sections.getUnchecked(i)->getTotalLength(); if (range.getStart() > index && range.getStart() < nextIndex) { @@ -52957,14 +52951,14 @@ void TextEditor::remove (const Range& range, if (um != 0) { - VoidArray removedSections; + Array removedSections; for (int i = 0; i < sections.size(); ++i) { if (range.getEnd() <= range.getStart()) break; - UniformTextSection* const section = (UniformTextSection*) sections.getUnchecked (i); + UniformTextSection* const section = sections.getUnchecked (i); const int nextIndex = index + section->getTotalLength(); @@ -52977,11 +52971,8 @@ void TextEditor::remove (const Range& range, if (um->getNumActionsInCurrentTransaction() > TextEditorDefs::maxActionsPerTransaction) newTransaction(); - um->perform (new TextEditorRemoveAction (*this, - range, - caretPosition, - caretPositionToMoveTo, - removedSections)); + um->perform (new RemoveAction (*this, range, caretPosition, + caretPositionToMoveTo, removedSections)); } else { @@ -52989,7 +52980,7 @@ void TextEditor::remove (const Range& range, for (int i = 0; i < sections.size(); ++i) { - UniformTextSection* const section = (UniformTextSection*) sections.getUnchecked (i); + UniformTextSection* const section = sections.getUnchecked (i); const int nextIndex = index + section->getTotalLength(); @@ -53029,7 +53020,7 @@ const String TextEditor::getText() const String::Concatenator concatenator (t); for (int i = 0; i < sections.size(); ++i) - ((const UniformTextSection*) sections.getUnchecked(i))->appendAllText (concatenator); + sections.getUnchecked (i)->appendAllText (concatenator); return t; } @@ -53046,7 +53037,7 @@ const String TextEditor::getTextInRange (const Range& range) const for (int i = 0; i < sections.size(); ++i) { - const UniformTextSection* const s = (const UniformTextSection*) sections.getUnchecked(i); + const UniformTextSection* const s = sections.getUnchecked (i); const int nextIndex = index + s->getTotalLength(); if (range.getStart() < nextIndex) @@ -53076,7 +53067,7 @@ int TextEditor::getTotalNumChars() const totalNumChars = 0; for (int i = sections.size(); --i >= 0;) - totalNumChars += ((const UniformTextSection*) sections.getUnchecked(i))->getTotalLength(); + totalNumChars += sections.getUnchecked (i)->getTotalLength(); } return totalNumChars; @@ -53093,7 +53084,7 @@ void TextEditor::getCharPosition (const int index, float& cx, float& cy, float& if (wordWrapWidth > 0 && sections.size() > 0) { - TextEditorIterator i (sections, wordWrapWidth, passwordCharacter); + Iterator i (sections, wordWrapWidth, passwordCharacter); i.getCharPosition (index, cx, cy, lineHeight); } @@ -53110,7 +53101,7 @@ int TextEditor::indexAtPosition (const float x, const float y) if (wordWrapWidth > 0) { - TextEditorIterator i (sections, wordWrapWidth, passwordCharacter); + Iterator i (sections, wordWrapWidth, passwordCharacter); while (i.next()) { @@ -53188,16 +53179,15 @@ void TextEditor::splitSection (const int sectionIndex, jassert (sections[sectionIndex] != 0); sections.insert (sectionIndex + 1, - ((UniformTextSection*) sections.getUnchecked (sectionIndex)) - ->split (charToSplitAt, passwordCharacter)); + sections.getUnchecked (sectionIndex)->split (charToSplitAt, passwordCharacter)); } void TextEditor::coalesceSimilarSections() { for (int i = 0; i < sections.size() - 1; ++i) { - UniformTextSection* const s1 = (UniformTextSection*) sections.getUnchecked (i); - UniformTextSection* const s2 = (UniformTextSection*) sections.getUnchecked (i + 1); + UniformTextSection* const s1 = sections.getUnchecked (i); + UniformTextSection* const s2 = sections.getUnchecked (i + 1); if (s1->font == s2->font && s1->colour == s2->colour) @@ -60307,7 +60297,7 @@ void ComponentMovementWatcher::registerWithParentComps() throw() void ComponentMovementWatcher::unregister() throw() { for (int i = registeredParentComps.size(); --i >= 0;) - ((Component*) registeredParentComps.getUnchecked(i))->removeComponentListener (this); + static_cast (registeredParentComps.getUnchecked(i))->removeComponentListener (this); registeredParentComps.clear(); } @@ -67052,7 +67042,7 @@ void MenuBarComponent::mouseUp (const MouseEvent& e) updateItemUnderMouse (e2.x, e2.y); - if (itemUnderMouse < 0 && dynamic_cast ((Component*) currentPopup) != 0) + if (itemUnderMouse < 0 && dynamic_cast (static_cast (currentPopup)) != 0) hideCurrentMenu(); } @@ -69462,18 +69452,18 @@ public: static SharedCursorHandle* createStandard (const MouseCursor::StandardCursorType type) { - const ScopedLock sl (lock); + const ScopedLock sl (getLock()); - for (int i = standardCursors.size(); --i >= 0;) + for (int i = getCursors().size(); --i >= 0;) { - SharedCursorHandle* const sc = standardCursors.getUnchecked(i); + SharedCursorHandle* const sc = getCursors().getUnchecked(i); if (sc->standardType == type) return sc->retain(); } SharedCursorHandle* const sc = new SharedCursorHandle (type); - standardCursors.add (sc); + getCursors().add (sc); return sc; } @@ -69489,8 +69479,8 @@ public: { if (isStandard) { - const ScopedLock sl (lock); - standardCursors.removeValue (this); + const ScopedLock sl (getLock()); + getCursors().removeValue (this); } delete this; @@ -69507,8 +69497,17 @@ private: const MouseCursor::StandardCursorType standardType; const bool isStandard; - static CriticalSection lock; - static Array standardCursors; + static CriticalSection& getLock() + { + static CriticalSection lock; + return lock; + } + + static Array & getCursors() + { + static Array cursors; + return cursors; + } ~SharedCursorHandle() { @@ -69518,9 +69517,6 @@ private: SharedCursorHandle& operator= (const SharedCursorHandle&); }; -CriticalSection MouseCursor::SharedCursorHandle::lock; -Array MouseCursor::SharedCursorHandle::standardCursors; - MouseCursor::MouseCursor() : cursorHandle (SharedCursorHandle::createStandard (NormalCursor)) { @@ -188299,7 +188295,7 @@ namespace JPEGHelpers static void jpegWriteTerminate (j_compress_ptr cinfo) { - JuceJpegDest* const dest = (JuceJpegDest*) cinfo->dest; + JuceJpegDest* const dest = static_cast (cinfo->dest); const size_t numToWrite = jpegBufferSize - dest->free_in_buffer; dest->output->write (dest->buffer, (int) numToWrite); @@ -188307,11 +188303,11 @@ namespace JPEGHelpers static boolean jpegWriteFlush (j_compress_ptr cinfo) { - JuceJpegDest* const dest = (JuceJpegDest*) cinfo->dest; + JuceJpegDest* const dest = static_cast (cinfo->dest); const int numToWrite = jpegBufferSize; - dest->next_output_byte = (JOCTET*) dest->buffer; + dest->next_output_byte = reinterpret_cast (dest->buffer); dest->free_in_buffer = jpegBufferSize; return dest->output->write (dest->buffer, numToWrite); @@ -188347,7 +188343,7 @@ Image* juce_loadJPEGImageFromStream (InputStream& in) jpegDecompStruct.src->resync_to_restart = jpeg_resync_to_restart; jpegDecompStruct.src->term_source = dummyCallback1; - jpegDecompStruct.src->next_input_byte = (const unsigned char*) mb.getData(); + jpegDecompStruct.src->next_input_byte = static_cast (mb.getData()); jpegDecompStruct.src->bytes_in_buffer = mb.getSize(); try @@ -188442,7 +188438,7 @@ bool juce_writeJPEGImageToStream (const Image& image, dest.output = &out; HeapBlock tempBuffer (jpegBufferSize); - dest.buffer = (char*) tempBuffer; + dest.buffer = tempBuffer; dest.next_output_byte = (JOCTET*) dest.buffer; dest.free_in_buffer = jpegBufferSize; dest.init_destination = jpegWriteInit; @@ -210997,7 +210993,7 @@ bool juce_writePNGImageToStream (const Image& image, OutputStream& out) PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - HeapBlock rowData (width * 4); + HeapBlock rowData (width * 4); png_color_8 sig_bit; sig_bit.red = 8; @@ -211015,7 +211011,7 @@ bool juce_writePNGImageToStream (const Image& image, OutputStream& out) for (int y = 0; y < height; ++y) { - uint8* dst = (uint8*) rowData; + uint8* dst = rowData; const uint8* src = srcData.getLinePointer (y); if (image.hasAlphaChannel()) @@ -211780,7 +211776,7 @@ void* PlatformUtilities::loadDynamicLibrary (const String& name) JUCE_TRY { - result = (void*) LoadLibrary (name); + result = LoadLibrary (name); } JUCE_CATCH_ALL @@ -212877,7 +212873,7 @@ void* juce_openInternetFile (const String& url, if (bytesToDo > 0 && ! InternetWriteFile (request, - ((const char*) postData.getData()) + bytesSent, + static_cast (postData.getData()) + bytesSent, bytesToDo, &bytesDone)) { break; @@ -212915,8 +212911,7 @@ void* juce_openInternetFile (const String& url, int juce_readFromInternetFile (void* handle, void* buffer, int bytesToRead) { DWORD bytesRead = 0; - - const ConnectionAndRequestStruct* const crs = (const ConnectionAndRequestStruct*) handle; + const ConnectionAndRequestStruct* const crs = static_cast (handle); if (crs != 0) InternetReadFile (crs->request, @@ -212930,11 +212925,8 @@ int juce_seekInInternetFile (void* handle, int newPosition) { if (handle != 0) { - const ConnectionAndRequestStruct* const crs = (const ConnectionAndRequestStruct*) handle; - - return InternetSetFilePointer (crs->request, - newPosition, 0, - FILE_BEGIN, 0); + const ConnectionAndRequestStruct* const crs = static_cast (handle); + return InternetSetFilePointer (crs->request, newPosition, 0, FILE_BEGIN, 0); } else { @@ -212944,19 +212936,14 @@ int juce_seekInInternetFile (void* handle, int newPosition) int64 juce_getInternetFileContentLength (void* handle) { - const ConnectionAndRequestStruct* const crs = (const ConnectionAndRequestStruct*) handle; + const ConnectionAndRequestStruct* const crs = static_cast (handle); if (crs != 0) { - DWORD index = 0; - DWORD result = 0; - DWORD size = sizeof (result); + DWORD index = 0, result = 0, size = sizeof (result); - if (HttpQueryInfo (crs->request, - HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, - &result, - &size, - &index)) + if (HttpQueryInfo (crs->request, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, + &result, &size, &index)) { return (int64) result; } @@ -212969,7 +212956,7 @@ void juce_closeInternetFile (void* handle) { if (handle != 0) { - ConnectionAndRequestStruct* const crs = (ConnectionAndRequestStruct*) handle; + ConnectionAndRequestStruct* const crs = static_cast (handle); InternetCloseHandle (crs->request); InternetCloseHandle (crs->connection); delete crs; @@ -213122,9 +213109,8 @@ bool PlatformUtilities::launchEmailWithAttachments (const String& targetEmailAdd message.nRecipCount = 1; message.lpRecips = &recip; - MemoryBlock mb (sizeof (MapiFileDesc) * filesToAttach.size()); - mb.fillWith (0); - MapiFileDesc* files = (MapiFileDesc*) mb.getData(); + HeapBlock files; + files.calloc (filesToAttach.size()); message.nFileCount = filesToAttach.size(); message.lpFiles = files; @@ -239247,7 +239233,7 @@ public: if (atsFont == 0) atsFont = ATSFontFindFromPostScriptName ((CFStringRef) [nsFont fontName], kATSOptionFlagsDefault); - fontRef = CGFontCreateWithPlatformFont ((void*) &atsFont); + fontRef = CGFontCreateWithPlatformFont (&atsFont); const float totalHeight = fabsf ([nsFont ascender]) + fabsf([nsFont descender]); unitsToHeightScaleFactor = 1.0f / totalHeight; @@ -239261,7 +239247,7 @@ public: if (atsFont == 0) atsFont = ATSFontFindFromPostScriptName ((CFStringRef) [nsFont fontName], kATSOptionFlagsDefault); - fontRef = CGFontCreateWithPlatformFont ((void*) &atsFont); + fontRef = CGFontCreateWithPlatformFont (&atsFont); const float totalHeight = fabsf ([nsFont ascender]) + fabsf([nsFont descender]); unitsToHeightScaleFactor = 1.0f / totalHeight; @@ -240090,7 +240076,7 @@ public: state->fontRef = 0; state->font = newFont; - MacTypeface* mf = dynamic_cast ((Typeface*) state->font.getTypeface()); + MacTypeface* mf = dynamic_cast (state->font.getTypeface()); if (mf != 0) { @@ -240184,7 +240170,7 @@ private: static void gradientCallback (void* info, const CGFloat* inData, CGFloat* outData) { - const CoreGraphicsContext* const g = (const CoreGraphicsContext*) info; + const CoreGraphicsContext* const g = static_cast (info); const int index = roundToInt (g->numGradientLookupEntries * inData[0]); PixelARGB colour (g->gradientLookupTable [jlimit (0, g->numGradientLookupEntries, index)]); @@ -243939,7 +243925,7 @@ public: if (atsFont == 0) atsFont = ATSFontFindFromPostScriptName ((CFStringRef) [nsFont fontName], kATSOptionFlagsDefault); - fontRef = CGFontCreateWithPlatformFont ((void*) &atsFont); + fontRef = CGFontCreateWithPlatformFont (&atsFont); const float totalHeight = fabsf ([nsFont ascender]) + fabsf([nsFont descender]); unitsToHeightScaleFactor = 1.0f / totalHeight; @@ -243953,7 +243939,7 @@ public: if (atsFont == 0) atsFont = ATSFontFindFromPostScriptName ((CFStringRef) [nsFont fontName], kATSOptionFlagsDefault); - fontRef = CGFontCreateWithPlatformFont ((void*) &atsFont); + fontRef = CGFontCreateWithPlatformFont (&atsFont); const float totalHeight = fabsf ([nsFont ascender]) + fabsf([nsFont descender]); unitsToHeightScaleFactor = 1.0f / totalHeight; @@ -244782,7 +244768,7 @@ public: state->fontRef = 0; state->font = newFont; - MacTypeface* mf = dynamic_cast ((Typeface*) state->font.getTypeface()); + MacTypeface* mf = dynamic_cast (state->font.getTypeface()); if (mf != 0) { @@ -244876,7 +244862,7 @@ private: static void gradientCallback (void* info, const CGFloat* inData, CGFloat* outData) { - const CoreGraphicsContext* const g = (const CoreGraphicsContext*) info; + const CoreGraphicsContext* const g = static_cast (info); const int index = roundToInt (g->numGradientLookupEntries * inData[0]); PixelARGB colour (g->gradientLookupTable [jlimit (0, g->numGradientLookupEntries, index)]); @@ -250808,13 +250794,13 @@ private: const AudioTimeStamp* inOutputTime, void* device) { - ((CoreAudioInternal*) device)->audioCallback (inInputData, outOutputData); + static_cast (device)->audioCallback (inInputData, outOutputData); return noErr; } static OSStatus deviceListenerProc (AudioDeviceID /*inDevice*/, UInt32 /*inLine*/, const AudioObjectPropertyAddress* pa, void* inClientData) { - CoreAudioInternal* const intern = (CoreAudioInternal*) inClientData; + CoreAudioInternal* const intern = static_cast (inClientData); switch (pa->mSelector) { @@ -251089,7 +251075,7 @@ private: static OSStatus hardwareListenerProc (AudioDeviceID /*inDevice*/, UInt32 /*inLine*/, const AudioObjectPropertyAddress* pa, void* inClientData) { - CoreAudioInternal* const intern = (CoreAudioInternal*) inClientData; + CoreAudioInternal* const intern = static_cast (inClientData); switch (pa->mSelector) { diff --git a/juce_amalgamated.h b/juce_amalgamated.h index 6c15ea3be3..1dabc5fb65 100644 --- a/juce_amalgamated.h +++ b/juce_amalgamated.h @@ -3337,6 +3337,11 @@ public: return referencedObject; } + inline ReferenceCountedObjectClass* getObject() const throw() + { + return referencedObject; + } + private: ReferenceCountedObjectClass* referencedObject; @@ -12773,7 +12778,7 @@ private: MouseCursor cursor_; ImageEffectFilter* effect_; Image* bufferedImage_; - VoidArray* mouseListeners_; + Array * mouseListeners_; VoidArray* keyListeners_; ListenerList componentListeners; NamedValueSet properties; @@ -16492,7 +16497,6 @@ public: /*** End of inlined file: juce_TextInputTarget.h ***/ class TextEditor; -class TextHolderComponent; class JUCE_API TextEditorListener { @@ -16698,6 +16702,14 @@ protected: private: + class Iterator; + class UniformTextSection; + class TextHolderComponent; + class InsertAction; + class RemoveAction; + friend class InsertAction; + friend class RemoveAction; + ScopedPointer viewport; TextHolderComponent* textHolder; BorderSize borderSize; @@ -16726,7 +16738,7 @@ private: Font currentFont; mutable int totalNumChars; int caretPosition; - VoidArray sections; + Array sections; String textToShowWhenEmpty; Colour colourForTextWhenEmpty; juce_wchar passwordCharacter; @@ -16742,15 +16754,12 @@ private: String allowedCharacters; ListenerList listeners; - friend class TextEditorInsertAction; - friend class TextEditorRemoveAction; - void coalesceSimilarSections(); void splitSection (int sectionIndex, int charToSplitAt); void clearInternal (UndoManager* um); void insert (const String& text, int insertIndex, const Font& font, const Colour& colour, UndoManager* um, int caretPositionToMoveTo); - void reinsert (int insertIndex, const VoidArray& sections); + void reinsert (int insertIndex, const Array & sections); void remove (const Range& range, UndoManager* um, int caretPositionToMoveTo); void getCharPosition (int index, float& x, float& y, float& lineHeight) const; void updateCaretPosition(); diff --git a/src/application/juce_ApplicationCommandTarget.cpp b/src/application/juce_ApplicationCommandTarget.cpp index 810dfd2e62..526831e0f3 100644 --- a/src/application/juce_ApplicationCommandTarget.cpp +++ b/src/application/juce_ApplicationCommandTarget.cpp @@ -192,7 +192,7 @@ ApplicationCommandTarget::CommandTargetMessageInvoker::~CommandTargetMessageInvo void ApplicationCommandTarget::CommandTargetMessageInvoker::handleMessage (const Message& message) { - const ScopedPointer info ((InvocationInfo*) message.pointerParameter); + const ScopedPointer info (static_cast (message.pointerParameter)); owner->tryToInvoke (*info, false); } diff --git a/src/audio/audio_file_formats/juce_QuickTimeAudioFormat.cpp b/src/audio/audio_file_formats/juce_QuickTimeAudioFormat.cpp index 20e92fb908..911907bfec 100644 --- a/src/audio/audio_file_formats/juce_QuickTimeAudioFormat.cpp +++ b/src/audio/audio_file_formats/juce_QuickTimeAudioFormat.cpp @@ -309,18 +309,6 @@ private: HeapBlock bufferList; Handle dataHandle; - /*OSErr readMovieStream (long offset, long size, void* dataPtr) - { - input->setPosition (offset); - input->read (dataPtr, size); - return noErr; - } - - static OSErr readMovieStreamProc (long offset, long size, void* dataPtr, void* userRef) - { - return ((QTAudioReader*) userRef)->readMovieStream (offset, size, dataPtr); - }*/ - //============================================================================== void checkThreadIsAttached() { diff --git a/src/audio/dsp/juce_AudioSampleBuffer.cpp b/src/audio/dsp/juce_AudioSampleBuffer.cpp index 44f5ec95ce..eb24204b8e 100644 --- a/src/audio/dsp/juce_AudioSampleBuffer.cpp +++ b/src/audio/dsp/juce_AudioSampleBuffer.cpp @@ -607,7 +607,7 @@ void AudioSampleBuffer::readFromAudioReader (AudioFormatReader* reader, { for (int j = 0; j < 2; ++j) { - float* const d = (float*) (chans[j]); + float* const d = reinterpret_cast (chans[j]); if (d != 0) { diff --git a/src/audio/synthesisers/juce_Sampler.cpp b/src/audio/synthesisers/juce_Sampler.cpp index 35191c9456..789ea144ba 100644 --- a/src/audio/synthesisers/juce_Sampler.cpp +++ b/src/audio/synthesisers/juce_Sampler.cpp @@ -170,7 +170,7 @@ void SamplerVoice::controllerMoved (const int /*controllerNumber*/, //============================================================================== void SamplerVoice::renderNextBlock (AudioSampleBuffer& outputBuffer, int startSample, int numSamples) { - const SamplerSound* const playingSound = (SamplerSound*) (SynthesiserSound*) getCurrentlyPlayingSound(); + const SamplerSound* const playingSound = static_cast (getCurrentlyPlayingSound().getObject()); if (playingSound != 0) { diff --git a/src/gui/components/mouse/juce_MouseCursor.cpp b/src/gui/components/mouse/juce_MouseCursor.cpp index 8064f6eb1f..8d73327fb3 100644 --- a/src/gui/components/mouse/juce_MouseCursor.cpp +++ b/src/gui/components/mouse/juce_MouseCursor.cpp @@ -60,18 +60,18 @@ public: static SharedCursorHandle* createStandard (const MouseCursor::StandardCursorType type) { - const ScopedLock sl (lock); + const ScopedLock sl (getLock()); - for (int i = standardCursors.size(); --i >= 0;) + for (int i = getCursors().size(); --i >= 0;) { - SharedCursorHandle* const sc = standardCursors.getUnchecked(i); + SharedCursorHandle* const sc = getCursors().getUnchecked(i); if (sc->standardType == type) return sc->retain(); } SharedCursorHandle* const sc = new SharedCursorHandle (type); - standardCursors.add (sc); + getCursors().add (sc); return sc; } @@ -87,8 +87,8 @@ public: { if (isStandard) { - const ScopedLock sl (lock); - standardCursors.removeValue (this); + const ScopedLock sl (getLock()); + getCursors().removeValue (this); } delete this; @@ -107,8 +107,17 @@ private: const MouseCursor::StandardCursorType standardType; const bool isStandard; - static CriticalSection lock; - static Array standardCursors; + static CriticalSection& getLock() + { + static CriticalSection lock; + return lock; + } + + static Array & getCursors() + { + static Array cursors; + return cursors; + } ~SharedCursorHandle() { @@ -118,10 +127,6 @@ private: SharedCursorHandle& operator= (const SharedCursorHandle&); }; -CriticalSection MouseCursor::SharedCursorHandle::lock; -Array MouseCursor::SharedCursorHandle::standardCursors; - - //============================================================================== MouseCursor::MouseCursor() : cursorHandle (SharedCursorHandle::createStandard (NormalCursor)) diff --git a/src/io/network/juce_Socket.cpp b/src/io/network/juce_Socket.cpp index 1ebe09b4c7..47ca4c173f 100644 --- a/src/io/network/juce_Socket.cpp +++ b/src/io/network/juce_Socket.cpp @@ -404,7 +404,9 @@ bool StreamingSocket::connect (const String& remoteHostName, void StreamingSocket::close() { #if JUCE_WINDOWS - closesocket (handle); + if (handle != SOCKET_ERROR || connected) + closesocket (handle); + connected = false; #else if (connected) @@ -419,7 +421,8 @@ void StreamingSocket::close() } } - ::close (handle); + if (handle != -1) + ::close (handle); #endif hostName = String::empty;