diff --git a/examples/AUv3Synth/AUv3Synth.jucer b/examples/AUv3Synth/AUv3Synth.jucer index 7b17373909..69e0f36a41 100644 --- a/examples/AUv3Synth/AUv3Synth.jucer +++ b/examples/AUv3Synth/AUv3Synth.jucer @@ -10,7 +10,8 @@ pluginAUExportPrefix="AUv3SynthAU" pluginRTASCategory="" aaxIdentifier="com.roli.development.AUv3Synth" pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.1.2" buildStandalone="1" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" - splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11"> + splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11" + companyCopyright="ROLI Ltd."> @@ -29,7 +30,8 @@ + iosDevelopmentTeamID="" iPadScreenOrientation="portraitlandscape" + iosDeviceFamily="1,2"> diff --git a/examples/AUv3Synth/Builds/iOS/AUv3Synth/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/AUv3Synth/Builds/iOS/AUv3Synth/Images.xcassets/AppIcon.appiconset/Contents.json index c0af172f62..e216154693 100644 --- a/examples/AUv3Synth/Builds/iOS/AUv3Synth/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/AUv3Synth/Builds/iOS/AUv3Synth/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images": [ + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@2x.png", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "29x29", @@ -54,6 +66,18 @@ "filename": "Icon-@3x.png", "scale": "3x" }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20.png", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20@2x.png", + "scale": "2x" + }, { "idiom": "ipad", "size": "29x29", @@ -119,6 +143,12 @@ "size": "83.5x83.5", "filename": "Icon-83.5@2x.png", "scale": "2x" + }, + { + "idiom": "ios-marketing", + "size": "1024x1024", + "filename": "Icon-AppStore-1024.png", + "scale": "1x" } ], "info": { diff --git a/examples/AnimationAppExample/AnimationAppExample.jucer b/examples/AnimationAppExample/AnimationAppExample.jucer index 2e7b99820b..a61d7907c1 100644 --- a/examples/AnimationAppExample/AnimationAppExample.jucer +++ b/examples/AnimationAppExample/AnimationAppExample.jucer @@ -3,7 +3,8 @@ + splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11" + companyCopyright="ROLI Ltd."> - + diff --git a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj index f951e1de61..c3d731ce16 100644 --- a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj +++ b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\AnimationAppExample.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\AnimationAppExample.bsc + diff --git a/examples/AnimationAppExample/Builds/VisualStudio2017/resources.rc b/examples/AnimationAppExample/Builds/VisualStudio2017/resources.rc index 59c8bfbfff..aab91b9d3f 100644 --- a/examples/AnimationAppExample/Builds/VisualStudio2017/resources.rc +++ b/examples/AnimationAppExample/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "AnimationAppExample\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "AnimationAppExample\0" diff --git a/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/AppIcon.appiconset/Contents.json index c0af172f62..e216154693 100644 --- a/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images": [ + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@2x.png", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "29x29", @@ -54,6 +66,18 @@ "filename": "Icon-@3x.png", "scale": "3x" }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20.png", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20@2x.png", + "scale": "2x" + }, { "idiom": "ipad", "size": "29x29", @@ -119,6 +143,12 @@ "size": "83.5x83.5", "filename": "Icon-83.5@2x.png", "scale": "2x" + }, + { + "idiom": "ios-marketing", + "size": "1024x1024", + "filename": "Icon-AppStore-1024.png", + "scale": "1x" } ], "info": { diff --git a/examples/AudioAppExample/AudioAppExample.jucer b/examples/AudioAppExample/AudioAppExample.jucer index 2bf41dc1cc..bab963a509 100644 --- a/examples/AudioAppExample/AudioAppExample.jucer +++ b/examples/AudioAppExample/AudioAppExample.jucer @@ -3,7 +3,8 @@ + splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11" + companyCopyright="ROLI Ltd."> - + diff --git a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj index 1f8b20ffb3..0687d2fae9 100644 --- a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj +++ b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\AudioAppExample.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\AudioAppExample.bsc + diff --git a/examples/AudioAppExample/Builds/VisualStudio2017/resources.rc b/examples/AudioAppExample/Builds/VisualStudio2017/resources.rc index caccb73905..1367303b9c 100644 --- a/examples/AudioAppExample/Builds/VisualStudio2017/resources.rc +++ b/examples/AudioAppExample/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "AudioAppExample\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "AudioAppExample\0" diff --git a/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/AppIcon.appiconset/Contents.json index c0af172f62..e216154693 100644 --- a/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images": [ + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@2x.png", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "29x29", @@ -54,6 +66,18 @@ "filename": "Icon-@3x.png", "scale": "3x" }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20.png", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20@2x.png", + "scale": "2x" + }, { "idiom": "ipad", "size": "29x29", @@ -119,6 +143,12 @@ "size": "83.5x83.5", "filename": "Icon-83.5@2x.png", "scale": "2x" + }, + { + "idiom": "ios-marketing", + "size": "1024x1024", + "filename": "Icon-AppStore-1024.png", + "scale": "1x" } ], "info": { diff --git a/examples/BLOCKS/BlocksDrawing/BlocksDrawing.jucer b/examples/BLOCKS/BlocksDrawing/BlocksDrawing.jucer index 628bc9205b..8d19cef8d5 100644 --- a/examples/BLOCKS/BlocksDrawing/BlocksDrawing.jucer +++ b/examples/BLOCKS/BlocksDrawing/BlocksDrawing.jucer @@ -3,7 +3,7 @@ + splashScreenColour="Dark" cppLanguageStandard="11" companyCopyright=""> - + diff --git a/examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile b/examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile index ee94b6cf2b..59d9b1db3e 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile +++ b/examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile @@ -170,7 +170,7 @@ $(JUCE_OBJDIR)/include_juce_opengl_a8a032b.o: ../../JuceLibraryCode/include_juce check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 clean: @echo Cleaning BlocksDrawing diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj index 521b1026ee..753c205ba3 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -94,13 +94,13 @@ $(IntDir)\BlocksDrawing.pdb Windows MachineX86 - false true true $(IntDir)\BlocksDrawing.bsc + @@ -144,6 +144,7 @@ true $(IntDir)\BlocksDrawing.bsc + diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj index eda083f3ad..d28c70bb4a 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\BlocksDrawing.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\BlocksDrawing.bsc + diff --git a/examples/BLOCKS/BlocksDrawing/Builds/iOS/BlocksDrawing/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/BLOCKS/BlocksDrawing/Builds/iOS/BlocksDrawing/Images.xcassets/AppIcon.appiconset/Contents.json index c0af172f62..e216154693 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/iOS/BlocksDrawing/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/BLOCKS/BlocksDrawing/Builds/iOS/BlocksDrawing/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images": [ + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@2x.png", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "29x29", @@ -54,6 +66,18 @@ "filename": "Icon-@3x.png", "scale": "3x" }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20.png", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20@2x.png", + "scale": "2x" + }, { "idiom": "ipad", "size": "29x29", @@ -119,6 +143,12 @@ "size": "83.5x83.5", "filename": "Icon-83.5@2x.png", "scale": "2x" + }, + { + "idiom": "ios-marketing", + "size": "1024x1024", + "filename": "Icon-AppStore-1024.png", + "scale": "1x" } ], "info": { diff --git a/examples/BLOCKS/BlocksMonitor/BlocksMonitor.jucer b/examples/BLOCKS/BlocksMonitor/BlocksMonitor.jucer index e6dbb8b747..ffe1a7e5cb 100644 --- a/examples/BLOCKS/BlocksMonitor/BlocksMonitor.jucer +++ b/examples/BLOCKS/BlocksMonitor/BlocksMonitor.jucer @@ -3,7 +3,7 @@ + splashScreenColour="Dark" cppLanguageStandard="11" companyCopyright=""> @@ -34,7 +34,8 @@ - + diff --git a/examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile b/examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile index d7c4ed6262..8ae29384d1 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile +++ b/examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile @@ -164,7 +164,7 @@ $(JUCE_OBJDIR)/include_juce_opengl_a8a032b.o: ../../JuceLibraryCode/include_juce check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 clean: @echo Cleaning BlocksMonitor diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj index 6afa480b3c..40d716abef 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -94,13 +94,13 @@ $(IntDir)\BlocksMonitor.pdb Windows MachineX86 - false true true $(IntDir)\BlocksMonitor.bsc + @@ -144,6 +144,7 @@ true $(IntDir)\BlocksMonitor.bsc + diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj index 447c821c09..4023dba851 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\BlocksMonitor.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\BlocksMonitor.bsc + diff --git a/examples/BLOCKS/BlocksMonitor/Builds/iOS/BlocksMonitor/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/BLOCKS/BlocksMonitor/Builds/iOS/BlocksMonitor/Images.xcassets/AppIcon.appiconset/Contents.json index c0af172f62..e216154693 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/iOS/BlocksMonitor/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/BLOCKS/BlocksMonitor/Builds/iOS/BlocksMonitor/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images": [ + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@2x.png", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "29x29", @@ -54,6 +66,18 @@ "filename": "Icon-@3x.png", "scale": "3x" }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20.png", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20@2x.png", + "scale": "2x" + }, { "idiom": "ipad", "size": "29x29", @@ -119,6 +143,12 @@ "size": "83.5x83.5", "filename": "Icon-83.5@2x.png", "scale": "2x" + }, + { + "idiom": "ios-marketing", + "size": "1024x1024", + "filename": "Icon-AppStore-1024.png", + "scale": "1x" } ], "info": { diff --git a/examples/BLOCKS/BlocksSynth/BlocksSynth.jucer b/examples/BLOCKS/BlocksSynth/BlocksSynth.jucer index 6bd522aea2..10ad0d2f20 100644 --- a/examples/BLOCKS/BlocksSynth/BlocksSynth.jucer +++ b/examples/BLOCKS/BlocksSynth/BlocksSynth.jucer @@ -3,7 +3,7 @@ + splashScreenColour="Dark" cppLanguageStandard="11" companyCopyright=""> @@ -38,7 +38,8 @@ - + diff --git a/examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile b/examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile index 0e6efbcde1..6053d82a47 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile +++ b/examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile @@ -164,7 +164,7 @@ $(JUCE_OBJDIR)/include_juce_opengl_a8a032b.o: ../../JuceLibraryCode/include_juce check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 clean: @echo Cleaning BlocksSynth diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj index cc9a3e2479..368af7cb2d 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -94,13 +94,13 @@ $(IntDir)\BlocksSynth.pdb Windows MachineX86 - false true true $(IntDir)\BlocksSynth.bsc + @@ -144,6 +144,7 @@ true $(IntDir)\BlocksSynth.bsc + diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj index a52cbdc08d..861f4e5d99 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\BlocksSynth.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\BlocksSynth.bsc + diff --git a/examples/BLOCKS/BlocksSynth/Builds/iOS/BlocksSynth/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/BLOCKS/BlocksSynth/Builds/iOS/BlocksSynth/Images.xcassets/AppIcon.appiconset/Contents.json index c0af172f62..e216154693 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/iOS/BlocksSynth/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/BLOCKS/BlocksSynth/Builds/iOS/BlocksSynth/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images": [ + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@2x.png", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "29x29", @@ -54,6 +66,18 @@ "filename": "Icon-@3x.png", "scale": "3x" }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20.png", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20@2x.png", + "scale": "2x" + }, { "idiom": "ipad", "size": "29x29", @@ -119,6 +143,12 @@ "size": "83.5x83.5", "filename": "Icon-83.5@2x.png", "scale": "2x" + }, + { + "idiom": "ios-marketing", + "size": "1024x1024", + "filename": "Icon-AppStore-1024.png", + "scale": "1x" } ], "info": { diff --git a/examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer b/examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer index 3f2ad15dc2..9850cb072c 100644 --- a/examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer +++ b/examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer @@ -4,7 +4,7 @@ version="1.0.0" bundleIdentifier="com.juce.BouncingBallWavetableDemo" includeBinaryInAppConfig="1" jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark" companyName="ROLI Ltd." - cppLanguageStandard="11"> + cppLanguageStandard="11" companyCopyright="ROLI Ltd."> /dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 clean: @echo Cleaning BouncingBallWavetableDemo diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj index 702378ff16..f032670087 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -94,13 +94,13 @@ $(IntDir)\WavetableBouncingEditor.pdb Windows MachineX86 - false true true $(IntDir)\WavetableBouncingEditor.bsc + @@ -144,6 +144,7 @@ true $(IntDir)\WavetableBouncingEditor.bsc + diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/resources.rc b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/resources.rc index d9a52a9889..2a7ac134b9 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/resources.rc +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "BouncingBallWavetableDemo\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "BouncingBallWavetableDemo\0" diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj index 1b59131f14..7b13a209fe 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\BouncingBallWavetableDemo.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\BouncingBallWavetableDemo.bsc + diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/resources.rc b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/resources.rc index d9a52a9889..2a7ac134b9 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/resources.rc +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "BouncingBallWavetableDemo\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "BouncingBallWavetableDemo\0" diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj index 856d88be4c..b9322e746c 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\ComponentTutorialExample.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\ComponentTutorialExample.bsc + diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2015/resources.rc b/examples/ComponentTutorialExample/Builds/VisualStudio2015/resources.rc index 146e93193d..611253f6ed 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2015/resources.rc +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2015/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "ComponentTutorialExample\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "ComponentTutorialExample\0" diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj index b5a1cac62e..aa4d68c8a5 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\ComponentTutorialExample.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\ComponentTutorialExample.bsc + diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2017/resources.rc b/examples/ComponentTutorialExample/Builds/VisualStudio2017/resources.rc index 146e93193d..611253f6ed 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2017/resources.rc +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "ComponentTutorialExample\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "ComponentTutorialExample\0" diff --git a/examples/ComponentTutorialExample/ComponentTutorialExample.jucer b/examples/ComponentTutorialExample/ComponentTutorialExample.jucer index fa6139fa01..d7a13a0386 100644 --- a/examples/ComponentTutorialExample/ComponentTutorialExample.jucer +++ b/examples/ComponentTutorialExample/ComponentTutorialExample.jucer @@ -4,7 +4,7 @@ version="1.0.0" bundleIdentifier="com.roli.ComponentTutorialExample" includeBinaryInAppConfig="1" jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark" companyName="ROLI Ltd." - cppLanguageStandard="11"> + cppLanguageStandard="11" companyCopyright="ROLI Ltd."> true $(IntDir)\DSPModulePluginDemo.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\DSPModulePluginDemo.bsc + diff --git a/examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_StandalonePlugin.vcxproj b/examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_StandalonePlugin.vcxproj index 793416403c..a30bc99c36 100644 --- a/examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_StandalonePlugin.vcxproj +++ b/examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_StandalonePlugin.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\DSPModulePluginDemo.bsc + + DSPModulePluginDemo.lib;%(AdditionalDependencies) + @@ -147,6 +150,9 @@ true $(IntDir)\DSPModulePluginDemo.bsc + + DSPModulePluginDemo.lib;%(AdditionalDependencies) + diff --git a/examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_VST.vcxproj b/examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_VST.vcxproj index dfd834034f..12871a5d89 100644 --- a/examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_VST.vcxproj +++ b/examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_VST.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\DSPModulePluginDemo.bsc + + DSPModulePluginDemo.lib;%(AdditionalDependencies) + @@ -147,6 +150,9 @@ true $(IntDir)\DSPModulePluginDemo.bsc + + DSPModulePluginDemo.lib;%(AdditionalDependencies) + diff --git a/examples/DSP module plugin demo/Builds/VisualStudio2015/resources.rc b/examples/DSP module plugin demo/Builds/VisualStudio2015/resources.rc index 3545567da2..63c7328c88 100644 --- a/examples/DSP module plugin demo/Builds/VisualStudio2015/resources.rc +++ b/examples/DSP module plugin demo/Builds/VisualStudio2015/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "DSPModulePluginDemo\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "DSPModulePluginDemo\0" diff --git a/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_SharedCode.vcxproj b/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_SharedCode.vcxproj index 9b00b7ae84..0fd944d942 100644 --- a/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_SharedCode.vcxproj +++ b/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_SharedCode.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\DSPModulePluginDemo.bsc + @@ -144,6 +145,7 @@ true $(IntDir)\DSPModulePluginDemo.bsc + diff --git a/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_StandalonePlugin.vcxproj b/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_StandalonePlugin.vcxproj index 20be01016c..f7b356b459 100644 --- a/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_StandalonePlugin.vcxproj +++ b/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_StandalonePlugin.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\DSPModulePluginDemo.bsc + + DSPModulePluginDemo.lib;%(AdditionalDependencies) + @@ -148,6 +151,9 @@ true $(IntDir)\DSPModulePluginDemo.bsc + + DSPModulePluginDemo.lib;%(AdditionalDependencies) + diff --git a/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_VST.vcxproj b/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_VST.vcxproj index 414ba95628..fb6bcf303d 100644 --- a/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_VST.vcxproj +++ b/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_VST.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\DSPModulePluginDemo.bsc + + DSPModulePluginDemo.lib;%(AdditionalDependencies) + @@ -148,6 +151,9 @@ true $(IntDir)\DSPModulePluginDemo.bsc + + DSPModulePluginDemo.lib;%(AdditionalDependencies) + diff --git a/examples/DSP module plugin demo/Builds/VisualStudio2017/resources.rc b/examples/DSP module plugin demo/Builds/VisualStudio2017/resources.rc index 3545567da2..63c7328c88 100644 --- a/examples/DSP module plugin demo/Builds/VisualStudio2017/resources.rc +++ b/examples/DSP module plugin demo/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "DSPModulePluginDemo\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "DSPModulePluginDemo\0" diff --git a/examples/DSP module plugin demo/DSP module plugin demo.jucer b/examples/DSP module plugin demo/DSP module plugin demo.jucer index 102740cc95..f11274a756 100644 --- a/examples/DSP module plugin demo/DSP module plugin demo.jucer +++ b/examples/DSP module plugin demo/DSP module plugin demo.jucer @@ -12,7 +12,7 @@ pluginAUExportPrefix="DSPmoduleplugindemoAU" pluginRTASCategory="" aaxIdentifier="com.yourcompany.DSPmoduleplugindemo" pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.1.2" companyName="ROLI Ltd." companyWebsite="www.juce.com" - companyEmail="info@juce.com" cppLanguageStandard="14"> + companyEmail="info@juce.com" cppLanguageStandard="14" companyCopyright="ROLI Ltd."> diff --git a/examples/DSPDemo/Builds/LinuxMakefile/Makefile b/examples/DSPDemo/Builds/LinuxMakefile/Makefile index 8710d489d7..bda431c55c 100644 --- a/examples/DSPDemo/Builds/LinuxMakefile/Makefile +++ b/examples/DSPDemo/Builds/LinuxMakefile/Makefile @@ -224,7 +224,7 @@ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o: ../../JuceLibraryCode/include_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 clean: @echo Cleaning DSPDemo diff --git a/examples/DSPDemo/Builds/VisualStudio2017/DSPDemo_App.vcxproj b/examples/DSPDemo/Builds/VisualStudio2017/DSPDemo_App.vcxproj index 267f5ca2c2..8a0c6f0f8e 100644 --- a/examples/DSPDemo/Builds/VisualStudio2017/DSPDemo_App.vcxproj +++ b/examples/DSPDemo/Builds/VisualStudio2017/DSPDemo_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\DSPDemo.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\DSPDemo.bsc + diff --git a/examples/DSPDemo/Builds/VisualStudio2017/resources.rc b/examples/DSPDemo/Builds/VisualStudio2017/resources.rc index f7a8f1ad71..8dad5f9bae 100644 --- a/examples/DSPDemo/Builds/VisualStudio2017/resources.rc +++ b/examples/DSPDemo/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "DSPDemo\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "DSPDemo\0" diff --git a/examples/DSPDemo/DSPDemo.jucer b/examples/DSPDemo/DSPDemo.jucer index 2535f5fa48..0ab8b3b0c4 100644 --- a/examples/DSPDemo/DSPDemo.jucer +++ b/examples/DSPDemo/DSPDemo.jucer @@ -4,7 +4,7 @@ splashScreenColour="Dark" projectType="guiapp" version="1.0.0" bundleIdentifier="com.roli.DSPDemo" includeBinaryInAppConfig="1" jucerVersion="5.1.2" cppLanguageStandard="14" companyName="ROLI Ltd." - companyWebsite="www.juce.com" companyEmail="info@juce.com"> + companyWebsite="www.juce.com" companyEmail="info@juce.com" companyCopyright="ROLI Ltd."> diff --git a/examples/Demo/Builds/Android/app/src/main/java/com/yourcompany/jucedemo/JuceDemo.java b/examples/Demo/Builds/Android/app/src/main/java/com/yourcompany/jucedemo/JuceDemo.java index 703e23abce..9f33e24b89 100644 --- a/examples/Demo/Builds/Android/app/src/main/java/com/yourcompany/jucedemo/JuceDemo.java +++ b/examples/Demo/Builds/Android/app/src/main/java/com/yourcompany/jucedemo/JuceDemo.java @@ -400,6 +400,8 @@ public class JuceDemo extends Activity public final void deleteView (ComponentPeerView view) { + view.host = 0; + ViewGroup group = (ViewGroup) (view.getParent()); if (group != null) @@ -629,7 +631,6 @@ public class JuceDemo extends Activity setFocusable (true); setFocusableInTouchMode (true); setOnFocusChangeListener (this); - requestFocus(); // swap red and blue colours to match internal opengl texture format ColorMatrix colorMatrix = new ColorMatrix(); @@ -649,6 +650,9 @@ public class JuceDemo extends Activity @Override public void onDraw (Canvas canvas) { + if (host == 0) + return; + handlePaint (host, canvas, paint); } @@ -670,6 +674,9 @@ public class JuceDemo extends Activity @Override public boolean onTouchEvent (MotionEvent event) { + if (host == 0) + return false; + int action = event.getAction(); long time = event.getEventTime(); @@ -740,6 +747,9 @@ public class JuceDemo extends Activity @Override public boolean onKeyDown (int keyCode, KeyEvent event) { + if (host == 0) + return false; + switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: @@ -762,6 +772,9 @@ public class JuceDemo extends Activity @Override public boolean onKeyUp (int keyCode, KeyEvent event) { + if (host == 0) + return false; + handleKeyUp (host, keyCode, event.getUnicodeChar()); return true; } @@ -769,6 +782,9 @@ public class JuceDemo extends Activity @Override public boolean onKeyMultiple (int keyCode, int count, KeyEvent event) { + if (host == 0) + return false; + if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE) return super.onKeyMultiple (keyCode, count, event); @@ -801,6 +817,9 @@ public class JuceDemo extends Activity @Override protected void onSizeChanged (int w, int h, int oldw, int oldh) { + if (host == 0) + return; + super.onSizeChanged (w, h, oldw, oldh); viewSizeChanged (host); } @@ -817,6 +836,9 @@ public class JuceDemo extends Activity @Override public void onFocusChange (View v, boolean hasFocus) { + if (host == 0) + return; + if (v == this) focusChanged (host, hasFocus); } diff --git a/examples/Demo/Builds/LinuxMakefile/Makefile b/examples/Demo/Builds/LinuxMakefile/Makefile index 7f2a782475..bf23d731f1 100644 --- a/examples/Demo/Builds/LinuxMakefile/Makefile +++ b/examples/Demo/Builds/LinuxMakefile/Makefile @@ -428,7 +428,7 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 clean: @echo Cleaning JuceDemo diff --git a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj index c88e96845f..8278af999b 100644 --- a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=3.0.0;JUCE_APP_VERSION_HEX=0x30000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -95,13 +95,13 @@ $(IntDir)\JuceDemo.pdb Windows MachineX86 - false true true $(IntDir)\JuceDemo.bsc + @@ -146,6 +146,7 @@ true $(IntDir)\JuceDemo.bsc + diff --git a/examples/Demo/Builds/VisualStudio2013/resources.rc b/examples/Demo/Builds/VisualStudio2013/resources.rc index f280e08a43..5d40db8cae 100644 --- a/examples/Demo/Builds/VisualStudio2013/resources.rc +++ b/examples/Demo/Builds/VisualStudio2013/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "JuceDemo\0" VALUE "FileVersion", "3.0.0\0" VALUE "ProductName", "JuceDemo\0" diff --git a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj index c2318f8c05..a2f9ca9fa8 100644 --- a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj @@ -102,6 +102,7 @@ true $(IntDir)\JuceDemo.bsc + @@ -145,6 +146,7 @@ true $(IntDir)\JuceDemo.bsc + diff --git a/examples/Demo/Builds/VisualStudio2015/resources.rc b/examples/Demo/Builds/VisualStudio2015/resources.rc index f280e08a43..5d40db8cae 100644 --- a/examples/Demo/Builds/VisualStudio2015/resources.rc +++ b/examples/Demo/Builds/VisualStudio2015/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "JuceDemo\0" VALUE "FileVersion", "3.0.0\0" VALUE "ProductName", "JuceDemo\0" diff --git a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj index 4477633aab..8d07e42594 100644 --- a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj @@ -102,6 +102,7 @@ true $(IntDir)\JuceDemo.bsc + @@ -145,6 +146,7 @@ true $(IntDir)\JuceDemo.bsc + diff --git a/examples/Demo/Builds/VisualStudio2017/resources.rc b/examples/Demo/Builds/VisualStudio2017/resources.rc index f280e08a43..5d40db8cae 100644 --- a/examples/Demo/Builds/VisualStudio2017/resources.rc +++ b/examples/Demo/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "JuceDemo\0" VALUE "FileVersion", "3.0.0\0" VALUE "ProductName", "JuceDemo\0" diff --git a/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Contents.json index c0af172f62..e216154693 100644 --- a/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images": [ + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@2x.png", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "29x29", @@ -54,6 +66,18 @@ "filename": "Icon-@3x.png", "scale": "3x" }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20.png", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20@2x.png", + "scale": "2x" + }, { "idiom": "ipad", "size": "29x29", @@ -119,6 +143,12 @@ "size": "83.5x83.5", "filename": "Icon-83.5@2x.png", "scale": "2x" + }, + { + "idiom": "ios-marketing", + "size": "1024x1024", + "filename": "Icon-AppStore-1024.png", + "scale": "1x" } ], "info": { diff --git a/examples/Demo/JuceDemo.jucer b/examples/Demo/JuceDemo.jucer index 6f91ac3866..80ae1cde09 100644 --- a/examples/Demo/JuceDemo.jucer +++ b/examples/Demo/JuceDemo.jucer @@ -3,7 +3,8 @@ + splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11" + companyCopyright="ROLI Ltd."> + microphonePermissionNeeded="1" extraCompilerFlags="-pedantic -Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wextra-semi" + iPadScreenOrientation="portraitlandscape" iosDeviceFamily="1,2"> /dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors freetype2 libcurl x11 xext xinerama + @pkg-config --print-errors freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 clean: @echo Cleaning HelloWorld diff --git a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj index 54058f4407..96f80b9cdf 100644 --- a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj +++ b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\HelloWorld.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\HelloWorld.bsc + diff --git a/examples/HelloWorld/Builds/VisualStudio2015/resources.rc b/examples/HelloWorld/Builds/VisualStudio2015/resources.rc index 693fc36cc1..386df3c5f5 100644 --- a/examples/HelloWorld/Builds/VisualStudio2015/resources.rc +++ b/examples/HelloWorld/Builds/VisualStudio2015/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "HelloWorld\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "HelloWorld\0" diff --git a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj index 74d2a924de..92a37bb3d2 100644 --- a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj +++ b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\HelloWorld.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\HelloWorld.bsc + diff --git a/examples/HelloWorld/Builds/VisualStudio2017/resources.rc b/examples/HelloWorld/Builds/VisualStudio2017/resources.rc index 693fc36cc1..386df3c5f5 100644 --- a/examples/HelloWorld/Builds/VisualStudio2017/resources.rc +++ b/examples/HelloWorld/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "HelloWorld\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "HelloWorld\0" diff --git a/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json index c0af172f62..e216154693 100644 --- a/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images": [ + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@2x.png", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "29x29", @@ -54,6 +66,18 @@ "filename": "Icon-@3x.png", "scale": "3x" }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20.png", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20@2x.png", + "scale": "2x" + }, { "idiom": "ipad", "size": "29x29", @@ -119,6 +143,12 @@ "size": "83.5x83.5", "filename": "Icon-83.5@2x.png", "scale": "2x" + }, + { + "idiom": "ios-marketing", + "size": "1024x1024", + "filename": "Icon-AppStore-1024.png", + "scale": "1x" } ], "info": { diff --git a/examples/HelloWorld/HelloWorld.jucer b/examples/HelloWorld/HelloWorld.jucer index 9c27df9b70..65bb9f6bcb 100644 --- a/examples/HelloWorld/HelloWorld.jucer +++ b/examples/HelloWorld/HelloWorld.jucer @@ -3,7 +3,8 @@ + reportAppUsage="0" splashScreenColour="Dark" cppLanguageStandard="11" + companyCopyright="ROLI Ltd."> @@ -23,7 +24,8 @@ + objCExtraSuffix="JtTAKTK1s" iosScreenOrientation="portraitlandscape" + iPadScreenOrientation="portraitlandscape" iosDeviceFamily="1,2"> diff --git a/examples/InAppPurchase/Builds/Android/app/src/main/java/com/roli/juceinapppurchasesample/InAppPurchase.java b/examples/InAppPurchase/Builds/Android/app/src/main/java/com/roli/juceinapppurchasesample/InAppPurchase.java index 05a6ab9409..edd8b35618 100644 --- a/examples/InAppPurchase/Builds/Android/app/src/main/java/com/roli/juceinapppurchasesample/InAppPurchase.java +++ b/examples/InAppPurchase/Builds/Android/app/src/main/java/com/roli/juceinapppurchasesample/InAppPurchase.java @@ -400,6 +400,8 @@ public class InAppPurchase extends Activity public final void deleteView (ComponentPeerView view) { + view.host = 0; + ViewGroup group = (ViewGroup) (view.getParent()); if (group != null) @@ -629,7 +631,6 @@ public class InAppPurchase extends Activity setFocusable (true); setFocusableInTouchMode (true); setOnFocusChangeListener (this); - requestFocus(); // swap red and blue colours to match internal opengl texture format ColorMatrix colorMatrix = new ColorMatrix(); @@ -649,6 +650,9 @@ public class InAppPurchase extends Activity @Override public void onDraw (Canvas canvas) { + if (host == 0) + return; + handlePaint (host, canvas, paint); } @@ -670,6 +674,9 @@ public class InAppPurchase extends Activity @Override public boolean onTouchEvent (MotionEvent event) { + if (host == 0) + return false; + int action = event.getAction(); long time = event.getEventTime(); @@ -740,6 +747,9 @@ public class InAppPurchase extends Activity @Override public boolean onKeyDown (int keyCode, KeyEvent event) { + if (host == 0) + return false; + switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: @@ -762,6 +772,9 @@ public class InAppPurchase extends Activity @Override public boolean onKeyUp (int keyCode, KeyEvent event) { + if (host == 0) + return false; + handleKeyUp (host, keyCode, event.getUnicodeChar()); return true; } @@ -769,6 +782,9 @@ public class InAppPurchase extends Activity @Override public boolean onKeyMultiple (int keyCode, int count, KeyEvent event) { + if (host == 0) + return false; + if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE) return super.onKeyMultiple (keyCode, count, event); @@ -801,6 +817,9 @@ public class InAppPurchase extends Activity @Override protected void onSizeChanged (int w, int h, int oldw, int oldh) { + if (host == 0) + return; + super.onSizeChanged (w, h, oldw, oldh); viewSizeChanged (host); } @@ -817,6 +836,9 @@ public class InAppPurchase extends Activity @Override public void onFocusChange (View v, boolean hasFocus) { + if (host == 0) + return; + if (v == this) focusChanged (host, hasFocus); } diff --git a/examples/InAppPurchase/Builds/iOS/InAppPurchase/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/InAppPurchase/Builds/iOS/InAppPurchase/Images.xcassets/AppIcon.appiconset/Contents.json index c0af172f62..e216154693 100644 --- a/examples/InAppPurchase/Builds/iOS/InAppPurchase/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/InAppPurchase/Builds/iOS/InAppPurchase/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images": [ + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@2x.png", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "29x29", @@ -54,6 +66,18 @@ "filename": "Icon-@3x.png", "scale": "3x" }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20.png", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20@2x.png", + "scale": "2x" + }, { "idiom": "ipad", "size": "29x29", @@ -119,6 +143,12 @@ "size": "83.5x83.5", "filename": "Icon-83.5@2x.png", "scale": "2x" + }, + { + "idiom": "ios-marketing", + "size": "1024x1024", + "filename": "Icon-AppStore-1024.png", + "scale": "1x" } ], "info": { diff --git a/examples/InAppPurchase/InAppPurchase.jucer b/examples/InAppPurchase/InAppPurchase.jucer index 68ad2a22ff..cfda930eb2 100644 --- a/examples/InAppPurchase/InAppPurchase.jucer +++ b/examples/InAppPurchase/InAppPurchase.jucer @@ -4,7 +4,7 @@ splashScreenColour="Dark" projectType="guiapp" version="0.0.2" bundleIdentifier="com.roli.juceInAppPurchaseSample" includeBinaryInAppConfig="1" cppLanguageStandard="11" jucerVersion="5.1.2" companyName="ROLI Ltd." - companyWebsite="www.juce.com" companyEmail="info@juce.com"> + companyWebsite="www.juce.com" companyEmail="info@juce.com" companyCopyright="ROLI Ltd."> @@ -42,7 +42,8 @@ + bigIcon="OqeN3h" smallIcon="OqeN3h" iPadScreenOrientation="portraitlandscape" + iosDeviceFamily="1,2"> diff --git a/examples/MPETest/Builds/LinuxMakefile/Makefile b/examples/MPETest/Builds/LinuxMakefile/Makefile index e15ff3e04f..0365ec7573 100644 --- a/examples/MPETest/Builds/LinuxMakefile/Makefile +++ b/examples/MPETest/Builds/LinuxMakefile/Makefile @@ -170,7 +170,7 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 clean: @echo Cleaning MPETest diff --git a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj index 042c46e6b0..ef5f26b7b7 100644 --- a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj +++ b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -94,13 +94,13 @@ $(IntDir)\MPETest.pdb Windows MachineX86 - false true true $(IntDir)\MPETest.bsc + @@ -144,6 +144,7 @@ true $(IntDir)\MPETest.bsc + diff --git a/examples/MPETest/Builds/VisualStudio2015/resources.rc b/examples/MPETest/Builds/VisualStudio2015/resources.rc index f5f32b74aa..cc2b828fbd 100644 --- a/examples/MPETest/Builds/VisualStudio2015/resources.rc +++ b/examples/MPETest/Builds/VisualStudio2015/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "MPETest\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "MPETest\0" diff --git a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj index 176f89f8eb..053b6aad90 100644 --- a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj +++ b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\MPETest.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\MPETest.bsc + diff --git a/examples/MPETest/Builds/VisualStudio2017/resources.rc b/examples/MPETest/Builds/VisualStudio2017/resources.rc index f5f32b74aa..cc2b828fbd 100644 --- a/examples/MPETest/Builds/VisualStudio2017/resources.rc +++ b/examples/MPETest/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "MPETest\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "MPETest\0" diff --git a/examples/MPETest/MPETest.jucer b/examples/MPETest/MPETest.jucer index 26099e8141..944f74d471 100644 --- a/examples/MPETest/MPETest.jucer +++ b/examples/MPETest/MPETest.jucer @@ -3,7 +3,8 @@ + splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11" + companyCopyright="ROLI Ltd."> diff --git a/examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java b/examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java index 5eeb94785f..b590e2dff4 100644 --- a/examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java +++ b/examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java @@ -1329,6 +1329,8 @@ public class MidiTest extends Activity public final void deleteView (ComponentPeerView view) { + view.host = 0; + ViewGroup group = (ViewGroup) (view.getParent()); if (group != null) @@ -1558,7 +1560,6 @@ public class MidiTest extends Activity setFocusable (true); setFocusableInTouchMode (true); setOnFocusChangeListener (this); - requestFocus(); // swap red and blue colours to match internal opengl texture format ColorMatrix colorMatrix = new ColorMatrix(); @@ -1578,6 +1579,9 @@ public class MidiTest extends Activity @Override public void onDraw (Canvas canvas) { + if (host == 0) + return; + handlePaint (host, canvas, paint); } @@ -1599,6 +1603,9 @@ public class MidiTest extends Activity @Override public boolean onTouchEvent (MotionEvent event) { + if (host == 0) + return false; + int action = event.getAction(); long time = event.getEventTime(); @@ -1669,6 +1676,9 @@ public class MidiTest extends Activity @Override public boolean onKeyDown (int keyCode, KeyEvent event) { + if (host == 0) + return false; + switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: @@ -1691,6 +1701,9 @@ public class MidiTest extends Activity @Override public boolean onKeyUp (int keyCode, KeyEvent event) { + if (host == 0) + return false; + handleKeyUp (host, keyCode, event.getUnicodeChar()); return true; } @@ -1698,6 +1711,9 @@ public class MidiTest extends Activity @Override public boolean onKeyMultiple (int keyCode, int count, KeyEvent event) { + if (host == 0) + return false; + if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE) return super.onKeyMultiple (keyCode, count, event); @@ -1730,6 +1746,9 @@ public class MidiTest extends Activity @Override protected void onSizeChanged (int w, int h, int oldw, int oldh) { + if (host == 0) + return; + super.onSizeChanged (w, h, oldw, oldh); viewSizeChanged (host); } @@ -1746,6 +1765,9 @@ public class MidiTest extends Activity @Override public void onFocusChange (View v, boolean hasFocus) { + if (host == 0) + return; + if (v == this) focusChanged (host, hasFocus); } diff --git a/examples/MidiTest/Builds/LinuxMakefile/Makefile b/examples/MidiTest/Builds/LinuxMakefile/Makefile index c140fcd114..8ff6c002cf 100644 --- a/examples/MidiTest/Builds/LinuxMakefile/Makefile +++ b/examples/MidiTest/Builds/LinuxMakefile/Makefile @@ -158,7 +158,7 @@ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o: ../../JuceLibraryCode/include_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 clean: @echo Cleaning MidiTest diff --git a/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj b/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj index 515106739e..ea7caf47b4 100644 --- a/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj +++ b/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -94,13 +94,13 @@ $(IntDir)\MidiTest.pdb Windows MachineX86 - false true true $(IntDir)\MidiTest.bsc + @@ -144,6 +144,7 @@ true $(IntDir)\MidiTest.bsc + diff --git a/examples/MidiTest/Builds/VisualStudio2015/resources.rc b/examples/MidiTest/Builds/VisualStudio2015/resources.rc index 471e4b85b0..cc3b8a4375 100644 --- a/examples/MidiTest/Builds/VisualStudio2015/resources.rc +++ b/examples/MidiTest/Builds/VisualStudio2015/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "MidiTest\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "MidiTest\0" diff --git a/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj b/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj index 85fdd5c4bc..da6bebc0b3 100644 --- a/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj +++ b/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\MidiTest.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\MidiTest.bsc + diff --git a/examples/MidiTest/Builds/VisualStudio2017/resources.rc b/examples/MidiTest/Builds/VisualStudio2017/resources.rc index 471e4b85b0..cc3b8a4375 100644 --- a/examples/MidiTest/Builds/VisualStudio2017/resources.rc +++ b/examples/MidiTest/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "MidiTest\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "MidiTest\0" diff --git a/examples/MidiTest/Builds/iOS/MidiTest/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/MidiTest/Builds/iOS/MidiTest/Images.xcassets/AppIcon.appiconset/Contents.json index c0af172f62..e216154693 100644 --- a/examples/MidiTest/Builds/iOS/MidiTest/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/MidiTest/Builds/iOS/MidiTest/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images": [ + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@2x.png", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "29x29", @@ -54,6 +66,18 @@ "filename": "Icon-@3x.png", "scale": "3x" }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20.png", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20@2x.png", + "scale": "2x" + }, { "idiom": "ipad", "size": "29x29", @@ -119,6 +143,12 @@ "size": "83.5x83.5", "filename": "Icon-83.5@2x.png", "scale": "2x" + }, + { + "idiom": "ios-marketing", + "size": "1024x1024", + "filename": "Icon-AppStore-1024.png", + "scale": "1x" } ], "info": { diff --git a/examples/MidiTest/MidiTest.jucer b/examples/MidiTest/MidiTest.jucer index 84d21167a9..bbd4bc3b7e 100644 --- a/examples/MidiTest/MidiTest.jucer +++ b/examples/MidiTest/MidiTest.jucer @@ -3,7 +3,8 @@ + splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11" + companyCopyright="ROLI Ltd."> @@ -100,7 +101,8 @@ - + diff --git a/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java b/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java index bac81b0d10..e44aa20b1b 100644 --- a/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java +++ b/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java @@ -400,6 +400,8 @@ public class JUCENetworkGraphicsDemo extends Activity public final void deleteView (ComponentPeerView view) { + view.host = 0; + ViewGroup group = (ViewGroup) (view.getParent()); if (group != null) @@ -629,7 +631,6 @@ public class JUCENetworkGraphicsDemo extends Activity setFocusable (true); setFocusableInTouchMode (true); setOnFocusChangeListener (this); - requestFocus(); // swap red and blue colours to match internal opengl texture format ColorMatrix colorMatrix = new ColorMatrix(); @@ -649,6 +650,9 @@ public class JUCENetworkGraphicsDemo extends Activity @Override public void onDraw (Canvas canvas) { + if (host == 0) + return; + handlePaint (host, canvas, paint); } @@ -670,6 +674,9 @@ public class JUCENetworkGraphicsDemo extends Activity @Override public boolean onTouchEvent (MotionEvent event) { + if (host == 0) + return false; + int action = event.getAction(); long time = event.getEventTime(); @@ -740,6 +747,9 @@ public class JUCENetworkGraphicsDemo extends Activity @Override public boolean onKeyDown (int keyCode, KeyEvent event) { + if (host == 0) + return false; + switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: @@ -762,6 +772,9 @@ public class JUCENetworkGraphicsDemo extends Activity @Override public boolean onKeyUp (int keyCode, KeyEvent event) { + if (host == 0) + return false; + handleKeyUp (host, keyCode, event.getUnicodeChar()); return true; } @@ -769,6 +782,9 @@ public class JUCENetworkGraphicsDemo extends Activity @Override public boolean onKeyMultiple (int keyCode, int count, KeyEvent event) { + if (host == 0) + return false; + if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE) return super.onKeyMultiple (keyCode, count, event); @@ -801,6 +817,9 @@ public class JUCENetworkGraphicsDemo extends Activity @Override protected void onSizeChanged (int w, int h, int oldw, int oldh) { + if (host == 0) + return; + super.onSizeChanged (w, h, oldw, oldh); viewSizeChanged (host); } @@ -817,6 +836,9 @@ public class JUCENetworkGraphicsDemo extends Activity @Override public void onFocusChange (View v, boolean hasFocus) { + if (host == 0) + return; + if (v == this) focusChanged (host, hasFocus); } diff --git a/examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile b/examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile index 0b9679056c..b538d36160 100644 --- a/examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile +++ b/examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile @@ -176,7 +176,7 @@ $(JUCE_OBJDIR)/include_juce_osc_f3df604d.o: ../../JuceLibraryCode/include_juce_o check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 clean: @echo Cleaning JUCE Network Graphics Demo diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj index 03d0ec7a78..913991216a 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -94,13 +94,13 @@ $(IntDir)\JUCE Network Graphics Demo.pdb Windows MachineX86 - false true true $(IntDir)\JUCE Network Graphics Demo.bsc + @@ -144,6 +144,7 @@ true $(IntDir)\JUCE Network Graphics Demo.bsc + diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/resources.rc b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/resources.rc index 5dc10cc6d2..7c789be88e 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/resources.rc +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "JUCE Network Graphics Demo\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "JUCE Network Graphics Demo\0" diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj index 745b8d6d52..5de2d12911 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\JUCE Network Graphics Demo.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\JUCE Network Graphics Demo.bsc + diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/resources.rc b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/resources.rc index 45818b5767..648f41e500 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/resources.rc +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "JUCE Network Graphics Demo\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "JUCE Network Graphics Demo\0" diff --git a/examples/NetworkGraphicsDemo/Builds/iOS/JUCE Network Graphics Demo/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/NetworkGraphicsDemo/Builds/iOS/JUCE Network Graphics Demo/Images.xcassets/AppIcon.appiconset/Contents.json index c0af172f62..e216154693 100644 --- a/examples/NetworkGraphicsDemo/Builds/iOS/JUCE Network Graphics Demo/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/NetworkGraphicsDemo/Builds/iOS/JUCE Network Graphics Demo/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images": [ + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@2x.png", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "29x29", @@ -54,6 +66,18 @@ "filename": "Icon-@3x.png", "scale": "3x" }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20.png", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20@2x.png", + "scale": "2x" + }, { "idiom": "ipad", "size": "29x29", @@ -119,6 +143,12 @@ "size": "83.5x83.5", "filename": "Icon-83.5@2x.png", "scale": "2x" + }, + { + "idiom": "ios-marketing", + "size": "1024x1024", + "filename": "Icon-AppStore-1024.png", + "scale": "1x" } ], "info": { diff --git a/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer b/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer index 7954f7fc5b..01168f4af4 100644 --- a/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer +++ b/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer @@ -4,7 +4,7 @@ version="1.0.0" bundleIdentifier="com.juce.NetworkGraphicsDemo" includeBinaryInAppConfig="1" jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark" companyName="ROLI Ltd." - cppLanguageStandard="11"> + cppLanguageStandard="11" companyCopyright="ROLI Ltd."> @@ -90,7 +90,8 @@ - + diff --git a/examples/OSCMonitor/Builds/LinuxMakefile/Makefile b/examples/OSCMonitor/Builds/LinuxMakefile/Makefile index c5891645f4..d2cfa418e4 100644 --- a/examples/OSCMonitor/Builds/LinuxMakefile/Makefile +++ b/examples/OSCMonitor/Builds/LinuxMakefile/Makefile @@ -170,7 +170,7 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 clean: @echo Cleaning OSCMonitor diff --git a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj index 4fc57b38c6..eecea1d7a4 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj +++ b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -94,13 +94,13 @@ $(IntDir)\OSCMonitor.pdb Windows MachineX86 - false true true $(IntDir)\OSCMonitor.bsc + @@ -144,6 +144,7 @@ true $(IntDir)\OSCMonitor.bsc + diff --git a/examples/OSCMonitor/Builds/VisualStudio2015/resources.rc b/examples/OSCMonitor/Builds/VisualStudio2015/resources.rc index 26a430ea04..d30d1499ca 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2015/resources.rc +++ b/examples/OSCMonitor/Builds/VisualStudio2015/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "OSCMonitor\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "OSCMonitor\0" diff --git a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj index fe41abe42f..1dcd730819 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj +++ b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\OSCMonitor.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\OSCMonitor.bsc + diff --git a/examples/OSCMonitor/Builds/VisualStudio2017/resources.rc b/examples/OSCMonitor/Builds/VisualStudio2017/resources.rc index 26a430ea04..d30d1499ca 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2017/resources.rc +++ b/examples/OSCMonitor/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "OSCMonitor\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "OSCMonitor\0" diff --git a/examples/OSCMonitor/OSCMonitor.jucer b/examples/OSCMonitor/OSCMonitor.jucer index c21aa3d0fe..152bee90ba 100644 --- a/examples/OSCMonitor/OSCMonitor.jucer +++ b/examples/OSCMonitor/OSCMonitor.jucer @@ -3,7 +3,8 @@ + splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11" + companyCopyright="ROLI Ltd."> diff --git a/examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java b/examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java index d08af129e5..7a5f09fa7e 100644 --- a/examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java +++ b/examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java @@ -400,6 +400,8 @@ public class OSCReceiver extends Activity public final void deleteView (ComponentPeerView view) { + view.host = 0; + ViewGroup group = (ViewGroup) (view.getParent()); if (group != null) @@ -629,7 +631,6 @@ public class OSCReceiver extends Activity setFocusable (true); setFocusableInTouchMode (true); setOnFocusChangeListener (this); - requestFocus(); // swap red and blue colours to match internal opengl texture format ColorMatrix colorMatrix = new ColorMatrix(); @@ -649,6 +650,9 @@ public class OSCReceiver extends Activity @Override public void onDraw (Canvas canvas) { + if (host == 0) + return; + handlePaint (host, canvas, paint); } @@ -670,6 +674,9 @@ public class OSCReceiver extends Activity @Override public boolean onTouchEvent (MotionEvent event) { + if (host == 0) + return false; + int action = event.getAction(); long time = event.getEventTime(); @@ -740,6 +747,9 @@ public class OSCReceiver extends Activity @Override public boolean onKeyDown (int keyCode, KeyEvent event) { + if (host == 0) + return false; + switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: @@ -762,6 +772,9 @@ public class OSCReceiver extends Activity @Override public boolean onKeyUp (int keyCode, KeyEvent event) { + if (host == 0) + return false; + handleKeyUp (host, keyCode, event.getUnicodeChar()); return true; } @@ -769,6 +782,9 @@ public class OSCReceiver extends Activity @Override public boolean onKeyMultiple (int keyCode, int count, KeyEvent event) { + if (host == 0) + return false; + if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE) return super.onKeyMultiple (keyCode, count, event); @@ -801,6 +817,9 @@ public class OSCReceiver extends Activity @Override protected void onSizeChanged (int w, int h, int oldw, int oldh) { + if (host == 0) + return; + super.onSizeChanged (w, h, oldw, oldh); viewSizeChanged (host); } @@ -817,6 +836,9 @@ public class OSCReceiver extends Activity @Override public void onFocusChange (View v, boolean hasFocus) { + if (host == 0) + return; + if (v == this) focusChanged (host, hasFocus); } diff --git a/examples/OSCReceiver/Builds/LinuxMakefile/Makefile b/examples/OSCReceiver/Builds/LinuxMakefile/Makefile index a1fa60de4f..607202ba0b 100644 --- a/examples/OSCReceiver/Builds/LinuxMakefile/Makefile +++ b/examples/OSCReceiver/Builds/LinuxMakefile/Makefile @@ -134,7 +134,7 @@ $(JUCE_OBJDIR)/include_juce_osc_f3df604d.o: ../../JuceLibraryCode/include_juce_o check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors freetype2 libcurl x11 xext xinerama + @pkg-config --print-errors freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 clean: @echo Cleaning OSCReceiver diff --git a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj index 9ec04a73ba..c4bdfcd9b1 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj +++ b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -94,13 +94,13 @@ $(IntDir)\OSCReceiver.pdb Windows MachineX86 - false true true $(IntDir)\OSCReceiver.bsc + @@ -144,6 +144,7 @@ true $(IntDir)\OSCReceiver.bsc + diff --git a/examples/OSCReceiver/Builds/VisualStudio2015/resources.rc b/examples/OSCReceiver/Builds/VisualStudio2015/resources.rc index 4701652db9..b3b922bb91 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2015/resources.rc +++ b/examples/OSCReceiver/Builds/VisualStudio2015/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "OSCReceiver\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "OSCReceiver\0" diff --git a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj index 58c807146f..a23c8b7927 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj +++ b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\OSCReceiver.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\OSCReceiver.bsc + diff --git a/examples/OSCReceiver/Builds/VisualStudio2017/resources.rc b/examples/OSCReceiver/Builds/VisualStudio2017/resources.rc index 4701652db9..b3b922bb91 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2017/resources.rc +++ b/examples/OSCReceiver/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "OSCReceiver\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "OSCReceiver\0" diff --git a/examples/OSCReceiver/Builds/iOS/OSCReceiver/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/OSCReceiver/Builds/iOS/OSCReceiver/Images.xcassets/AppIcon.appiconset/Contents.json index c0af172f62..e216154693 100644 --- a/examples/OSCReceiver/Builds/iOS/OSCReceiver/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/OSCReceiver/Builds/iOS/OSCReceiver/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images": [ + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@2x.png", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "29x29", @@ -54,6 +66,18 @@ "filename": "Icon-@3x.png", "scale": "3x" }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20.png", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20@2x.png", + "scale": "2x" + }, { "idiom": "ipad", "size": "29x29", @@ -119,6 +143,12 @@ "size": "83.5x83.5", "filename": "Icon-83.5@2x.png", "scale": "2x" + }, + { + "idiom": "ios-marketing", + "size": "1024x1024", + "filename": "Icon-AppStore-1024.png", + "scale": "1x" } ], "info": { diff --git a/examples/OSCReceiver/OSCReceiver.jucer b/examples/OSCReceiver/OSCReceiver.jucer index d27c37dc7c..184c9af60b 100644 --- a/examples/OSCReceiver/OSCReceiver.jucer +++ b/examples/OSCReceiver/OSCReceiver.jucer @@ -3,7 +3,8 @@ + splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11" + companyCopyright="ROLI Ltd."> @@ -83,7 +84,8 @@ - + diff --git a/examples/OSCSender/Builds/Android/app/src/main/java/com/yourcompany/oscsender/OSCSender.java b/examples/OSCSender/Builds/Android/app/src/main/java/com/yourcompany/oscsender/OSCSender.java index b22efadf57..f74a013c41 100644 --- a/examples/OSCSender/Builds/Android/app/src/main/java/com/yourcompany/oscsender/OSCSender.java +++ b/examples/OSCSender/Builds/Android/app/src/main/java/com/yourcompany/oscsender/OSCSender.java @@ -400,6 +400,8 @@ public class OSCSender extends Activity public final void deleteView (ComponentPeerView view) { + view.host = 0; + ViewGroup group = (ViewGroup) (view.getParent()); if (group != null) @@ -629,7 +631,6 @@ public class OSCSender extends Activity setFocusable (true); setFocusableInTouchMode (true); setOnFocusChangeListener (this); - requestFocus(); // swap red and blue colours to match internal opengl texture format ColorMatrix colorMatrix = new ColorMatrix(); @@ -649,6 +650,9 @@ public class OSCSender extends Activity @Override public void onDraw (Canvas canvas) { + if (host == 0) + return; + handlePaint (host, canvas, paint); } @@ -670,6 +674,9 @@ public class OSCSender extends Activity @Override public boolean onTouchEvent (MotionEvent event) { + if (host == 0) + return false; + int action = event.getAction(); long time = event.getEventTime(); @@ -740,6 +747,9 @@ public class OSCSender extends Activity @Override public boolean onKeyDown (int keyCode, KeyEvent event) { + if (host == 0) + return false; + switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: @@ -762,6 +772,9 @@ public class OSCSender extends Activity @Override public boolean onKeyUp (int keyCode, KeyEvent event) { + if (host == 0) + return false; + handleKeyUp (host, keyCode, event.getUnicodeChar()); return true; } @@ -769,6 +782,9 @@ public class OSCSender extends Activity @Override public boolean onKeyMultiple (int keyCode, int count, KeyEvent event) { + if (host == 0) + return false; + if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE) return super.onKeyMultiple (keyCode, count, event); @@ -801,6 +817,9 @@ public class OSCSender extends Activity @Override protected void onSizeChanged (int w, int h, int oldw, int oldh) { + if (host == 0) + return; + super.onSizeChanged (w, h, oldw, oldh); viewSizeChanged (host); } @@ -817,6 +836,9 @@ public class OSCSender extends Activity @Override public void onFocusChange (View v, boolean hasFocus) { + if (host == 0) + return; + if (v == this) focusChanged (host, hasFocus); } diff --git a/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj b/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj index c1c9c9e98e..40b43eaa40 100644 --- a/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj +++ b/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -94,13 +94,13 @@ $(IntDir)\OSCSender.pdb Windows MachineX86 - false true true $(IntDir)\OSCSender.bsc + @@ -144,6 +144,7 @@ true $(IntDir)\OSCSender.bsc + diff --git a/examples/OSCSender/Builds/VisualStudio2015/resources.rc b/examples/OSCSender/Builds/VisualStudio2015/resources.rc index 6471722384..b42cf46954 100644 --- a/examples/OSCSender/Builds/VisualStudio2015/resources.rc +++ b/examples/OSCSender/Builds/VisualStudio2015/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "OSCSender\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "OSCSender\0" diff --git a/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj b/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj index afd24066c0..fc951a327a 100644 --- a/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj +++ b/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\OSCSender.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\OSCSender.bsc + diff --git a/examples/OSCSender/Builds/VisualStudio2017/resources.rc b/examples/OSCSender/Builds/VisualStudio2017/resources.rc index 6471722384..b42cf46954 100644 --- a/examples/OSCSender/Builds/VisualStudio2017/resources.rc +++ b/examples/OSCSender/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "OSCSender\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "OSCSender\0" diff --git a/examples/OSCSender/Builds/iOS/OSCSender/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/OSCSender/Builds/iOS/OSCSender/Images.xcassets/AppIcon.appiconset/Contents.json index c0af172f62..e216154693 100644 --- a/examples/OSCSender/Builds/iOS/OSCSender/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/OSCSender/Builds/iOS/OSCSender/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images": [ + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@2x.png", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "29x29", @@ -54,6 +66,18 @@ "filename": "Icon-@3x.png", "scale": "3x" }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20.png", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20@2x.png", + "scale": "2x" + }, { "idiom": "ipad", "size": "29x29", @@ -119,6 +143,12 @@ "size": "83.5x83.5", "filename": "Icon-83.5@2x.png", "scale": "2x" + }, + { + "idiom": "ios-marketing", + "size": "1024x1024", + "filename": "Icon-AppStore-1024.png", + "scale": "1x" } ], "info": { diff --git a/examples/OSCSender/OSCSender.jucer b/examples/OSCSender/OSCSender.jucer index 0c5de38ba1..f2c33738e5 100644 --- a/examples/OSCSender/OSCSender.jucer +++ b/examples/OSCSender/OSCSender.jucer @@ -3,7 +3,8 @@ + splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11" + companyCopyright="ROLI Ltd."> @@ -75,7 +76,8 @@ - + diff --git a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj index 3aea5537a1..c3429872a5 100644 --- a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj +++ b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\OpenGLAppExample.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\OpenGLAppExample.bsc + diff --git a/examples/OpenGLAppExample/Builds/VisualStudio2017/resources.rc b/examples/OpenGLAppExample/Builds/VisualStudio2017/resources.rc index b93b342560..75a96ef35a 100644 --- a/examples/OpenGLAppExample/Builds/VisualStudio2017/resources.rc +++ b/examples/OpenGLAppExample/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "OpenGLAppExample\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "OpenGLAppExample\0" diff --git a/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/AppIcon.appiconset/Contents.json index c0af172f62..e216154693 100644 --- a/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images": [ + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@2x.png", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "29x29", @@ -54,6 +66,18 @@ "filename": "Icon-@3x.png", "scale": "3x" }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20.png", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20@2x.png", + "scale": "2x" + }, { "idiom": "ipad", "size": "29x29", @@ -119,6 +143,12 @@ "size": "83.5x83.5", "filename": "Icon-83.5@2x.png", "scale": "2x" + }, + { + "idiom": "ios-marketing", + "size": "1024x1024", + "filename": "Icon-AppStore-1024.png", + "scale": "1x" } ], "info": { diff --git a/examples/OpenGLAppExample/OpenGLAppExample.jucer b/examples/OpenGLAppExample/OpenGLAppExample.jucer index b8e5d5e68e..2f329682a3 100644 --- a/examples/OpenGLAppExample/OpenGLAppExample.jucer +++ b/examples/OpenGLAppExample/OpenGLAppExample.jucer @@ -3,7 +3,8 @@ + splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11" + companyCopyright="ROLI Ltd."> @@ -40,7 +41,8 @@ - + diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj index 4b145ad080..7cbd0b220a 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -94,13 +94,13 @@ $(IntDir)\PluckedStringsDemo.pdb Windows MachineX86 - false true true $(IntDir)\PluckedStringsDemo.bsc + @@ -144,6 +144,7 @@ true $(IntDir)\PluckedStringsDemo.bsc + diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2013/resources.rc b/examples/PluckedStringsDemo/Builds/VisualStudio2013/resources.rc index 3ec79f99f3..03f2737f08 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2013/resources.rc +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2013/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "PluckedStringsDemo\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "PluckedStringsDemo\0" diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj index b56b76563b..8e4d297cc4 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\PluckedStringsDemo.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\PluckedStringsDemo.bsc + diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2017/resources.rc b/examples/PluckedStringsDemo/Builds/VisualStudio2017/resources.rc index 3ec79f99f3..03f2737f08 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2017/resources.rc +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "PluckedStringsDemo\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "PluckedStringsDemo\0" diff --git a/examples/PluckedStringsDemo/PluckedStringsDemo.jucer b/examples/PluckedStringsDemo/PluckedStringsDemo.jucer index 1661329a13..86a97069b2 100644 --- a/examples/PluckedStringsDemo/PluckedStringsDemo.jucer +++ b/examples/PluckedStringsDemo/PluckedStringsDemo.jucer @@ -3,7 +3,8 @@ + splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11" + companyCopyright="ROLI Ltd."> + cppLanguageStandard="11" companyCopyright="ROLI Ltd."> diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj index e819cdf6b6..21ef9f0e12 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=1;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JUCE_SHARED_CODE=1;_LIB;%(PreprocessorDefinitions) MultiThreadedDebug @@ -94,13 +94,13 @@ $(IntDir)\Arpeggiator.pdb Windows MachineX86 - false true true $(IntDir)\Arpeggiator.bsc + MachineX86 @@ -147,6 +147,7 @@ true $(IntDir)\Arpeggiator.bsc + MachineX86 diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_VST.vcxproj b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_VST.vcxproj index 94a4a880aa..689fa15d42 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_VST.vcxproj +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_VST.vcxproj @@ -71,7 +71,7 @@ Disabled - EditAndContinue + ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=1;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -96,7 +96,6 @@ $(IntDir)\Arpeggiator.pdb Windows MachineX86 - false true Arpeggiator.lib;%(AdditionalDependencies) @@ -104,6 +103,9 @@ true $(IntDir)\Arpeggiator.bsc + + Arpeggiator.lib;%(AdditionalDependencies) + @@ -148,6 +150,9 @@ true $(IntDir)\Arpeggiator.bsc + + Arpeggiator.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/resources.rc b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/resources.rc index 218d37f194..415a1bfbd9 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/resources.rc +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "Arpeggiator\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "Arpeggiator\0" diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj index a28fb5908d..f9c4638a40 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\Arpeggiator.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\Arpeggiator.bsc + diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_VST.vcxproj b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_VST.vcxproj index 8d93c10625..4dcb86fe99 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_VST.vcxproj +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_VST.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\Arpeggiator.bsc + + Arpeggiator.lib;%(AdditionalDependencies) + @@ -147,6 +150,9 @@ true $(IntDir)\Arpeggiator.bsc + + Arpeggiator.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/resources.rc b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/resources.rc index 218d37f194..415a1bfbd9 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/resources.rc +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "Arpeggiator\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "Arpeggiator\0" diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj index a37649f302..32de67a978 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=1;JucePlugin_Build_VST3=1;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JUCE_SHARED_CODE=1;_LIB;%(PreprocessorDefinitions) MultiThreadedDebug @@ -94,13 +94,13 @@ $(IntDir)\GainPlugIn.pdb Windows MachineX86 - false true true $(IntDir)\GainPlugIn.bsc + MachineX86 @@ -147,6 +147,7 @@ true $(IntDir)\GainPlugIn.bsc + MachineX86 diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_VST.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_VST.vcxproj index 5685685fab..b0c157230d 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_VST.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_VST.vcxproj @@ -71,7 +71,7 @@ Disabled - EditAndContinue + ProgramDatabase C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=1;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -96,7 +96,6 @@ $(IntDir)\GainPlugIn.pdb Windows MachineX86 - false true GainPlugIn.lib;%(AdditionalDependencies) @@ -104,6 +103,9 @@ true $(IntDir)\GainPlugIn.bsc + + GainPlugIn.lib;%(AdditionalDependencies) + @@ -148,6 +150,9 @@ true $(IntDir)\GainPlugIn.bsc + + GainPlugIn.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_VST3.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_VST3.vcxproj index 8ed2968b2c..a43394cae1 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_VST3.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_VST3.vcxproj @@ -71,7 +71,7 @@ Disabled - EditAndContinue + ProgramDatabase C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=1;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -96,7 +96,6 @@ $(IntDir)\GainPlugIn.pdb Windows MachineX86 - false true GainPlugIn.lib;%(AdditionalDependencies) @@ -104,6 +103,9 @@ true $(IntDir)\GainPlugIn.bsc + + GainPlugIn.lib;%(AdditionalDependencies) + @@ -148,6 +150,9 @@ true $(IntDir)\GainPlugIn.bsc + + GainPlugIn.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/resources.rc b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/resources.rc index c22e23c454..f268521d8f 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/resources.rc +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "GainPlugIn\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "GainPlugIn\0" diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj index b1c645b9ed..ecdc93eba3 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\GainPlugIn.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\GainPlugIn.bsc + diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_VST.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_VST.vcxproj index 0dda4714f5..43a8ba0e3e 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_VST.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_VST.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\GainPlugIn.bsc + + GainPlugIn.lib;%(AdditionalDependencies) + @@ -147,6 +150,9 @@ true $(IntDir)\GainPlugIn.bsc + + GainPlugIn.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_VST3.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_VST3.vcxproj index 599959b8f7..1edb108799 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_VST3.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_VST3.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\GainPlugIn.bsc + + GainPlugIn.lib;%(AdditionalDependencies) + @@ -147,6 +150,9 @@ true $(IntDir)\GainPlugIn.bsc + + GainPlugIn.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/resources.rc b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/resources.rc index c22e23c454..f268521d8f 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/resources.rc +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "GainPlugIn\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "GainPlugIn\0" diff --git a/examples/PlugInSamples/GainPlugIn/GainPlugIn.jucer b/examples/PlugInSamples/GainPlugIn/GainPlugIn.jucer index 9ecefdf286..232b12019d 100644 --- a/examples/PlugInSamples/GainPlugIn/GainPlugIn.jucer +++ b/examples/PlugInSamples/GainPlugIn/GainPlugIn.jucer @@ -11,7 +11,7 @@ pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.1.2" pluginIsMidiEffectPlugin="0" buildAUv3="0" buildStandalone="0" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark" - companyName="ROLI Ltd." cppLanguageStandard="11"> + companyName="ROLI Ltd." cppLanguageStandard="11" companyCopyright="ROLI Ltd."> + reportAppUsage="0" splashScreenColour="Dark" cppLanguageStandard="11" + companyCopyright="ROLI Ltd."> + microphonePermissionNeeded="1" iosBackgroundAudio="1" extraCompilerFlags="-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion" + iPadScreenOrientation="portraitlandscape" iosDeviceFamily="1,2"> diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_AAX.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_AAX.vcxproj index d299f82d6c..bddfa621de 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_AAX.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_AAX.vcxproj @@ -71,7 +71,7 @@ Disabled - EditAndContinue + ProgramDatabase C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;C:\SDKs\AAX;C:\SDKs\AAX\Interfaces;C:\SDKs\AAX\Interfaces\ACF;..\..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=1;JucePlugin_Build_Standalone=0;JucePlugin_AAXLibs_path="C:\\SDKs\\AAX\\Libs";%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -96,7 +96,6 @@ $(IntDir)\MultiOutSynth.pdb Windows MachineX86 - false true MultiOutSynth.lib;%(AdditionalDependencies) @@ -104,6 +103,9 @@ true $(IntDir)\MultiOutSynth.bsc + + MultiOutSynth.lib;%(AdditionalDependencies) + if not exist "$(OutDir)\MultiOutSynth.aaxplugin" mkdir "$(OutDir)\MultiOutSynth.aaxplugin" if not exist "$(OutDir)\MultiOutSynth.aaxplugin\Contents" mkdir "$(OutDir)\MultiOutSynth.aaxplugin\Contents" @@ -158,6 +160,9 @@ call "C:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\Mul true $(IntDir)\MultiOutSynth.bsc + + MultiOutSynth.lib;%(AdditionalDependencies) + if not exist "$(OutDir)\MultiOutSynth.aaxplugin" mkdir "$(OutDir)\MultiOutSynth.aaxplugin" if not exist "$(OutDir)\MultiOutSynth.aaxplugin\Contents" mkdir "$(OutDir)\MultiOutSynth.aaxplugin\Contents" diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj index 64658ec839..ef1b47eae3 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;C:\SDKs\AAX;C:\SDKs\AAX\Interfaces;C:\SDKs\AAX\Interfaces\ACF;..\..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=1;JucePlugin_Build_VST3=1;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=1;JucePlugin_Build_Standalone=0;JUCE_SHARED_CODE=1;_LIB;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -94,13 +94,13 @@ $(IntDir)\MultiOutSynth.pdb Windows MachineX86 - false true true $(IntDir)\MultiOutSynth.bsc + MachineX86 @@ -147,6 +147,7 @@ true $(IntDir)\MultiOutSynth.bsc + MachineX86 diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_VST.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_VST.vcxproj index c2e31b56fb..457c1446c6 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_VST.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_VST.vcxproj @@ -71,7 +71,7 @@ Disabled - EditAndContinue + ProgramDatabase C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;C:\SDKs\AAX;C:\SDKs\AAX\Interfaces;C:\SDKs\AAX\Interfaces\ACF;..\..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=1;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -96,7 +96,6 @@ $(IntDir)\MultiOutSynth.pdb Windows MachineX86 - false true MultiOutSynth.lib;%(AdditionalDependencies) @@ -104,6 +103,9 @@ true $(IntDir)\MultiOutSynth.bsc + + MultiOutSynth.lib;%(AdditionalDependencies) + @@ -148,6 +150,9 @@ true $(IntDir)\MultiOutSynth.bsc + + MultiOutSynth.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_VST3.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_VST3.vcxproj index a81d55a38a..b05ce99e96 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_VST3.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_VST3.vcxproj @@ -71,7 +71,7 @@ Disabled - EditAndContinue + ProgramDatabase C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;C:\SDKs\AAX;C:\SDKs\AAX\Interfaces;C:\SDKs\AAX\Interfaces\ACF;..\..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=1;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -96,7 +96,6 @@ $(IntDir)\MultiOutSynth.pdb Windows MachineX86 - false true MultiOutSynth.lib;%(AdditionalDependencies) @@ -104,6 +103,9 @@ true $(IntDir)\MultiOutSynth.bsc + + MultiOutSynth.lib;%(AdditionalDependencies) + @@ -148,6 +150,9 @@ true $(IntDir)\MultiOutSynth.bsc + + MultiOutSynth.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/resources.rc b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/resources.rc index bfa91c14b1..5fbd395644 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/resources.rc +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "MultiOutSynth\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "MultiOutSynth\0" diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_AAX.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_AAX.vcxproj index 2380be018f..df7eb15502 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_AAX.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_AAX.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\MultiOutSynth.bsc + + MultiOutSynth.lib;%(AdditionalDependencies) + if not exist "$(OutDir)\MultiOutSynth.aaxplugin" mkdir "$(OutDir)\MultiOutSynth.aaxplugin" if not exist "$(OutDir)\MultiOutSynth.aaxplugin\Contents" mkdir "$(OutDir)\MultiOutSynth.aaxplugin\Contents" @@ -157,6 +160,9 @@ call "C:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\Mul true $(IntDir)\MultiOutSynth.bsc + + MultiOutSynth.lib;%(AdditionalDependencies) + if not exist "$(OutDir)\MultiOutSynth.aaxplugin" mkdir "$(OutDir)\MultiOutSynth.aaxplugin" if not exist "$(OutDir)\MultiOutSynth.aaxplugin\Contents" mkdir "$(OutDir)\MultiOutSynth.aaxplugin\Contents" diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj index 08e70ff868..a02d096dd6 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\MultiOutSynth.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\MultiOutSynth.bsc + diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_VST.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_VST.vcxproj index dd047619c4..5168ac2033 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_VST.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_VST.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\MultiOutSynth.bsc + + MultiOutSynth.lib;%(AdditionalDependencies) + @@ -147,6 +150,9 @@ true $(IntDir)\MultiOutSynth.bsc + + MultiOutSynth.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_VST3.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_VST3.vcxproj index 65aa9313f0..9c1ea28820 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_VST3.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_VST3.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\MultiOutSynth.bsc + + MultiOutSynth.lib;%(AdditionalDependencies) + @@ -147,6 +150,9 @@ true $(IntDir)\MultiOutSynth.bsc + + MultiOutSynth.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/resources.rc b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/resources.rc index bfa91c14b1..5fbd395644 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/resources.rc +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "MultiOutSynth\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "MultiOutSynth\0" diff --git a/examples/PlugInSamples/MultiOutSynth/MultiOutSynth.jucer b/examples/PlugInSamples/MultiOutSynth/MultiOutSynth.jucer index 8a61647ea6..4a03ef51df 100644 --- a/examples/PlugInSamples/MultiOutSynth/MultiOutSynth.jucer +++ b/examples/PlugInSamples/MultiOutSynth/MultiOutSynth.jucer @@ -12,7 +12,7 @@ jucerVersion="5.1.2" companyName="ROLI Ltd." companyWebsite="www.roli.com" companyEmail="info@juce.com" pluginIsMidiEffectPlugin="0" buildAUv3="0" buildStandalone="0" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" - splashScreenColour="Dark" cppLanguageStandard="11"> + splashScreenColour="Dark" cppLanguageStandard="11" companyCopyright="ROLI Ltd."> diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_AAX.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_AAX.vcxproj index 1ff7826383..703a6b4a6d 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_AAX.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_AAX.vcxproj @@ -71,7 +71,7 @@ Disabled - EditAndContinue + ProgramDatabase C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;C:\SDKs\AAX;C:\SDKs\AAX\Interfaces;C:\SDKs\AAX\Interfaces\ACF;..\..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=1;JucePlugin_Build_Standalone=0;JucePlugin_AAXLibs_path="C:\\SDKs\\AAX\\Libs";%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -96,7 +96,6 @@ $(IntDir)\NoiseGate.pdb Windows MachineX86 - false true NoiseGate.lib;%(AdditionalDependencies) @@ -104,6 +103,9 @@ true $(IntDir)\NoiseGate.bsc + + NoiseGate.lib;%(AdditionalDependencies) + if not exist "$(OutDir)\NoiseGate.aaxplugin" mkdir "$(OutDir)\NoiseGate.aaxplugin" if not exist "$(OutDir)\NoiseGate.aaxplugin\Contents" mkdir "$(OutDir)\NoiseGate.aaxplugin\Contents" @@ -158,6 +160,9 @@ call "C:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\Noi true $(IntDir)\NoiseGate.bsc + + NoiseGate.lib;%(AdditionalDependencies) + if not exist "$(OutDir)\NoiseGate.aaxplugin" mkdir "$(OutDir)\NoiseGate.aaxplugin" if not exist "$(OutDir)\NoiseGate.aaxplugin\Contents" mkdir "$(OutDir)\NoiseGate.aaxplugin\Contents" diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj index 7054c5ad56..66b07ddbd8 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;C:\SDKs\AAX;C:\SDKs\AAX\Interfaces;C:\SDKs\AAX\Interfaces\ACF;..\..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=1;JucePlugin_Build_VST3=1;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=1;JucePlugin_Build_Standalone=0;JUCE_SHARED_CODE=1;_LIB;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -94,13 +94,13 @@ $(IntDir)\NoiseGate.pdb Windows MachineX86 - false true true $(IntDir)\NoiseGate.bsc + MachineX86 @@ -147,6 +147,7 @@ true $(IntDir)\NoiseGate.bsc + MachineX86 diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_VST.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_VST.vcxproj index c18faa3e31..8622c60f6d 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_VST.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_VST.vcxproj @@ -71,7 +71,7 @@ Disabled - EditAndContinue + ProgramDatabase C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;C:\SDKs\AAX;C:\SDKs\AAX\Interfaces;C:\SDKs\AAX\Interfaces\ACF;..\..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=1;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -96,7 +96,6 @@ $(IntDir)\NoiseGate.pdb Windows MachineX86 - false true NoiseGate.lib;%(AdditionalDependencies) @@ -104,6 +103,9 @@ true $(IntDir)\NoiseGate.bsc + + NoiseGate.lib;%(AdditionalDependencies) + @@ -148,6 +150,9 @@ true $(IntDir)\NoiseGate.bsc + + NoiseGate.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_VST3.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_VST3.vcxproj index b84136de2e..2534d06091 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_VST3.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_VST3.vcxproj @@ -71,7 +71,7 @@ Disabled - EditAndContinue + ProgramDatabase C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;C:\SDKs\AAX;C:\SDKs\AAX\Interfaces;C:\SDKs\AAX\Interfaces\ACF;..\..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=1;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -96,7 +96,6 @@ $(IntDir)\NoiseGate.pdb Windows MachineX86 - false true NoiseGate.lib;%(AdditionalDependencies) @@ -104,6 +103,9 @@ true $(IntDir)\NoiseGate.bsc + + NoiseGate.lib;%(AdditionalDependencies) + @@ -148,6 +150,9 @@ true $(IntDir)\NoiseGate.bsc + + NoiseGate.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/resources.rc b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/resources.rc index 214b0e6586..54ece91154 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/resources.rc +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "NoiseGate\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "NoiseGate\0" diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_AAX.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_AAX.vcxproj index 75b21d7a69..7ac6ea50d1 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_AAX.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_AAX.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\NoiseGate.bsc + + NoiseGate.lib;%(AdditionalDependencies) + if not exist "$(OutDir)\NoiseGate.aaxplugin" mkdir "$(OutDir)\NoiseGate.aaxplugin" if not exist "$(OutDir)\NoiseGate.aaxplugin\Contents" mkdir "$(OutDir)\NoiseGate.aaxplugin\Contents" @@ -157,6 +160,9 @@ call "C:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\Noi true $(IntDir)\NoiseGate.bsc + + NoiseGate.lib;%(AdditionalDependencies) + if not exist "$(OutDir)\NoiseGate.aaxplugin" mkdir "$(OutDir)\NoiseGate.aaxplugin" if not exist "$(OutDir)\NoiseGate.aaxplugin\Contents" mkdir "$(OutDir)\NoiseGate.aaxplugin\Contents" diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj index 0a6da7efab..12889d122a 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\NoiseGate.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\NoiseGate.bsc + diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_VST.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_VST.vcxproj index 9522a48f0f..90c215b2b4 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_VST.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_VST.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\NoiseGate.bsc + + NoiseGate.lib;%(AdditionalDependencies) + @@ -147,6 +150,9 @@ true $(IntDir)\NoiseGate.bsc + + NoiseGate.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_VST3.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_VST3.vcxproj index 206d8dcbeb..d74778a686 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_VST3.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_VST3.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\NoiseGate.bsc + + NoiseGate.lib;%(AdditionalDependencies) + @@ -147,6 +150,9 @@ true $(IntDir)\NoiseGate.bsc + + NoiseGate.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/resources.rc b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/resources.rc index 214b0e6586..54ece91154 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/resources.rc +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "NoiseGate\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "NoiseGate\0" diff --git a/examples/PlugInSamples/NoiseGate/NoiseGate.jucer b/examples/PlugInSamples/NoiseGate/NoiseGate.jucer index a763194384..34e51f9f5f 100644 --- a/examples/PlugInSamples/NoiseGate/NoiseGate.jucer +++ b/examples/PlugInSamples/NoiseGate/NoiseGate.jucer @@ -11,7 +11,7 @@ pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.1.2" pluginIsMidiEffectPlugin="0" buildAUv3="0" buildStandalone="0" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark" - companyName="ROLI Ltd." cppLanguageStandard="11"> + companyName="ROLI Ltd." cppLanguageStandard="11" companyCopyright="ROLI Ltd."> diff --git a/examples/PlugInSamples/Surround/Builds/LinuxMakefile/Makefile b/examples/PlugInSamples/Surround/Builds/LinuxMakefile/Makefile index 95e9d115ec..98eb6928db 100644 --- a/examples/PlugInSamples/Surround/Builds/LinuxMakefile/Makefile +++ b/examples/PlugInSamples/Surround/Builds/LinuxMakefile/Makefile @@ -45,7 +45,7 @@ ifeq ($(CONFIG),Debug) JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -fPIC -g -ggdb -O0 -Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion $(CFLAGS) JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -Wl,--no-undefined -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -72,7 +72,7 @@ ifeq ($(CONFIG),Release) JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -fPIC -O3 -Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion $(CFLAGS) JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -Wl,--no-undefined -fvisibility=hidden -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -202,7 +202,7 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 clean: @echo Cleaning Surround diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_AAX.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_AAX.vcxproj index a12a246fc3..b7465c3a40 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_AAX.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_AAX.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\Surround.bsc + + Surround.lib;%(AdditionalDependencies) + if not exist "$(OutDir)\Surround.aaxplugin" mkdir "$(OutDir)\Surround.aaxplugin" if not exist "$(OutDir)\Surround.aaxplugin\Contents" mkdir "$(OutDir)\Surround.aaxplugin\Contents" @@ -157,6 +160,9 @@ call "C:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\Sur true $(IntDir)\Surround.bsc + + Surround.lib;%(AdditionalDependencies) + if not exist "$(OutDir)\Surround.aaxplugin" mkdir "$(OutDir)\Surround.aaxplugin" if not exist "$(OutDir)\Surround.aaxplugin\Contents" mkdir "$(OutDir)\Surround.aaxplugin\Contents" diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj index 3c27187c91..5caf622df9 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\Surround.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\Surround.bsc + diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_VST.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_VST.vcxproj index 57e9e2f36f..1f56150ffb 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_VST.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_VST.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\Surround.bsc + + Surround.lib;%(AdditionalDependencies) + @@ -147,6 +150,9 @@ true $(IntDir)\Surround.bsc + + Surround.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_VST3.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_VST3.vcxproj index dc7e860993..50cd72c2e7 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_VST3.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_VST3.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\Surround.bsc + + Surround.lib;%(AdditionalDependencies) + @@ -147,6 +150,9 @@ true $(IntDir)\Surround.bsc + + Surround.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/resources.rc b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/resources.rc index dbf14b68e2..7a04e20b28 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/resources.rc +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "Surround\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "Surround\0" diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_AAX.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_AAX.vcxproj index d4a2264a32..88b0d573a9 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_AAX.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_AAX.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\Surround.bsc + + Surround.lib;%(AdditionalDependencies) + if not exist "$(OutDir)\Surround.aaxplugin" mkdir "$(OutDir)\Surround.aaxplugin" if not exist "$(OutDir)\Surround.aaxplugin\Contents" mkdir "$(OutDir)\Surround.aaxplugin\Contents" @@ -157,6 +160,9 @@ call "C:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\Sur true $(IntDir)\Surround.bsc + + Surround.lib;%(AdditionalDependencies) + if not exist "$(OutDir)\Surround.aaxplugin" mkdir "$(OutDir)\Surround.aaxplugin" if not exist "$(OutDir)\Surround.aaxplugin\Contents" mkdir "$(OutDir)\Surround.aaxplugin\Contents" diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj index e0a66fa737..f058c61c3e 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\Surround.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\Surround.bsc + diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_VST.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_VST.vcxproj index 3a937de428..2ccc759cce 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_VST.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_VST.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\Surround.bsc + + Surround.lib;%(AdditionalDependencies) + @@ -147,6 +150,9 @@ true $(IntDir)\Surround.bsc + + Surround.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_VST3.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_VST3.vcxproj index 91ceef3e46..e806dc27e0 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_VST3.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_VST3.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\Surround.bsc + + Surround.lib;%(AdditionalDependencies) + @@ -147,6 +150,9 @@ true $(IntDir)\Surround.bsc + + Surround.lib;%(AdditionalDependencies) + diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/resources.rc b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/resources.rc index dbf14b68e2..7a04e20b28 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/resources.rc +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "Surround\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "Surround\0" diff --git a/examples/PlugInSamples/Surround/Surround.jucer b/examples/PlugInSamples/Surround/Surround.jucer index 7a228fe8c2..9eeac1a406 100644 --- a/examples/PlugInSamples/Surround/Surround.jucer +++ b/examples/PlugInSamples/Surround/Surround.jucer @@ -11,7 +11,7 @@ pluginRTASCategory="" aaxIdentifier="com.roli.Surround" pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.1.2" buildAUv3="0" buildStandalone="0" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark" - companyName="ROLI Ltd." cppLanguageStandard="11"> + companyName="ROLI Ltd." cppLanguageStandard="11" companyCopyright="ROLI Ltd."> Disabled - EditAndContinue + ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -94,13 +94,13 @@ $(IntDir)\SimpleFFTExample.pdb Windows MachineX86 - false true true $(IntDir)\SimpleFFTExample.bsc + @@ -144,6 +144,7 @@ true $(IntDir)\SimpleFFTExample.bsc + diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2013/resources.rc b/examples/SimpleFFTExample/Builds/VisualStudio2013/resources.rc index e921203796..13907c1aa4 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2013/resources.rc +++ b/examples/SimpleFFTExample/Builds/VisualStudio2013/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "SimpleFFTExample\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "SimpleFFTExample\0" diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj index ba3d54de37..9bfb25cd39 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj +++ b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\SimpleFFTExample.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\SimpleFFTExample.bsc + diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2017/resources.rc b/examples/SimpleFFTExample/Builds/VisualStudio2017/resources.rc index e921203796..13907c1aa4 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2017/resources.rc +++ b/examples/SimpleFFTExample/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "SimpleFFTExample\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "SimpleFFTExample\0" diff --git a/examples/SimpleFFTExample/SimpleFFTExample.jucer b/examples/SimpleFFTExample/SimpleFFTExample.jucer index e3c909f46f..006378d130 100644 --- a/examples/SimpleFFTExample/SimpleFFTExample.jucer +++ b/examples/SimpleFFTExample/SimpleFFTExample.jucer @@ -3,7 +3,8 @@ + splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="14" + companyCopyright="ROLI Ltd."> /dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 clean: @echo Cleaning JuceDemoPlugin diff --git a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj index 1be11200f6..b5646f3da1 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj +++ b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\JuceDemoPlugin.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\JuceDemoPlugin.bsc + diff --git a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_StandalonePlugin.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_StandalonePlugin.vcxproj index 626fc23b1d..c5a9c9a9a7 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_StandalonePlugin.vcxproj +++ b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_StandalonePlugin.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\JuceDemoPlugin.bsc + + JuceDemoPlugin.lib;%(AdditionalDependencies) + @@ -147,6 +150,9 @@ true $(IntDir)\JuceDemoPlugin.bsc + + JuceDemoPlugin.lib;%(AdditionalDependencies) + diff --git a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_VST.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_VST.vcxproj index a1adae48af..ac79ca3d75 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_VST.vcxproj +++ b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_VST.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\JuceDemoPlugin.bsc + + JuceDemoPlugin.lib;%(AdditionalDependencies) + @@ -147,6 +150,9 @@ true $(IntDir)\JuceDemoPlugin.bsc + + JuceDemoPlugin.lib;%(AdditionalDependencies) + diff --git a/examples/audio plugin demo/Builds/VisualStudio2015/resources.rc b/examples/audio plugin demo/Builds/VisualStudio2015/resources.rc index 2b126d29d6..0d8b242073 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2015/resources.rc +++ b/examples/audio plugin demo/Builds/VisualStudio2015/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "JuceDemoPlugin\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "JuceDemoPlugin\0" diff --git a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj index 4d70efc9d6..743ad773b8 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj +++ b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\JuceDemoPlugin.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\JuceDemoPlugin.bsc + diff --git a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_StandalonePlugin.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_StandalonePlugin.vcxproj index e28cf6e95c..5fbe44e954 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_StandalonePlugin.vcxproj +++ b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_StandalonePlugin.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\JuceDemoPlugin.bsc + + JuceDemoPlugin.lib;%(AdditionalDependencies) + @@ -147,6 +150,9 @@ true $(IntDir)\JuceDemoPlugin.bsc + + JuceDemoPlugin.lib;%(AdditionalDependencies) + diff --git a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_VST.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_VST.vcxproj index 192e2e7091..3995a5dfb2 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_VST.vcxproj +++ b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_VST.vcxproj @@ -104,6 +104,9 @@ true $(IntDir)\JuceDemoPlugin.bsc + + JuceDemoPlugin.lib;%(AdditionalDependencies) + @@ -147,6 +150,9 @@ true $(IntDir)\JuceDemoPlugin.bsc + + JuceDemoPlugin.lib;%(AdditionalDependencies) + diff --git a/examples/audio plugin demo/Builds/VisualStudio2017/resources.rc b/examples/audio plugin demo/Builds/VisualStudio2017/resources.rc index 2b126d29d6..0d8b242073 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2017/resources.rc +++ b/examples/audio plugin demo/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "JuceDemoPlugin\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "JuceDemoPlugin\0" diff --git a/examples/audio plugin demo/Builds/iOS/JuceDemoPlugin/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/audio plugin demo/Builds/iOS/JuceDemoPlugin/Images.xcassets/AppIcon.appiconset/Contents.json index c0af172f62..e216154693 100644 --- a/examples/audio plugin demo/Builds/iOS/JuceDemoPlugin/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/audio plugin demo/Builds/iOS/JuceDemoPlugin/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images": [ + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@2x.png", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "29x29", @@ -54,6 +66,18 @@ "filename": "Icon-@3x.png", "scale": "3x" }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20.png", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20@2x.png", + "scale": "2x" + }, { "idiom": "ipad", "size": "29x29", @@ -119,6 +143,12 @@ "size": "83.5x83.5", "filename": "Icon-83.5@2x.png", "scale": "2x" + }, + { + "idiom": "ios-marketing", + "size": "1024x1024", + "filename": "Icon-AppStore-1024.png", + "scale": "1x" } ], "info": { diff --git a/examples/audio plugin demo/JuceDemoPlugin.jucer b/examples/audio plugin demo/JuceDemoPlugin.jucer index d3c69da7cb..b33dd3dd60 100644 --- a/examples/audio plugin demo/JuceDemoPlugin.jucer +++ b/examples/audio plugin demo/JuceDemoPlugin.jucer @@ -14,7 +14,8 @@ includeBinaryInAppConfig="1" buildVST3="0" pluginManufacturerEmail="support@yourcompany.com" companyWebsite="www.juce.com" companyEmail="info@juce.com" pluginIsMidiEffectPlugin="0" buildAUv3="1" buildStandalone="1" enableIAA="0" displaySplashScreen="0" - reportAppUsage="0" splashScreenColour="Dark" cppLanguageStandard="11"> + reportAppUsage="0" splashScreenColour="Dark" cppLanguageStandard="11" + companyCopyright="ROLI Ltd."> @@ -107,7 +108,8 @@ + iosBackgroundBle="1" microphonePermissionNeeded="1" iPadScreenOrientation="landscape" + iosDeviceFamily="1,2"> diff --git a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj index 5b7ce76b7f..41aa201382 100644 --- a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj +++ b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -94,13 +94,13 @@ $(IntDir)\Plugin Host.pdb Windows MachineX86 - false true true $(IntDir)\Plugin Host.bsc + @@ -144,6 +144,7 @@ true $(IntDir)\Plugin Host.bsc + diff --git a/examples/audio plugin host/Builds/VisualStudio2013/resources.rc b/examples/audio plugin host/Builds/VisualStudio2013/resources.rc index a46b2435b1..05c405fde2 100644 --- a/examples/audio plugin host/Builds/VisualStudio2013/resources.rc +++ b/examples/audio plugin host/Builds/VisualStudio2013/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "Plugin Host\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "Plugin Host\0" diff --git a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj index 178326d317..1ff736981b 100644 --- a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj +++ b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\Plugin Host.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\Plugin Host.bsc + diff --git a/examples/audio plugin host/Builds/VisualStudio2015/resources.rc b/examples/audio plugin host/Builds/VisualStudio2015/resources.rc index a46b2435b1..05c405fde2 100644 --- a/examples/audio plugin host/Builds/VisualStudio2015/resources.rc +++ b/examples/audio plugin host/Builds/VisualStudio2015/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "Plugin Host\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "Plugin Host\0" diff --git a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj index e1eea2ae6b..5a9fed5038 100644 --- a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj +++ b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\Plugin Host.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\Plugin Host.bsc + diff --git a/examples/audio plugin host/Builds/VisualStudio2017/resources.rc b/examples/audio plugin host/Builds/VisualStudio2017/resources.rc index a46b2435b1..05c405fde2 100644 --- a/examples/audio plugin host/Builds/VisualStudio2017/resources.rc +++ b/examples/audio plugin host/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "Plugin Host\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "Plugin Host\0" diff --git a/examples/audio plugin host/Plugin Host.jucer b/examples/audio plugin host/Plugin Host.jucer index b291a47c01..1a32c94cc7 100644 --- a/examples/audio plugin host/Plugin Host.jucer +++ b/examples/audio plugin host/Plugin Host.jucer @@ -4,7 +4,7 @@ juceFolder="../../../juce" vstFolderMac="~/SDKs/vstsdk2.4" vstFolderPC="c:\SDKs\vstsdk2.4" bundleIdentifier="com.roli.pluginhost" jucerVersion="5.1.2" companyName="ROLI Ltd." includeBinaryInAppConfig="1" displaySplashScreen="0" reportAppUsage="0" - splashScreenColour="Dark" cppLanguageStandard="11"> + splashScreenColour="Dark" cppLanguageStandard="11" companyCopyright="ROLI Ltd."> diff --git a/extras/AudioPerformanceTest/AudioPerformanceTest.jucer b/extras/AudioPerformanceTest/AudioPerformanceTest.jucer index 0b0d218a99..43208d49ed 100644 --- a/extras/AudioPerformanceTest/AudioPerformanceTest.jucer +++ b/extras/AudioPerformanceTest/AudioPerformanceTest.jucer @@ -4,7 +4,7 @@ version="1.0.0" bundleIdentifier="com.juce.AudioPerformanceTest" includeBinaryInAppConfig="1" jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark" companyName="ROLI Ltd." - cppLanguageStandard="11"> + cppLanguageStandard="11" companyCopyright="ROLI Ltd."> @@ -33,7 +33,8 @@ - + diff --git a/extras/AudioPerformanceTest/Builds/Android/app/src/main/java/com/juce/audioperformancetest/AudioPerformanceTest.java b/extras/AudioPerformanceTest/Builds/Android/app/src/main/java/com/juce/audioperformancetest/AudioPerformanceTest.java index 5f1a6c3451..5acd24fd57 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/src/main/java/com/juce/audioperformancetest/AudioPerformanceTest.java +++ b/extras/AudioPerformanceTest/Builds/Android/app/src/main/java/com/juce/audioperformancetest/AudioPerformanceTest.java @@ -1329,6 +1329,8 @@ public class AudioPerformanceTest extends Activity public final void deleteView (ComponentPeerView view) { + view.host = 0; + ViewGroup group = (ViewGroup) (view.getParent()); if (group != null) @@ -1558,7 +1560,6 @@ public class AudioPerformanceTest extends Activity setFocusable (true); setFocusableInTouchMode (true); setOnFocusChangeListener (this); - requestFocus(); // swap red and blue colours to match internal opengl texture format ColorMatrix colorMatrix = new ColorMatrix(); @@ -1578,6 +1579,9 @@ public class AudioPerformanceTest extends Activity @Override public void onDraw (Canvas canvas) { + if (host == 0) + return; + handlePaint (host, canvas, paint); } @@ -1599,6 +1603,9 @@ public class AudioPerformanceTest extends Activity @Override public boolean onTouchEvent (MotionEvent event) { + if (host == 0) + return false; + int action = event.getAction(); long time = event.getEventTime(); @@ -1669,6 +1676,9 @@ public class AudioPerformanceTest extends Activity @Override public boolean onKeyDown (int keyCode, KeyEvent event) { + if (host == 0) + return false; + switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: @@ -1691,6 +1701,9 @@ public class AudioPerformanceTest extends Activity @Override public boolean onKeyUp (int keyCode, KeyEvent event) { + if (host == 0) + return false; + handleKeyUp (host, keyCode, event.getUnicodeChar()); return true; } @@ -1698,6 +1711,9 @@ public class AudioPerformanceTest extends Activity @Override public boolean onKeyMultiple (int keyCode, int count, KeyEvent event) { + if (host == 0) + return false; + if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE) return super.onKeyMultiple (keyCode, count, event); @@ -1730,6 +1746,9 @@ public class AudioPerformanceTest extends Activity @Override protected void onSizeChanged (int w, int h, int oldw, int oldh) { + if (host == 0) + return; + super.onSizeChanged (w, h, oldw, oldh); viewSizeChanged (host); } @@ -1746,6 +1765,9 @@ public class AudioPerformanceTest extends Activity @Override public void onFocusChange (View v, boolean hasFocus) { + if (host == 0) + return; + if (v == this) focusChanged (host, hasFocus); } diff --git a/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile b/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile index f99373ae15..9d49210638 100644 --- a/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile +++ b/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile @@ -152,7 +152,7 @@ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o: ../../JuceLibraryCode/include_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 clean: @echo Cleaning AudioPerformanceTest diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj index 76f8e22e7a..8a914d003a 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj @@ -69,7 +69,7 @@ Disabled - EditAndContinue + ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug @@ -94,13 +94,13 @@ $(IntDir)\AudioPerformanceTest.pdb Windows MachineX86 - false true true $(IntDir)\AudioPerformanceTest.bsc + @@ -144,6 +144,7 @@ true $(IntDir)\AudioPerformanceTest.bsc + diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2015/resources.rc b/extras/AudioPerformanceTest/Builds/VisualStudio2015/resources.rc index 9a403c86ce..2dec142923 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2015/resources.rc +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2015/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "AudioPerformanceTest\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "AudioPerformanceTest\0" diff --git a/extras/AudioPerformanceTest/Builds/iOS/AudioPerformanceTest/Images.xcassets/AppIcon.appiconset/Contents.json b/extras/AudioPerformanceTest/Builds/iOS/AudioPerformanceTest/Images.xcassets/AppIcon.appiconset/Contents.json index c0af172f62..e216154693 100644 --- a/extras/AudioPerformanceTest/Builds/iOS/AudioPerformanceTest/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/extras/AudioPerformanceTest/Builds/iOS/AudioPerformanceTest/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images": [ + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@2x.png", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "20x20", + "filename": "Icon-Notification-20@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "29x29", @@ -54,6 +66,18 @@ "filename": "Icon-@3x.png", "scale": "3x" }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20.png", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "20x20", + "filename": "Icon-Notifications-20@2x.png", + "scale": "2x" + }, { "idiom": "ipad", "size": "29x29", @@ -119,6 +143,12 @@ "size": "83.5x83.5", "filename": "Icon-83.5@2x.png", "scale": "2x" + }, + { + "idiom": "ios-marketing", + "size": "1024x1024", + "filename": "Icon-AppStore-1024.png", + "scale": "1x" } ], "info": { diff --git a/extras/Projucer/Projucer.jucer b/extras/Projucer/Projucer.jucer index 5073d63806..386f02d77a 100644 --- a/extras/Projucer/Projucer.jucer +++ b/extras/Projucer/Projucer.jucer @@ -34,10 +34,12 @@ + libraryPath="" defines="" useRuntimeLibDLL="1" wholeProgramOptimisation="1" + debugInformationFormat="ProgramDatabase"/> + libraryPath="" useRuntimeLibDLL="0" debugInformationFormat="None" + linkTimeOptimisation="1"/> @@ -54,10 +56,11 @@ + libraryPath="" useRuntimeLibDLL="1" debugInformationFormat="ProgramDatabase"/> + libraryPath="" useRuntimeLibDLL="0" debugInformationFormat="None" + linkTimeOptimisation="1"/> @@ -72,9 +75,10 @@ + isDebug="1" optimisation="1" targetName="Projucer" debugInformationFormat="ProgramDatabase"/> + isDebug="0" optimisation="3" targetName="Projucer" debugInformationFormat="None" + linkTimeOptimisation="1"/> diff --git a/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile b/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile index 429583776f..2290d2ab0c 100644 --- a/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile +++ b/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile @@ -194,7 +194,7 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 clean: @echo Cleaning UnitTestRunner diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj index 3ceb44471c..4008f32cf0 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\UnitTestRunner.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\UnitTestRunner.bsc + diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/resources.rc b/extras/UnitTestRunner/Builds/VisualStudio2017/resources.rc index 2f07ec796f..3874e39ce9 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/resources.rc +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "UnitTestRunner\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "UnitTestRunner\0" diff --git a/extras/UnitTestRunner/UnitTestRunner.jucer b/extras/UnitTestRunner/UnitTestRunner.jucer index f3ecfd90b9..1e5d7d8abd 100644 --- a/extras/UnitTestRunner/UnitTestRunner.jucer +++ b/extras/UnitTestRunner/UnitTestRunner.jucer @@ -4,7 +4,7 @@ bundleIdentifier="com.roli.UnitTestRunner" includeBinaryInAppConfig="1" jucerVersion="5.1.2" defines="JUCE_UNIT_TESTS=1" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark" companyName="ROLI Ltd." - cppLanguageStandard="14"> + cppLanguageStandard="14" companyCopyright="ROLI Ltd."> diff --git a/extras/binarybuilder/BinaryBuilder.jucer b/extras/binarybuilder/BinaryBuilder.jucer index 0e7cc17a1d..b3b89a0cfb 100644 --- a/extras/binarybuilder/BinaryBuilder.jucer +++ b/extras/binarybuilder/BinaryBuilder.jucer @@ -4,7 +4,7 @@ juceFolder="../../../juce" jucerVersion="5.1.2" bundleIdentifier="com.roli.binarybuilder" includeBinaryInAppConfig="1" version="1.0.0" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark" companyName="ROLI Ltd." - cppLanguageStandard="11"> + cppLanguageStandard="11" companyCopyright="ROLI Ltd."> diff --git a/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder_ConsoleApp.vcxproj b/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder_ConsoleApp.vcxproj index 1eee8ebbc0..d2a41fcc29 100644 --- a/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder_ConsoleApp.vcxproj +++ b/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder_ConsoleApp.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\BinaryBuilder.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\BinaryBuilder.bsc + diff --git a/extras/binarybuilder/Builds/VisualStudio2017/resources.rc b/extras/binarybuilder/Builds/VisualStudio2017/resources.rc index 3e006e7e46..f1fe4e9e9c 100644 --- a/extras/binarybuilder/Builds/VisualStudio2017/resources.rc +++ b/extras/binarybuilder/Builds/VisualStudio2017/resources.rc @@ -14,6 +14,7 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "ROLI Ltd.\0" + VALUE "LegalCopyright", "ROLI Ltd.\0" VALUE "FileDescription", "BinaryBuilder\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "BinaryBuilder\0" diff --git a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj index b2f50c2f55..30ee53b9c2 100644 --- a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj +++ b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj @@ -101,6 +101,7 @@ true $(IntDir)\juce_dll.bsc + @@ -143,6 +144,7 @@ true $(IntDir)\juce_dll.bsc + diff --git a/extras/windows dll/jucedll.jucer b/extras/windows dll/jucedll.jucer index ddd1fbc219..48f1e65e87 100644 --- a/extras/windows dll/jucedll.jucer +++ b/extras/windows dll/jucedll.jucer @@ -4,7 +4,7 @@ juceLinkage="none" bundleIdentifier="com.roli.jucedll" jucerVersion="5.1.2" defines="JUCE_DLL_BUILD=1" includeBinaryInAppConfig="1" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark" companyName="ROLI Ltd." - cppLanguageStandard="11"> + cppLanguageStandard="11" companyCopyright="ROLI Ltd.">