diff --git a/examples/AUv3Synth/Builds/MacOSX/AUv3Synth.xcodeproj/project.pbxproj b/examples/AUv3Synth/Builds/MacOSX/AUv3Synth.xcodeproj/project.pbxproj index f1639bc5d5..74a74b0382 100644 --- a/examples/AUv3Synth/Builds/MacOSX/AUv3Synth.xcodeproj/project.pbxproj +++ b/examples/AUv3Synth/Builds/MacOSX/AUv3Synth.xcodeproj/project.pbxproj @@ -705,7 +705,7 @@ 9ABBEEC4C47DAD09F4B221C1, ); runOnlyForDeploymentPostprocessing = 0; }; CD6892FED0DB19C0DDD9AD37 = {isa = PBXNativeTarget; buildConfigurationList = AF907C78A0D17B741F5F8944; buildPhases = ( 1F4A8812AAE49E02F3215F48, ); buildRules = ( ); dependencies = ( ); name = "AUv3Synth - Shared Code"; productName = AUv3Synth; productReference = 9536B5A780A03F6BACB24144; productType = "com.apple.product-type.library.static"; }; - D0E003364F0BE3205BD9243E = {isa = PBXProject; buildConfigurationList = 444EA74CE26BF416566E542C; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { EF49DCC88B5FC3C6E67ED2A4 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };73F4C13CDCAC7EE5914F2E61 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };386D3CCDC878EC299C56FB39 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };7A046597FDDDB82B78C64AAC = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 1; }; }; };D493488C4B5B9D9B5990FEE2 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };CD6892FED0DB19C0DDD9AD37 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4BFA153CE4E8A774C67EC642; projectDirPath = ""; projectRoot = ""; targets = (EF49DCC88B5FC3C6E67ED2A4, 73F4C13CDCAC7EE5914F2E61, 386D3CCDC878EC299C56FB39, 7A046597FDDDB82B78C64AAC, D493488C4B5B9D9B5990FEE2, CD6892FED0DB19C0DDD9AD37); }; + D0E003364F0BE3205BD9243E = {isa = PBXProject; buildConfigurationList = 444EA74CE26BF416566E542C; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { EF49DCC88B5FC3C6E67ED2A4 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };73F4C13CDCAC7EE5914F2E61 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };386D3CCDC878EC299C56FB39 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };7A046597FDDDB82B78C64AAC = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 1; }; }; };D493488C4B5B9D9B5990FEE2 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };CD6892FED0DB19C0DDD9AD37 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4BFA153CE4E8A774C67EC642; projectDirPath = ""; projectRoot = ""; targets = (EF49DCC88B5FC3C6E67ED2A4, 73F4C13CDCAC7EE5914F2E61, 386D3CCDC878EC299C56FB39, 7A046597FDDDB82B78C64AAC, D493488C4B5B9D9B5990FEE2, CD6892FED0DB19C0DDD9AD37); }; }; rootObject = D0E003364F0BE3205BD9243E; } diff --git a/examples/AUv3Synth/Builds/iOS/AUv3Synth.xcodeproj/project.pbxproj b/examples/AUv3Synth/Builds/iOS/AUv3Synth.xcodeproj/project.pbxproj index cf8d23e64e..dbfbfd602c 100644 --- a/examples/AUv3Synth/Builds/iOS/AUv3Synth.xcodeproj/project.pbxproj +++ b/examples/AUv3Synth/Builds/iOS/AUv3Synth.xcodeproj/project.pbxproj @@ -487,7 +487,7 @@ 9ABBEEC4C47DAD09F4B221C1, ); runOnlyForDeploymentPostprocessing = 0; }; CD6892FED0DB19C0DDD9AD37 = {isa = PBXNativeTarget; buildConfigurationList = AF907C78A0D17B741F5F8944; buildPhases = ( 1F4A8812AAE49E02F3215F48, ); buildRules = ( ); dependencies = ( ); name = "AUv3Synth - Shared Code"; productName = AUv3Synth; productReference = 9536B5A780A03F6BACB24144; productType = "com.apple.product-type.library.static"; }; - D0E003364F0BE3205BD9243E = {isa = PBXProject; buildConfigurationList = 444EA74CE26BF416566E542C; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { EF49DCC88B5FC3C6E67ED2A4 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };7A046597FDDDB82B78C64AAC = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 1; }; }; };D493488C4B5B9D9B5990FEE2 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };CD6892FED0DB19C0DDD9AD37 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4BFA153CE4E8A774C67EC642; projectDirPath = ""; projectRoot = ""; targets = (EF49DCC88B5FC3C6E67ED2A4, 7A046597FDDDB82B78C64AAC, D493488C4B5B9D9B5990FEE2, CD6892FED0DB19C0DDD9AD37); }; + D0E003364F0BE3205BD9243E = {isa = PBXProject; buildConfigurationList = 444EA74CE26BF416566E542C; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { EF49DCC88B5FC3C6E67ED2A4 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };7A046597FDDDB82B78C64AAC = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 1; }; }; };D493488C4B5B9D9B5990FEE2 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };CD6892FED0DB19C0DDD9AD37 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4BFA153CE4E8A774C67EC642; projectDirPath = ""; projectRoot = ""; targets = (EF49DCC88B5FC3C6E67ED2A4, 7A046597FDDDB82B78C64AAC, D493488C4B5B9D9B5990FEE2, CD6892FED0DB19C0DDD9AD37); }; }; rootObject = D0E003364F0BE3205BD9243E; } diff --git a/examples/AUv3Synth/JuceLibraryCode/AppConfig.h b/examples/AUv3Synth/JuceLibraryCode/AppConfig.h index 0821f2c587..2e47abbced 100644 --- a/examples/AUv3Synth/JuceLibraryCode/AppConfig.h +++ b/examples/AUv3Synth/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/AnimationAppExample/Builds/MacOSX/AnimationAppExample.xcodeproj/project.pbxproj b/examples/AnimationAppExample/Builds/MacOSX/AnimationAppExample.xcodeproj/project.pbxproj index 03c36a6e79..93fa788168 100644 --- a/examples/AnimationAppExample/Builds/MacOSX/AnimationAppExample.xcodeproj/project.pbxproj +++ b/examples/AnimationAppExample/Builds/MacOSX/AnimationAppExample.xcodeproj/project.pbxproj @@ -277,7 +277,7 @@ 6DD59723DA58F112C3C6F427, 2CCE82C7290D2D226DD34C0B, 4516F5A575174EF76FEAD8B3, ); buildRules = ( ); dependencies = ( ); name = "AnimationAppExample - App"; productName = AnimationAppExample; productReference = CBF69B3CBCD089CD7DC8343C; productType = "com.apple.product-type.application"; }; - AEF97977FF56185DB5E0C493 = {isa = PBXProject; buildConfigurationList = 576D6DACFB71E339D0AD373A; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 80F5D4DB72CAE33FF7BE0E28 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = E2839CF91E2C633A933666F4; projectDirPath = ""; projectRoot = ""; targets = (80F5D4DB72CAE33FF7BE0E28); }; + AEF97977FF56185DB5E0C493 = {isa = PBXProject; buildConfigurationList = 576D6DACFB71E339D0AD373A; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 80F5D4DB72CAE33FF7BE0E28 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = E2839CF91E2C633A933666F4; projectDirPath = ""; projectRoot = ""; targets = (80F5D4DB72CAE33FF7BE0E28); }; }; rootObject = AEF97977FF56185DB5E0C493; } diff --git a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample.sln b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample.sln index da8bcbca36..f0affd5880 100644 --- a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample.sln +++ b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D44A6FC4-2DA0-C221-F876-2A2012D2840C}.Debug|x64.Build.0 = Debug|x64 {D44A6FC4-2DA0-C221-F876-2A2012D2840C}.Debug|x64.ActiveCfg = Debug|x64 - {D44A6FC4-2DA0-C221-F876-2A2012D2840C}.Release|x64.Build.0 = Release|x64 + {D44A6FC4-2DA0-C221-F876-2A2012D2840C}.Debug|x64.Build.0 = Debug|x64 {D44A6FC4-2DA0-C221-F876-2A2012D2840C}.Release|x64.ActiveCfg = Release|x64 + {D44A6FC4-2DA0-C221-F876-2A2012D2840C}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj index ce34be1c5e..06eaaa7466 100644 --- a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj +++ b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj @@ -2107,6 +2107,7 @@ + diff --git a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj.filters b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj.filters index 13b5544336..33c30020db 100644 --- a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj.filters +++ b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj.filters @@ -3261,6 +3261,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/AnimationAppExample/Builds/iOS/AnimationAppExample.xcodeproj/project.pbxproj b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample.xcodeproj/project.pbxproj index 5c97271b9a..b9f7170de2 100644 --- a/examples/AnimationAppExample/Builds/iOS/AnimationAppExample.xcodeproj/project.pbxproj +++ b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample.xcodeproj/project.pbxproj @@ -283,7 +283,7 @@ 6DD59723DA58F112C3C6F427, 2CCE82C7290D2D226DD34C0B, 4516F5A575174EF76FEAD8B3, ); buildRules = ( ); dependencies = ( ); name = "AnimationAppExample - App"; productName = AnimationAppExample; productReference = CBF69B3CBCD089CD7DC8343C; productType = "com.apple.product-type.application"; }; - AEF97977FF56185DB5E0C493 = {isa = PBXProject; buildConfigurationList = 576D6DACFB71E339D0AD373A; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 80F5D4DB72CAE33FF7BE0E28 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = E2839CF91E2C633A933666F4; projectDirPath = ""; projectRoot = ""; targets = (80F5D4DB72CAE33FF7BE0E28); }; + AEF97977FF56185DB5E0C493 = {isa = PBXProject; buildConfigurationList = 576D6DACFB71E339D0AD373A; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 80F5D4DB72CAE33FF7BE0E28 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = E2839CF91E2C633A933666F4; projectDirPath = ""; projectRoot = ""; targets = (80F5D4DB72CAE33FF7BE0E28); }; }; rootObject = AEF97977FF56185DB5E0C493; } diff --git a/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h b/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h index 53a250eaec..9c3110579c 100644 --- a/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/AudioAppExample/Builds/MacOSX/AudioAppExample.xcodeproj/project.pbxproj b/examples/AudioAppExample/Builds/MacOSX/AudioAppExample.xcodeproj/project.pbxproj index 17d2bf8fb2..35c478a6ed 100644 --- a/examples/AudioAppExample/Builds/MacOSX/AudioAppExample.xcodeproj/project.pbxproj +++ b/examples/AudioAppExample/Builds/MacOSX/AudioAppExample.xcodeproj/project.pbxproj @@ -287,7 +287,7 @@ 3602833D915A2AC7C25F537F, BC3ECD5BCB6580E951083B7E, C9974DDFB456D5307D4C29F3, ); buildRules = ( ); dependencies = ( ); name = "AudioAppExample - App"; productName = AudioAppExample; productReference = 9C71E9533EDADF610F789D88; productType = "com.apple.product-type.application"; }; - 0E00FEF4A999DE35888889AE = {isa = PBXProject; buildConfigurationList = 074FE87A26471418B3AC0921; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { D010D5837C01EB7574A48649 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 41A4B977F5588A439A066455; projectDirPath = ""; projectRoot = ""; targets = (D010D5837C01EB7574A48649); }; + 0E00FEF4A999DE35888889AE = {isa = PBXProject; buildConfigurationList = 074FE87A26471418B3AC0921; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { D010D5837C01EB7574A48649 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 41A4B977F5588A439A066455; projectDirPath = ""; projectRoot = ""; targets = (D010D5837C01EB7574A48649); }; }; rootObject = 0E00FEF4A999DE35888889AE; } diff --git a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample.sln b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample.sln index 336af032df..727002eef4 100644 --- a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample.sln +++ b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5EC68AA6-F066-CCC4-21D6-89C2125F627F}.Debug|x64.Build.0 = Debug|x64 {5EC68AA6-F066-CCC4-21D6-89C2125F627F}.Debug|x64.ActiveCfg = Debug|x64 - {5EC68AA6-F066-CCC4-21D6-89C2125F627F}.Release|x64.Build.0 = Release|x64 + {5EC68AA6-F066-CCC4-21D6-89C2125F627F}.Debug|x64.Build.0 = Debug|x64 {5EC68AA6-F066-CCC4-21D6-89C2125F627F}.Release|x64.ActiveCfg = Release|x64 + {5EC68AA6-F066-CCC4-21D6-89C2125F627F}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj index cd5bac7815..b5ce09fd8e 100644 --- a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj +++ b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj @@ -2169,6 +2169,7 @@ + diff --git a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj.filters b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj.filters index 35e468d2d2..a2d4fe4103 100644 --- a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj.filters +++ b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj.filters @@ -3381,6 +3381,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/AudioAppExample/Builds/iOS/AudioAppExample.xcodeproj/project.pbxproj b/examples/AudioAppExample/Builds/iOS/AudioAppExample.xcodeproj/project.pbxproj index 6fc60cc2dd..12168eb818 100644 --- a/examples/AudioAppExample/Builds/iOS/AudioAppExample.xcodeproj/project.pbxproj +++ b/examples/AudioAppExample/Builds/iOS/AudioAppExample.xcodeproj/project.pbxproj @@ -293,7 +293,7 @@ 3602833D915A2AC7C25F537F, BC3ECD5BCB6580E951083B7E, C9974DDFB456D5307D4C29F3, ); buildRules = ( ); dependencies = ( ); name = "AudioAppExample - App"; productName = AudioAppExample; productReference = 9C71E9533EDADF610F789D88; productType = "com.apple.product-type.application"; }; - 0E00FEF4A999DE35888889AE = {isa = PBXProject; buildConfigurationList = 074FE87A26471418B3AC0921; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { D010D5837C01EB7574A48649 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 41A4B977F5588A439A066455; projectDirPath = ""; projectRoot = ""; targets = (D010D5837C01EB7574A48649); }; + 0E00FEF4A999DE35888889AE = {isa = PBXProject; buildConfigurationList = 074FE87A26471418B3AC0921; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { D010D5837C01EB7574A48649 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 41A4B977F5588A439A066455; projectDirPath = ""; projectRoot = ""; targets = (D010D5837C01EB7574A48649); }; }; rootObject = 0E00FEF4A999DE35888889AE; } diff --git a/examples/AudioAppExample/JuceLibraryCode/AppConfig.h b/examples/AudioAppExample/JuceLibraryCode/AppConfig.h index 2aa7724fea..88d18d77c1 100644 --- a/examples/AudioAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/AudioAppExample/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/BLOCKS/BlocksDrawing/Builds/MacOSX/BlocksDrawing.xcodeproj/project.pbxproj b/examples/BLOCKS/BlocksDrawing/Builds/MacOSX/BlocksDrawing.xcodeproj/project.pbxproj index d0a14a96f0..55c273419d 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/MacOSX/BlocksDrawing.xcodeproj/project.pbxproj +++ b/examples/BLOCKS/BlocksDrawing/Builds/MacOSX/BlocksDrawing.xcodeproj/project.pbxproj @@ -277,7 +277,7 @@ B64F4B6419098A6C579D0EDB, 6F1EAB6EC19EDAB88EF14DE0, 704E8CB52C968D24DAE2ABD5, ); buildRules = ( ); dependencies = ( ); name = "BlocksDrawing - App"; productName = BlocksDrawing; productReference = 7A425A86C84D843976582BAF; productType = "com.apple.product-type.application"; }; - 46C68557D30B3B44D3FE037B = {isa = PBXProject; buildConfigurationList = DD23365E44ACBF007DC85D46; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { F0C1DAFB0E78213F565F044F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 0E79852FE469702C8F99D6F3; projectDirPath = ""; projectRoot = ""; targets = (F0C1DAFB0E78213F565F044F); }; + 46C68557D30B3B44D3FE037B = {isa = PBXProject; buildConfigurationList = DD23365E44ACBF007DC85D46; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { F0C1DAFB0E78213F565F044F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 0E79852FE469702C8F99D6F3; projectDirPath = ""; projectRoot = ""; targets = (F0C1DAFB0E78213F565F044F); }; }; rootObject = 46C68557D30B3B44D3FE037B; } diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing.sln b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing.sln index 0f9cdaa414..fa61057bce 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing.sln +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing.sln @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CFD78289-DF68-E998-FA52-BA8B893952D3}.Debug|Win32.Build.0 = Debug|Win32 {CFD78289-DF68-E998-FA52-BA8B893952D3}.Debug|Win32.ActiveCfg = Debug|Win32 - {CFD78289-DF68-E998-FA52-BA8B893952D3}.Release|Win32.Build.0 = Release|Win32 + {CFD78289-DF68-E998-FA52-BA8B893952D3}.Debug|Win32.Build.0 = Debug|Win32 {CFD78289-DF68-E998-FA52-BA8B893952D3}.Release|Win32.ActiveCfg = Release|Win32 + {CFD78289-DF68-E998-FA52-BA8B893952D3}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj index 676f6af690..04d1b4d775 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj @@ -2169,6 +2169,7 @@ + diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj.filters b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj.filters index 17784c2674..603edb2969 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj.filters +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj.filters @@ -3399,6 +3399,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing.sln b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing.sln index 4b71f6c548..a55c87125f 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing.sln +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CFD78289-DF68-E998-FA52-BA8B893952D3}.Debug|x64.Build.0 = Debug|x64 {CFD78289-DF68-E998-FA52-BA8B893952D3}.Debug|x64.ActiveCfg = Debug|x64 - {CFD78289-DF68-E998-FA52-BA8B893952D3}.Release|x64.Build.0 = Release|x64 + {CFD78289-DF68-E998-FA52-BA8B893952D3}.Debug|x64.Build.0 = Debug|x64 {CFD78289-DF68-E998-FA52-BA8B893952D3}.Release|x64.ActiveCfg = Release|x64 + {CFD78289-DF68-E998-FA52-BA8B893952D3}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj index 488416a964..c2b4b36506 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj @@ -2168,6 +2168,7 @@ + diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj.filters b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj.filters index cdcd7a0c04..13c58307be 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj.filters +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj.filters @@ -3399,6 +3399,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/BLOCKS/BlocksDrawing/Builds/iOS/BlocksDrawing.xcodeproj/project.pbxproj b/examples/BLOCKS/BlocksDrawing/Builds/iOS/BlocksDrawing.xcodeproj/project.pbxproj index 9b8aa5c035..ebd619f1c4 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/iOS/BlocksDrawing.xcodeproj/project.pbxproj +++ b/examples/BLOCKS/BlocksDrawing/Builds/iOS/BlocksDrawing.xcodeproj/project.pbxproj @@ -291,7 +291,7 @@ B64F4B6419098A6C579D0EDB, 6F1EAB6EC19EDAB88EF14DE0, 704E8CB52C968D24DAE2ABD5, ); buildRules = ( ); dependencies = ( ); name = "BlocksDrawing - App"; productName = BlocksDrawing; productReference = 7A425A86C84D843976582BAF; productType = "com.apple.product-type.application"; }; - 46C68557D30B3B44D3FE037B = {isa = PBXProject; buildConfigurationList = DD23365E44ACBF007DC85D46; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { F0C1DAFB0E78213F565F044F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 0E79852FE469702C8F99D6F3; projectDirPath = ""; projectRoot = ""; targets = (F0C1DAFB0E78213F565F044F); }; + 46C68557D30B3B44D3FE037B = {isa = PBXProject; buildConfigurationList = DD23365E44ACBF007DC85D46; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { F0C1DAFB0E78213F565F044F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 0E79852FE469702C8F99D6F3; projectDirPath = ""; projectRoot = ""; targets = (F0C1DAFB0E78213F565F044F); }; }; rootObject = 46C68557D30B3B44D3FE037B; } diff --git a/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h b/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h index 70ed8851da..2fac4519ce 100644 --- a/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h +++ b/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/BLOCKS/BlocksMonitor/Builds/MacOSX/BlocksMonitor.xcodeproj/project.pbxproj b/examples/BLOCKS/BlocksMonitor/Builds/MacOSX/BlocksMonitor.xcodeproj/project.pbxproj index 33402cebbb..4802d19474 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/MacOSX/BlocksMonitor.xcodeproj/project.pbxproj +++ b/examples/BLOCKS/BlocksMonitor/Builds/MacOSX/BlocksMonitor.xcodeproj/project.pbxproj @@ -273,7 +273,7 @@ D08BB290D5F778E1450AD3F3, 9C2AF708958E95C688544D95, 2410311707C8C7B9E6CFE23D, ); buildRules = ( ); dependencies = ( ); name = "BlocksMonitor - App"; productName = BlocksMonitor; productReference = 00558AF4AA37DD00B15B21A8; productType = "com.apple.product-type.application"; }; - B42B7651E1352BD7921E5754 = {isa = PBXProject; buildConfigurationList = 61CDB68D74329CF066EA57D6; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 9C6BA11D1261B15A2F52EB60 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 5D6DAC6A0A862ED325F1DB34; projectDirPath = ""; projectRoot = ""; targets = (9C6BA11D1261B15A2F52EB60); }; + B42B7651E1352BD7921E5754 = {isa = PBXProject; buildConfigurationList = 61CDB68D74329CF066EA57D6; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 9C6BA11D1261B15A2F52EB60 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 5D6DAC6A0A862ED325F1DB34; projectDirPath = ""; projectRoot = ""; targets = (9C6BA11D1261B15A2F52EB60); }; }; rootObject = B42B7651E1352BD7921E5754; } diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor.sln b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor.sln index fcaac75c15..e89b3ea869 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor.sln +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor.sln @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {03DA01BF-8B38-2BC2-67A7-AE95C2E39250}.Debug|Win32.Build.0 = Debug|Win32 {03DA01BF-8B38-2BC2-67A7-AE95C2E39250}.Debug|Win32.ActiveCfg = Debug|Win32 - {03DA01BF-8B38-2BC2-67A7-AE95C2E39250}.Release|Win32.Build.0 = Release|Win32 + {03DA01BF-8B38-2BC2-67A7-AE95C2E39250}.Debug|Win32.Build.0 = Debug|Win32 {03DA01BF-8B38-2BC2-67A7-AE95C2E39250}.Release|Win32.ActiveCfg = Release|Win32 + {03DA01BF-8B38-2BC2-67A7-AE95C2E39250}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj index a01a79e213..603d66cfca 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj @@ -2168,6 +2168,7 @@ + diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj.filters b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj.filters index 2cf4894710..ea67ff8219 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj.filters +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj.filters @@ -3396,6 +3396,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor.sln b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor.sln index 5b3012da19..541d13c35d 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor.sln +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {03DA01BF-8B38-2BC2-67A7-AE95C2E39250}.Debug|x64.Build.0 = Debug|x64 {03DA01BF-8B38-2BC2-67A7-AE95C2E39250}.Debug|x64.ActiveCfg = Debug|x64 - {03DA01BF-8B38-2BC2-67A7-AE95C2E39250}.Release|x64.Build.0 = Release|x64 + {03DA01BF-8B38-2BC2-67A7-AE95C2E39250}.Debug|x64.Build.0 = Debug|x64 {03DA01BF-8B38-2BC2-67A7-AE95C2E39250}.Release|x64.ActiveCfg = Release|x64 + {03DA01BF-8B38-2BC2-67A7-AE95C2E39250}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj index d11e5e5168..28ec1343f5 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj @@ -2167,6 +2167,7 @@ + diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj.filters b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj.filters index 51b397d59a..ae9b2cf502 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj.filters +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj.filters @@ -3396,6 +3396,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/BLOCKS/BlocksMonitor/Builds/iOS/BlocksMonitor.xcodeproj/project.pbxproj b/examples/BLOCKS/BlocksMonitor/Builds/iOS/BlocksMonitor.xcodeproj/project.pbxproj index 1eb6d2e3c7..f8306f84de 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/iOS/BlocksMonitor.xcodeproj/project.pbxproj +++ b/examples/BLOCKS/BlocksMonitor/Builds/iOS/BlocksMonitor.xcodeproj/project.pbxproj @@ -287,7 +287,7 @@ D08BB290D5F778E1450AD3F3, 9C2AF708958E95C688544D95, 2410311707C8C7B9E6CFE23D, ); buildRules = ( ); dependencies = ( ); name = "BlocksMonitor - App"; productName = BlocksMonitor; productReference = 00558AF4AA37DD00B15B21A8; productType = "com.apple.product-type.application"; }; - B42B7651E1352BD7921E5754 = {isa = PBXProject; buildConfigurationList = 61CDB68D74329CF066EA57D6; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 9C6BA11D1261B15A2F52EB60 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 5D6DAC6A0A862ED325F1DB34; projectDirPath = ""; projectRoot = ""; targets = (9C6BA11D1261B15A2F52EB60); }; + B42B7651E1352BD7921E5754 = {isa = PBXProject; buildConfigurationList = 61CDB68D74329CF066EA57D6; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 9C6BA11D1261B15A2F52EB60 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 5D6DAC6A0A862ED325F1DB34; projectDirPath = ""; projectRoot = ""; targets = (9C6BA11D1261B15A2F52EB60); }; }; rootObject = B42B7651E1352BD7921E5754; } diff --git a/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h b/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h index 70ed8851da..2fac4519ce 100644 --- a/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h +++ b/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/BLOCKS/BlocksSynth/Builds/MacOSX/BlocksSynth.xcodeproj/project.pbxproj b/examples/BLOCKS/BlocksSynth/Builds/MacOSX/BlocksSynth.xcodeproj/project.pbxproj index 1c6257fbf7..da8536fd42 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/MacOSX/BlocksSynth.xcodeproj/project.pbxproj +++ b/examples/BLOCKS/BlocksSynth/Builds/MacOSX/BlocksSynth.xcodeproj/project.pbxproj @@ -279,7 +279,7 @@ B62995CCD71EBA82C2BC1692, C8A1585A07BDCD77C240ECAA, 1EFBDD8D783B94E754626B32, ); buildRules = ( ); dependencies = ( ); name = "BlocksSynth - App"; productName = BlocksSynth; productReference = D778C2ED7EA9D5EDCFBA1507; productType = "com.apple.product-type.application"; }; - C28D173095C609C48901860E = {isa = PBXProject; buildConfigurationList = F2BDE5D743A9870C169E5CC8; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 0B9ADB15A71FB90DD6919895 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 0F4E2B72B683E9B48DF13DDB; projectDirPath = ""; projectRoot = ""; targets = (0B9ADB15A71FB90DD6919895); }; + C28D173095C609C48901860E = {isa = PBXProject; buildConfigurationList = F2BDE5D743A9870C169E5CC8; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 0B9ADB15A71FB90DD6919895 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 0F4E2B72B683E9B48DF13DDB; projectDirPath = ""; projectRoot = ""; targets = (0B9ADB15A71FB90DD6919895); }; }; rootObject = C28D173095C609C48901860E; } diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth.sln b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth.sln index a14aae89b0..8ba79256ab 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth.sln +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth.sln @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CB640A07-7531-1DE6-BD35-4AC4E7641B33}.Debug|Win32.Build.0 = Debug|Win32 {CB640A07-7531-1DE6-BD35-4AC4E7641B33}.Debug|Win32.ActiveCfg = Debug|Win32 - {CB640A07-7531-1DE6-BD35-4AC4E7641B33}.Release|Win32.Build.0 = Release|Win32 + {CB640A07-7531-1DE6-BD35-4AC4E7641B33}.Debug|Win32.Build.0 = Debug|Win32 {CB640A07-7531-1DE6-BD35-4AC4E7641B33}.Release|Win32.ActiveCfg = Release|Win32 + {CB640A07-7531-1DE6-BD35-4AC4E7641B33}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj index 8f9f579559..5a91be306e 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj @@ -2170,6 +2170,7 @@ + diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj.filters b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj.filters index e570a6be75..d221c2983d 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj.filters +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj.filters @@ -3405,6 +3405,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth.sln b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth.sln index 7c25f4d738..875b8f9e10 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth.sln +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CB640A07-7531-1DE6-BD35-4AC4E7641B33}.Debug|x64.Build.0 = Debug|x64 {CB640A07-7531-1DE6-BD35-4AC4E7641B33}.Debug|x64.ActiveCfg = Debug|x64 - {CB640A07-7531-1DE6-BD35-4AC4E7641B33}.Release|x64.Build.0 = Release|x64 + {CB640A07-7531-1DE6-BD35-4AC4E7641B33}.Debug|x64.Build.0 = Debug|x64 {CB640A07-7531-1DE6-BD35-4AC4E7641B33}.Release|x64.ActiveCfg = Release|x64 + {CB640A07-7531-1DE6-BD35-4AC4E7641B33}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj index 125fa93120..f690c1445f 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj @@ -2169,6 +2169,7 @@ + diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj.filters b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj.filters index b051f6426e..f4b586c1fa 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj.filters +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj.filters @@ -3405,6 +3405,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/BLOCKS/BlocksSynth/Builds/iOS/BlocksSynth.xcodeproj/project.pbxproj b/examples/BLOCKS/BlocksSynth/Builds/iOS/BlocksSynth.xcodeproj/project.pbxproj index 776931a03c..2db117c8c8 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/iOS/BlocksSynth.xcodeproj/project.pbxproj +++ b/examples/BLOCKS/BlocksSynth/Builds/iOS/BlocksSynth.xcodeproj/project.pbxproj @@ -293,7 +293,7 @@ B62995CCD71EBA82C2BC1692, C8A1585A07BDCD77C240ECAA, 1EFBDD8D783B94E754626B32, ); buildRules = ( ); dependencies = ( ); name = "BlocksSynth - App"; productName = BlocksSynth; productReference = D778C2ED7EA9D5EDCFBA1507; productType = "com.apple.product-type.application"; }; - C28D173095C609C48901860E = {isa = PBXProject; buildConfigurationList = F2BDE5D743A9870C169E5CC8; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 0B9ADB15A71FB90DD6919895 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 0F4E2B72B683E9B48DF13DDB; projectDirPath = ""; projectRoot = ""; targets = (0B9ADB15A71FB90DD6919895); }; + C28D173095C609C48901860E = {isa = PBXProject; buildConfigurationList = F2BDE5D743A9870C169E5CC8; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 0B9ADB15A71FB90DD6919895 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 0F4E2B72B683E9B48DF13DDB; projectDirPath = ""; projectRoot = ""; targets = (0B9ADB15A71FB90DD6919895); }; }; rootObject = C28D173095C609C48901860E; } diff --git a/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h b/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h index 70ed8851da..2fac4519ce 100644 --- a/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h +++ b/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/BouncingBallWavetableDemo/Builds/MacOSX/BouncingBallWavetableDemo.xcodeproj/project.pbxproj b/examples/BouncingBallWavetableDemo/Builds/MacOSX/BouncingBallWavetableDemo.xcodeproj/project.pbxproj index 20cfefeacb..4c8f30db34 100644 --- a/examples/BouncingBallWavetableDemo/Builds/MacOSX/BouncingBallWavetableDemo.xcodeproj/project.pbxproj +++ b/examples/BouncingBallWavetableDemo/Builds/MacOSX/BouncingBallWavetableDemo.xcodeproj/project.pbxproj @@ -277,7 +277,7 @@ 9DB3F429F51E36C0D0BA23BE, 61103B6693CEFBD075D35197, 7F8CC4D24837DC0A20E4755D, ); buildRules = ( ); dependencies = ( ); name = "BouncingBallWavetableDemo - App"; productName = BouncingBallWavetableDemo; productReference = 4AAB1224C8A731A6994D74CE; productType = "com.apple.product-type.application"; }; - 974612E740A911D4EF4009DB = {isa = PBXProject; buildConfigurationList = 188D4D6EAB63E875595F6B81; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 17E038E1F4CB0730CD868712 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3F698ABD99D14CCA53BFAF17; projectDirPath = ""; projectRoot = ""; targets = (17E038E1F4CB0730CD868712); }; + 974612E740A911D4EF4009DB = {isa = PBXProject; buildConfigurationList = 188D4D6EAB63E875595F6B81; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 17E038E1F4CB0730CD868712 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3F698ABD99D14CCA53BFAF17; projectDirPath = ""; projectRoot = ""; targets = (17E038E1F4CB0730CD868712); }; }; rootObject = 974612E740A911D4EF4009DB; } diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo.sln b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo.sln index e80161be28..6c3af8bb53 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo.sln +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo.sln @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {92F70965-E03C-282C-1EE5-5DD138408925}.Debug|Win32.Build.0 = Debug|Win32 {92F70965-E03C-282C-1EE5-5DD138408925}.Debug|Win32.ActiveCfg = Debug|Win32 - {92F70965-E03C-282C-1EE5-5DD138408925}.Release|Win32.Build.0 = Release|Win32 + {92F70965-E03C-282C-1EE5-5DD138408925}.Debug|Win32.Build.0 = Debug|Win32 {92F70965-E03C-282C-1EE5-5DD138408925}.Release|Win32.ActiveCfg = Release|Win32 + {92F70965-E03C-282C-1EE5-5DD138408925}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj index 531d9592a8..277b0cd703 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj @@ -2139,6 +2139,7 @@ + diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj.filters b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj.filters index 490819a796..70986b5351 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj.filters +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj.filters @@ -3330,6 +3330,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo.sln b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo.sln index a0ce9ceb50..015205bf53 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo.sln +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {92F70965-E03C-282C-1EE5-5DD138408925}.Debug|x64.Build.0 = Debug|x64 {92F70965-E03C-282C-1EE5-5DD138408925}.Debug|x64.ActiveCfg = Debug|x64 - {92F70965-E03C-282C-1EE5-5DD138408925}.Release|x64.Build.0 = Release|x64 + {92F70965-E03C-282C-1EE5-5DD138408925}.Debug|x64.Build.0 = Debug|x64 {92F70965-E03C-282C-1EE5-5DD138408925}.Release|x64.ActiveCfg = Release|x64 + {92F70965-E03C-282C-1EE5-5DD138408925}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj index 8c9c8756db..e5c1c27551 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj @@ -2138,6 +2138,7 @@ + diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj.filters b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj.filters index ebf862662a..c2102d3466 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj.filters +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj.filters @@ -3330,6 +3330,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h b/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h index 60883f8c22..a51b0b2278 100644 --- a/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h +++ b/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/ComponentTutorialExample/Builds/MacOSX/ComponentTutorialExample.xcodeproj/project.pbxproj b/examples/ComponentTutorialExample/Builds/MacOSX/ComponentTutorialExample.xcodeproj/project.pbxproj index b61634cf54..f58f10d6e3 100644 --- a/examples/ComponentTutorialExample/Builds/MacOSX/ComponentTutorialExample.xcodeproj/project.pbxproj +++ b/examples/ComponentTutorialExample/Builds/MacOSX/ComponentTutorialExample.xcodeproj/project.pbxproj @@ -213,7 +213,7 @@ 7065518BA4A719BD600955DB, A0BD0396A9AB3F7FCF37AD62, 8F57F6817BE0F4126A95541F, ); buildRules = ( ); dependencies = ( ); name = "ComponentTutorialExample - App"; productName = ComponentTutorialExample; productReference = 48DBB774ADD58780B75FD130; productType = "com.apple.product-type.application"; }; - 3B89677F666BF40854CDE8D3 = {isa = PBXProject; buildConfigurationList = D2C0D08571281A97A8437C77; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { FDDAB81F5F4DA48E7807E65A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = D0953BB62CDDA1D6C60E6893; projectDirPath = ""; projectRoot = ""; targets = (FDDAB81F5F4DA48E7807E65A); }; + 3B89677F666BF40854CDE8D3 = {isa = PBXProject; buildConfigurationList = D2C0D08571281A97A8437C77; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { FDDAB81F5F4DA48E7807E65A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = D0953BB62CDDA1D6C60E6893; projectDirPath = ""; projectRoot = ""; targets = (FDDAB81F5F4DA48E7807E65A); }; }; rootObject = 3B89677F666BF40854CDE8D3; } diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample.sln b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample.sln index 58be4564a1..6caedff59d 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample.sln +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2ACA5085-A5CC-255B-B79D-D8256B0C459C}.Debug|x64.Build.0 = Debug|x64 {2ACA5085-A5CC-255B-B79D-D8256B0C459C}.Debug|x64.ActiveCfg = Debug|x64 - {2ACA5085-A5CC-255B-B79D-D8256B0C459C}.Release|x64.Build.0 = Release|x64 + {2ACA5085-A5CC-255B-B79D-D8256B0C459C}.Debug|x64.Build.0 = Debug|x64 {2ACA5085-A5CC-255B-B79D-D8256B0C459C}.Release|x64.ActiveCfg = Release|x64 + {2ACA5085-A5CC-255B-B79D-D8256B0C459C}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj index ebc330abb8..ce51787936 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj @@ -1477,6 +1477,7 @@ + diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj.filters b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj.filters index 6952c33ff4..004345d984 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj.filters +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj.filters @@ -2079,6 +2079,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample.sln b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample.sln index a5da988476..8e40097825 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample.sln +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2ACA5085-A5CC-255B-B79D-D8256B0C459C}.Debug|x64.Build.0 = Debug|x64 {2ACA5085-A5CC-255B-B79D-D8256B0C459C}.Debug|x64.ActiveCfg = Debug|x64 - {2ACA5085-A5CC-255B-B79D-D8256B0C459C}.Release|x64.Build.0 = Release|x64 + {2ACA5085-A5CC-255B-B79D-D8256B0C459C}.Debug|x64.Build.0 = Debug|x64 {2ACA5085-A5CC-255B-B79D-D8256B0C459C}.Release|x64.ActiveCfg = Release|x64 + {2ACA5085-A5CC-255B-B79D-D8256B0C459C}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj index d1215fc1ac..368bad9980 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj @@ -1477,6 +1477,7 @@ + diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj.filters b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj.filters index 3b207a6f22..a1b61506f7 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj.filters +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj.filters @@ -2079,6 +2079,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h b/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h index 5cb9118afb..636584d1cb 100644 --- a/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h +++ b/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/Demo/Builds/Android/app/CMakeLists.txt b/examples/Demo/Builds/Android/app/CMakeLists.txt index 4fa602cb16..aad9dcaaec 100644 --- a/examples/Demo/Builds/Android/app/CMakeLists.txt +++ b/examples/Demo/Builds/Android/app/CMakeLists.txt @@ -984,6 +984,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_graphics/native/juce_mac_IconHelpers.cpp" "../../../../../modules/juce_graphics/native/juce_RenderingHelpers.h" "../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp" + "../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h" "../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp" "../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp" "../../../../../modules/juce_graphics/native/juce_win32_Fonts.cpp" @@ -2294,6 +2295,7 @@ set_source_files_properties("../../../../../modules/juce_graphics/native/juce_ma set_source_files_properties("../../../../../modules/juce_graphics/native/juce_mac_IconHelpers.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_RenderingHelpers.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Fonts.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/Demo/Builds/Android/app/src/main/res/values/string.xml b/examples/Demo/Builds/Android/app/src/main/res/values/string.xml deleted file mode 100644 index f8aa853b42..0000000000 --- a/examples/Demo/Builds/Android/app/src/main/res/values/string.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - JuceDemo - diff --git a/examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj b/examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj index 3c42257431..18148fd4ba 100644 --- a/examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj +++ b/examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj @@ -495,7 +495,7 @@ 8A0460E8E406AB26F4BA09A8, DB71CE9A0FCC9F1D4DB88011, 8B042CD6831F0E9BD5C0815E, ); buildRules = ( ); dependencies = ( ); name = "JuceDemo - App"; productName = JuceDemo; productReference = 90B1185950EF7670F87EAA3F; productType = "com.apple.product-type.application"; }; - A97F75347E57A9C1AF731F1D = {isa = PBXProject; buildConfigurationList = E3E8152B5B6326971AA2F802; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 00C030852F071EE5DCA3C532 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 605D88E415A9989447F78548; projectDirPath = ""; projectRoot = ""; targets = (00C030852F071EE5DCA3C532); }; + A97F75347E57A9C1AF731F1D = {isa = PBXProject; buildConfigurationList = E3E8152B5B6326971AA2F802; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 00C030852F071EE5DCA3C532 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 605D88E415A9989447F78548; projectDirPath = ""; projectRoot = ""; targets = (00C030852F071EE5DCA3C532); }; }; rootObject = A97F75347E57A9C1AF731F1D; } diff --git a/examples/Demo/Builds/VisualStudio2013/JuceDemo.sln b/examples/Demo/Builds/VisualStudio2013/JuceDemo.sln index d6ebda9e29..3f1c5ee46b 100644 --- a/examples/Demo/Builds/VisualStudio2013/JuceDemo.sln +++ b/examples/Demo/Builds/VisualStudio2013/JuceDemo.sln @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Debug|Win32.Build.0 = Debug|Win32 {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Debug|Win32.ActiveCfg = Debug|Win32 - {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Release|Win32.Build.0 = Release|Win32 + {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Debug|Win32.Build.0 = Debug|Win32 {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Release|Win32.ActiveCfg = Release|Win32 + {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj index d5c0f80d04..df27b0b436 100644 --- a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj @@ -2407,6 +2407,7 @@ + diff --git a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj.filters b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj.filters index 3bf361da97..d12172d9e1 100644 --- a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj.filters +++ b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj.filters @@ -3840,6 +3840,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/Demo/Builds/VisualStudio2015/JuceDemo.sln b/examples/Demo/Builds/VisualStudio2015/JuceDemo.sln index fa0dfc217e..27da705d7b 100644 --- a/examples/Demo/Builds/VisualStudio2015/JuceDemo.sln +++ b/examples/Demo/Builds/VisualStudio2015/JuceDemo.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Debug|x64.Build.0 = Debug|x64 {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Debug|x64.ActiveCfg = Debug|x64 - {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Release|x64.Build.0 = Release|x64 + {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Debug|x64.Build.0 = Debug|x64 {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Release|x64.ActiveCfg = Release|x64 + {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj index 341c017b8b..0be6936bef 100644 --- a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj @@ -2406,6 +2406,7 @@ + diff --git a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj.filters b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj.filters index b32f4e2a5c..c2d7d92ba4 100644 --- a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj.filters +++ b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj.filters @@ -3840,6 +3840,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/Demo/Builds/VisualStudio2017/JuceDemo.sln b/examples/Demo/Builds/VisualStudio2017/JuceDemo.sln index 843b72f722..e9c9c6958c 100644 --- a/examples/Demo/Builds/VisualStudio2017/JuceDemo.sln +++ b/examples/Demo/Builds/VisualStudio2017/JuceDemo.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Debug|x64.Build.0 = Debug|x64 {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Debug|x64.ActiveCfg = Debug|x64 - {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Release|x64.Build.0 = Release|x64 + {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Debug|x64.Build.0 = Debug|x64 {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Release|x64.ActiveCfg = Release|x64 + {05F7128C-1654-E8D0-856F-98237CF1EBE4}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj index 00c8203878..53f9782d06 100644 --- a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj @@ -2406,6 +2406,7 @@ + diff --git a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj.filters b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj.filters index 2368f804a9..4df38daba8 100644 --- a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj.filters +++ b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj.filters @@ -3840,6 +3840,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/Demo/Builds/iOS/JuceDemo.xcodeproj/project.pbxproj b/examples/Demo/Builds/iOS/JuceDemo.xcodeproj/project.pbxproj index 5594d65379..78dbabd48f 100644 --- a/examples/Demo/Builds/iOS/JuceDemo.xcodeproj/project.pbxproj +++ b/examples/Demo/Builds/iOS/JuceDemo.xcodeproj/project.pbxproj @@ -499,7 +499,7 @@ 8A0460E8E406AB26F4BA09A8, DB71CE9A0FCC9F1D4DB88011, 8B042CD6831F0E9BD5C0815E, ); buildRules = ( ); dependencies = ( ); name = "JuceDemo - App"; productName = JuceDemo; productReference = 90B1185950EF7670F87EAA3F; productType = "com.apple.product-type.application"; }; - A97F75347E57A9C1AF731F1D = {isa = PBXProject; buildConfigurationList = E3E8152B5B6326971AA2F802; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 00C030852F071EE5DCA3C532 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 605D88E415A9989447F78548; projectDirPath = ""; projectRoot = ""; targets = (00C030852F071EE5DCA3C532); }; + A97F75347E57A9C1AF731F1D = {isa = PBXProject; buildConfigurationList = E3E8152B5B6326971AA2F802; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 00C030852F071EE5DCA3C532 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 605D88E415A9989447F78548; projectDirPath = ""; projectRoot = ""; targets = (00C030852F071EE5DCA3C532); }; }; rootObject = A97F75347E57A9C1AF731F1D; } diff --git a/examples/Demo/JuceLibraryCode/AppConfig.h b/examples/Demo/JuceLibraryCode/AppConfig.h index 0331661ea2..537183f025 100644 --- a/examples/Demo/JuceLibraryCode/AppConfig.h +++ b/examples/Demo/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/HelloWorld/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj b/examples/HelloWorld/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj index 50cb85ec16..75fbb67d8c 100644 --- a/examples/HelloWorld/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj +++ b/examples/HelloWorld/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj @@ -209,7 +209,7 @@ 026F69AE2DD97CA7C9006986, C39352E04613E968B30D0584, CD0E71EFDCF3177FCE405E9D, ); buildRules = ( ); dependencies = ( ); name = "HelloWorld - App"; productName = HelloWorld; productReference = 630E0739D24A3C9E99CD4592; productType = "com.apple.product-type.application"; }; - E34D5B980741D93050D0BB6B = {isa = PBXProject; buildConfigurationList = D5495970AC0AFC78DD0ADE12; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 192D34128EA37F28BC1CBB22 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = CB9C4DF3F11D65C6BF6B80AD; projectDirPath = ""; projectRoot = ""; targets = (192D34128EA37F28BC1CBB22); }; + E34D5B980741D93050D0BB6B = {isa = PBXProject; buildConfigurationList = D5495970AC0AFC78DD0ADE12; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 192D34128EA37F28BC1CBB22 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = CB9C4DF3F11D65C6BF6B80AD; projectDirPath = ""; projectRoot = ""; targets = (192D34128EA37F28BC1CBB22); }; }; rootObject = E34D5B980741D93050D0BB6B; } diff --git a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld.sln b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld.sln index af38500f35..79650452c6 100644 --- a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld.sln +++ b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D0620B06-01BA-BA19-C625-CE28F4174EC7}.Debug|x64.Build.0 = Debug|x64 {D0620B06-01BA-BA19-C625-CE28F4174EC7}.Debug|x64.ActiveCfg = Debug|x64 - {D0620B06-01BA-BA19-C625-CE28F4174EC7}.Release|x64.Build.0 = Release|x64 + {D0620B06-01BA-BA19-C625-CE28F4174EC7}.Debug|x64.Build.0 = Debug|x64 {D0620B06-01BA-BA19-C625-CE28F4174EC7}.Release|x64.ActiveCfg = Release|x64 + {D0620B06-01BA-BA19-C625-CE28F4174EC7}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj index 0dba37f16a..a57b46ece8 100644 --- a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj +++ b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj @@ -1475,6 +1475,7 @@ + diff --git a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj.filters b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj.filters index 0a51db6013..abae40484f 100644 --- a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj.filters +++ b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj.filters @@ -2073,6 +2073,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld.sln b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld.sln index dd7590243a..90e41a0c6a 100644 --- a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld.sln +++ b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D0620B06-01BA-BA19-C625-CE28F4174EC7}.Debug|x64.Build.0 = Debug|x64 {D0620B06-01BA-BA19-C625-CE28F4174EC7}.Debug|x64.ActiveCfg = Debug|x64 - {D0620B06-01BA-BA19-C625-CE28F4174EC7}.Release|x64.Build.0 = Release|x64 + {D0620B06-01BA-BA19-C625-CE28F4174EC7}.Debug|x64.Build.0 = Debug|x64 {D0620B06-01BA-BA19-C625-CE28F4174EC7}.Release|x64.ActiveCfg = Release|x64 + {D0620B06-01BA-BA19-C625-CE28F4174EC7}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj index bd8b5d199f..6af8410987 100644 --- a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj +++ b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj @@ -1475,6 +1475,7 @@ + diff --git a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj.filters b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj.filters index 53b1518dc6..b71f7e7865 100644 --- a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj.filters +++ b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj.filters @@ -2073,6 +2073,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/HelloWorld/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj b/examples/HelloWorld/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj index a15f3e4709..5d11da72a3 100644 --- a/examples/HelloWorld/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj +++ b/examples/HelloWorld/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj @@ -219,7 +219,7 @@ 026F69AE2DD97CA7C9006986, C39352E04613E968B30D0584, CD0E71EFDCF3177FCE405E9D, ); buildRules = ( ); dependencies = ( ); name = "HelloWorld - App"; productName = HelloWorld; productReference = 630E0739D24A3C9E99CD4592; productType = "com.apple.product-type.application"; }; - E34D5B980741D93050D0BB6B = {isa = PBXProject; buildConfigurationList = D5495970AC0AFC78DD0ADE12; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 192D34128EA37F28BC1CBB22 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = CB9C4DF3F11D65C6BF6B80AD; projectDirPath = ""; projectRoot = ""; targets = (192D34128EA37F28BC1CBB22); }; + E34D5B980741D93050D0BB6B = {isa = PBXProject; buildConfigurationList = D5495970AC0AFC78DD0ADE12; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 192D34128EA37F28BC1CBB22 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = CB9C4DF3F11D65C6BF6B80AD; projectDirPath = ""; projectRoot = ""; targets = (192D34128EA37F28BC1CBB22); }; }; rootObject = E34D5B980741D93050D0BB6B; } diff --git a/examples/HelloWorld/JuceLibraryCode/AppConfig.h b/examples/HelloWorld/JuceLibraryCode/AppConfig.h index 5cb9118afb..636584d1cb 100644 --- a/examples/HelloWorld/JuceLibraryCode/AppConfig.h +++ b/examples/HelloWorld/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/MPETest/Builds/MacOSX/MPETest.xcodeproj/project.pbxproj b/examples/MPETest/Builds/MacOSX/MPETest.xcodeproj/project.pbxproj index 82b8ce8830..38b43edc10 100644 --- a/examples/MPETest/Builds/MacOSX/MPETest.xcodeproj/project.pbxproj +++ b/examples/MPETest/Builds/MacOSX/MPETest.xcodeproj/project.pbxproj @@ -295,7 +295,7 @@ 518008B4BCAC2EDE2921458A, EF758DF42F97B8D22FD35F80, AF94D754542EEF998EE0EF72, ); buildRules = ( ); dependencies = ( ); name = "MPETest - App"; productName = MPETest; productReference = BCC50B48B1A4B967949B2DB2; productType = "com.apple.product-type.application"; }; - 9606743A47FFF871B775B1AB = {isa = PBXProject; buildConfigurationList = CC7502C8943D2FC599DFC557; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 0DF05A38ED8E8BF6EB7D9C5C = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 9F958921F12E7C784E909D34; projectDirPath = ""; projectRoot = ""; targets = (0DF05A38ED8E8BF6EB7D9C5C); }; + 9606743A47FFF871B775B1AB = {isa = PBXProject; buildConfigurationList = CC7502C8943D2FC599DFC557; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 0DF05A38ED8E8BF6EB7D9C5C = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 9F958921F12E7C784E909D34; projectDirPath = ""; projectRoot = ""; targets = (0DF05A38ED8E8BF6EB7D9C5C); }; }; rootObject = 9606743A47FFF871B775B1AB; } diff --git a/examples/MPETest/Builds/VisualStudio2015/MPETest.sln b/examples/MPETest/Builds/VisualStudio2015/MPETest.sln index 6ee6175d18..275c79a67c 100644 --- a/examples/MPETest/Builds/VisualStudio2015/MPETest.sln +++ b/examples/MPETest/Builds/VisualStudio2015/MPETest.sln @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D4B09FE5-F7C6-3530-7AA4-725B57317169}.Debug|Win32.Build.0 = Debug|Win32 {D4B09FE5-F7C6-3530-7AA4-725B57317169}.Debug|Win32.ActiveCfg = Debug|Win32 - {D4B09FE5-F7C6-3530-7AA4-725B57317169}.Release|Win32.Build.0 = Release|Win32 + {D4B09FE5-F7C6-3530-7AA4-725B57317169}.Debug|Win32.Build.0 = Debug|Win32 {D4B09FE5-F7C6-3530-7AA4-725B57317169}.Release|Win32.ActiveCfg = Release|Win32 + {D4B09FE5-F7C6-3530-7AA4-725B57317169}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj index 3db135f60f..bab41a6c17 100644 --- a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj +++ b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj @@ -2175,6 +2175,7 @@ + diff --git a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj.filters b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj.filters index f6b3fc852d..877fb03cfe 100644 --- a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj.filters +++ b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj.filters @@ -3396,6 +3396,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/MPETest/Builds/VisualStudio2017/MPETest.sln b/examples/MPETest/Builds/VisualStudio2017/MPETest.sln index 52749060b1..0f017c4854 100644 --- a/examples/MPETest/Builds/VisualStudio2017/MPETest.sln +++ b/examples/MPETest/Builds/VisualStudio2017/MPETest.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D4B09FE5-F7C6-3530-7AA4-725B57317169}.Debug|x64.Build.0 = Debug|x64 {D4B09FE5-F7C6-3530-7AA4-725B57317169}.Debug|x64.ActiveCfg = Debug|x64 - {D4B09FE5-F7C6-3530-7AA4-725B57317169}.Release|x64.Build.0 = Release|x64 + {D4B09FE5-F7C6-3530-7AA4-725B57317169}.Debug|x64.Build.0 = Debug|x64 {D4B09FE5-F7C6-3530-7AA4-725B57317169}.Release|x64.ActiveCfg = Release|x64 + {D4B09FE5-F7C6-3530-7AA4-725B57317169}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj index a1d4a9a4d8..2d1087e706 100644 --- a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj +++ b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj @@ -2174,6 +2174,7 @@ + diff --git a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj.filters b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj.filters index 8ced403c9e..1af40815c4 100644 --- a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj.filters +++ b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj.filters @@ -3396,6 +3396,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/MPETest/JuceLibraryCode/AppConfig.h b/examples/MPETest/JuceLibraryCode/AppConfig.h index 2aa7724fea..88d18d77c1 100644 --- a/examples/MPETest/JuceLibraryCode/AppConfig.h +++ b/examples/MPETest/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/MidiTest/Builds/Android/app/CMakeLists.txt b/examples/MidiTest/Builds/Android/app/CMakeLists.txt index ce7aaf2271..3ee4157e5a 100644 --- a/examples/MidiTest/Builds/Android/app/CMakeLists.txt +++ b/examples/MidiTest/Builds/Android/app/CMakeLists.txt @@ -821,6 +821,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_graphics/native/juce_mac_IconHelpers.cpp" "../../../../../modules/juce_graphics/native/juce_RenderingHelpers.h" "../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp" + "../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h" "../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp" "../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp" "../../../../../modules/juce_graphics/native/juce_win32_Fonts.cpp" @@ -1956,6 +1957,7 @@ set_source_files_properties("../../../../../modules/juce_graphics/native/juce_ma set_source_files_properties("../../../../../modules/juce_graphics/native/juce_mac_IconHelpers.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_RenderingHelpers.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Fonts.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/MidiTest/Builds/Android/app/src/main/res/values/string.xml b/examples/MidiTest/Builds/Android/app/src/main/res/values/string.xml deleted file mode 100644 index 9c3fea4a3a..0000000000 --- a/examples/MidiTest/Builds/Android/app/src/main/res/values/string.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - MidiTest - diff --git a/examples/MidiTest/Builds/MacOSX/MidiTest.xcodeproj/project.pbxproj b/examples/MidiTest/Builds/MacOSX/MidiTest.xcodeproj/project.pbxproj index 6955fce171..a1b5d96e77 100644 --- a/examples/MidiTest/Builds/MacOSX/MidiTest.xcodeproj/project.pbxproj +++ b/examples/MidiTest/Builds/MacOSX/MidiTest.xcodeproj/project.pbxproj @@ -261,7 +261,7 @@ A1114FDF6F871F83BAF3B6B8, 80C515E0387A6AF48C93D08C, AADBC72B2C7030FAD1D8CAF8, ); buildRules = ( ); dependencies = ( ); name = "MidiTest - App"; productName = MidiTest; productReference = AB7855931CA983F4EE039617; productType = "com.apple.product-type.application"; }; - 08CC3758D6C29BD07C86A240 = {isa = PBXProject; buildConfigurationList = 33B4E927BEBC8696D1D2812E; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 68C4BE0E455A27D9A0CEB672 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 937739BC97C6E6294CDCF171; projectDirPath = ""; projectRoot = ""; targets = (68C4BE0E455A27D9A0CEB672); }; + 08CC3758D6C29BD07C86A240 = {isa = PBXProject; buildConfigurationList = 33B4E927BEBC8696D1D2812E; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 68C4BE0E455A27D9A0CEB672 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 937739BC97C6E6294CDCF171; projectDirPath = ""; projectRoot = ""; targets = (68C4BE0E455A27D9A0CEB672); }; }; rootObject = 08CC3758D6C29BD07C86A240; } diff --git a/examples/MidiTest/Builds/VisualStudio2015/MidiTest.sln b/examples/MidiTest/Builds/VisualStudio2015/MidiTest.sln index a3c00e9826..c7694fd98a 100644 --- a/examples/MidiTest/Builds/VisualStudio2015/MidiTest.sln +++ b/examples/MidiTest/Builds/VisualStudio2015/MidiTest.sln @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EB720316-22FE-A3C9-7871-F2C2B2FC7A45}.Debug|Win32.Build.0 = Debug|Win32 {EB720316-22FE-A3C9-7871-F2C2B2FC7A45}.Debug|Win32.ActiveCfg = Debug|Win32 - {EB720316-22FE-A3C9-7871-F2C2B2FC7A45}.Release|Win32.Build.0 = Release|Win32 + {EB720316-22FE-A3C9-7871-F2C2B2FC7A45}.Debug|Win32.Build.0 = Debug|Win32 {EB720316-22FE-A3C9-7871-F2C2B2FC7A45}.Release|Win32.ActiveCfg = Release|Win32 + {EB720316-22FE-A3C9-7871-F2C2B2FC7A45}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj b/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj index 7a0e9f9c2a..429d4c6d97 100644 --- a/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj +++ b/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj @@ -2095,6 +2095,7 @@ + diff --git a/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj.filters b/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj.filters index 362730a33d..ecbddcb14f 100644 --- a/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj.filters +++ b/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj.filters @@ -3237,6 +3237,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/MidiTest/Builds/VisualStudio2017/MidiTest.sln b/examples/MidiTest/Builds/VisualStudio2017/MidiTest.sln index d96fdce7be..dfa9779501 100644 --- a/examples/MidiTest/Builds/VisualStudio2017/MidiTest.sln +++ b/examples/MidiTest/Builds/VisualStudio2017/MidiTest.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EB720316-22FE-A3C9-7871-F2C2B2FC7A45}.Debug|x64.Build.0 = Debug|x64 {EB720316-22FE-A3C9-7871-F2C2B2FC7A45}.Debug|x64.ActiveCfg = Debug|x64 - {EB720316-22FE-A3C9-7871-F2C2B2FC7A45}.Release|x64.Build.0 = Release|x64 + {EB720316-22FE-A3C9-7871-F2C2B2FC7A45}.Debug|x64.Build.0 = Debug|x64 {EB720316-22FE-A3C9-7871-F2C2B2FC7A45}.Release|x64.ActiveCfg = Release|x64 + {EB720316-22FE-A3C9-7871-F2C2B2FC7A45}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj b/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj index e1c905f316..98487a2ebd 100644 --- a/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj +++ b/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj @@ -2094,6 +2094,7 @@ + diff --git a/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj.filters b/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj.filters index 87f80f76cf..ebcae212d8 100644 --- a/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj.filters +++ b/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj.filters @@ -3237,6 +3237,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/MidiTest/Builds/iOS/MidiTest.xcodeproj/project.pbxproj b/examples/MidiTest/Builds/iOS/MidiTest.xcodeproj/project.pbxproj index d0137ef933..d06d24f316 100644 --- a/examples/MidiTest/Builds/iOS/MidiTest.xcodeproj/project.pbxproj +++ b/examples/MidiTest/Builds/iOS/MidiTest.xcodeproj/project.pbxproj @@ -273,7 +273,7 @@ A1114FDF6F871F83BAF3B6B8, 80C515E0387A6AF48C93D08C, AADBC72B2C7030FAD1D8CAF8, ); buildRules = ( ); dependencies = ( ); name = "MidiTest - App"; productName = MidiTest; productReference = AB7855931CA983F4EE039617; productType = "com.apple.product-type.application"; }; - 08CC3758D6C29BD07C86A240 = {isa = PBXProject; buildConfigurationList = 33B4E927BEBC8696D1D2812E; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 68C4BE0E455A27D9A0CEB672 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 937739BC97C6E6294CDCF171; projectDirPath = ""; projectRoot = ""; targets = (68C4BE0E455A27D9A0CEB672); }; + 08CC3758D6C29BD07C86A240 = {isa = PBXProject; buildConfigurationList = 33B4E927BEBC8696D1D2812E; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 68C4BE0E455A27D9A0CEB672 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 937739BC97C6E6294CDCF171; projectDirPath = ""; projectRoot = ""; targets = (68C4BE0E455A27D9A0CEB672); }; }; rootObject = 08CC3758D6C29BD07C86A240; } diff --git a/examples/MidiTest/JuceLibraryCode/AppConfig.h b/examples/MidiTest/JuceLibraryCode/AppConfig.h index 835847f811..3297659b93 100644 --- a/examples/MidiTest/JuceLibraryCode/AppConfig.h +++ b/examples/MidiTest/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt b/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt index 3b43e5e23a..dc30690ec6 100644 --- a/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt +++ b/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt @@ -839,6 +839,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_graphics/native/juce_mac_IconHelpers.cpp" "../../../../../modules/juce_graphics/native/juce_RenderingHelpers.h" "../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp" + "../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h" "../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp" "../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp" "../../../../../modules/juce_graphics/native/juce_win32_Fonts.cpp" @@ -2049,6 +2050,7 @@ set_source_files_properties("../../../../../modules/juce_graphics/native/juce_ma set_source_files_properties("../../../../../modules/juce_graphics/native/juce_mac_IconHelpers.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_RenderingHelpers.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Fonts.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/res/values/string.xml b/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/res/values/string.xml deleted file mode 100644 index fe615a2592..0000000000 --- a/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/res/values/string.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - JUCE Network Graphics Demo - diff --git a/examples/NetworkGraphicsDemo/Builds/MacOSX/JUCE Network Graphics Demo.xcodeproj/project.pbxproj b/examples/NetworkGraphicsDemo/Builds/MacOSX/JUCE Network Graphics Demo.xcodeproj/project.pbxproj index 3a7478ca74..eb30c07ebf 100644 --- a/examples/NetworkGraphicsDemo/Builds/MacOSX/JUCE Network Graphics Demo.xcodeproj/project.pbxproj +++ b/examples/NetworkGraphicsDemo/Builds/MacOSX/JUCE Network Graphics Demo.xcodeproj/project.pbxproj @@ -295,7 +295,7 @@ 714944DB86A4D402E7FA269E, C2977559BF9148DB70CA10AE, 865E89B94B41EB14C202CBB0, ); buildRules = ( ); dependencies = ( ); name = "JUCE Network Graphics Demo - App"; productName = "JUCE Network Graphics Demo"; productReference = E4162459ED4C829EF7B19691; productType = "com.apple.product-type.application"; }; - A5398ADB6F5B128C00EB935C = {isa = PBXProject; buildConfigurationList = 02715337C584F3C721251428; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 4311FBCBD02948A0ED96C7DD = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = D2EB65517396C974F0415A7F; projectDirPath = ""; projectRoot = ""; targets = (4311FBCBD02948A0ED96C7DD); }; + A5398ADB6F5B128C00EB935C = {isa = PBXProject; buildConfigurationList = 02715337C584F3C721251428; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 4311FBCBD02948A0ED96C7DD = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = D2EB65517396C974F0415A7F; projectDirPath = ""; projectRoot = ""; targets = (4311FBCBD02948A0ED96C7DD); }; }; rootObject = A5398ADB6F5B128C00EB935C; } diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo.sln b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo.sln index 8677c58d8d..4b09c6d735 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo.sln +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo.sln @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2F8ABED0-7428-13A5-07CD-EF1F3B43B926}.Debug|Win32.Build.0 = Debug|Win32 {2F8ABED0-7428-13A5-07CD-EF1F3B43B926}.Debug|Win32.ActiveCfg = Debug|Win32 - {2F8ABED0-7428-13A5-07CD-EF1F3B43B926}.Release|Win32.Build.0 = Release|Win32 + {2F8ABED0-7428-13A5-07CD-EF1F3B43B926}.Debug|Win32.Build.0 = Debug|Win32 {2F8ABED0-7428-13A5-07CD-EF1F3B43B926}.Release|Win32.ActiveCfg = Release|Win32 + {2F8ABED0-7428-13A5-07CD-EF1F3B43B926}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE 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 d5260634c1..4c8f7104aa 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj @@ -2186,6 +2186,7 @@ + diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj.filters b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj.filters index 7d4ddc83b6..b9ec759fcc 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj.filters +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj.filters @@ -3390,6 +3390,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo.sln b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo.sln index 3786555539..c5d0d80982 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo.sln +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2F8ABED0-7428-13A5-07CD-EF1F3B43B926}.Debug|x64.Build.0 = Debug|x64 {2F8ABED0-7428-13A5-07CD-EF1F3B43B926}.Debug|x64.ActiveCfg = Debug|x64 - {2F8ABED0-7428-13A5-07CD-EF1F3B43B926}.Release|x64.Build.0 = Release|x64 + {2F8ABED0-7428-13A5-07CD-EF1F3B43B926}.Debug|x64.Build.0 = Debug|x64 {2F8ABED0-7428-13A5-07CD-EF1F3B43B926}.Release|x64.ActiveCfg = Release|x64 + {2F8ABED0-7428-13A5-07CD-EF1F3B43B926}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE 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 1553e1b84f..f6f7c2977d 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj @@ -2185,6 +2185,7 @@ + diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj.filters b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj.filters index f1a57722b8..eb3ea81359 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj.filters +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj.filters @@ -3390,6 +3390,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/NetworkGraphicsDemo/Builds/iOS/JUCE Network Graphics Demo.xcodeproj/project.pbxproj b/examples/NetworkGraphicsDemo/Builds/iOS/JUCE Network Graphics Demo.xcodeproj/project.pbxproj index dfe92fb659..0ce7b4134c 100644 --- a/examples/NetworkGraphicsDemo/Builds/iOS/JUCE Network Graphics Demo.xcodeproj/project.pbxproj +++ b/examples/NetworkGraphicsDemo/Builds/iOS/JUCE Network Graphics Demo.xcodeproj/project.pbxproj @@ -309,7 +309,7 @@ 714944DB86A4D402E7FA269E, C2977559BF9148DB70CA10AE, 865E89B94B41EB14C202CBB0, ); buildRules = ( ); dependencies = ( ); name = "JUCE Network Graphics Demo - App"; productName = "JUCE Network Graphics Demo"; productReference = E4162459ED4C829EF7B19691; productType = "com.apple.product-type.application"; }; - A5398ADB6F5B128C00EB935C = {isa = PBXProject; buildConfigurationList = 02715337C584F3C721251428; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 4311FBCBD02948A0ED96C7DD = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = D2EB65517396C974F0415A7F; projectDirPath = ""; projectRoot = ""; targets = (4311FBCBD02948A0ED96C7DD); }; + A5398ADB6F5B128C00EB935C = {isa = PBXProject; buildConfigurationList = 02715337C584F3C721251428; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 4311FBCBD02948A0ED96C7DD = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = D2EB65517396C974F0415A7F; projectDirPath = ""; projectRoot = ""; targets = (4311FBCBD02948A0ED96C7DD); }; }; rootObject = A5398ADB6F5B128C00EB935C; } diff --git a/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h b/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h index 7cfec4f5eb..245597d201 100644 --- a/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h +++ b/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/OSCMonitor/Builds/MacOSX/OSCMonitor.xcodeproj/project.pbxproj b/examples/OSCMonitor/Builds/MacOSX/OSCMonitor.xcodeproj/project.pbxproj index 0ea900a852..526e35b2a3 100644 --- a/examples/OSCMonitor/Builds/MacOSX/OSCMonitor.xcodeproj/project.pbxproj +++ b/examples/OSCMonitor/Builds/MacOSX/OSCMonitor.xcodeproj/project.pbxproj @@ -283,7 +283,7 @@ 5EAEC7382D18903A6CC34743, F3B61DF6E57FDFD6B2F506F2, F246BDBFC565CFD500CC8D8B, ); buildRules = ( ); dependencies = ( ); name = "OSCMonitor - App"; productName = OSCMonitor; productReference = 1997CE41947A0FA3AE6FD84C; productType = "com.apple.product-type.application"; }; - 6AEE7D5FA068DDF4AE3BC412 = {isa = PBXProject; buildConfigurationList = 167C45A180F421917A997478; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { CE4CE10FF3A0FD3AA7FF7605 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 6A9D07656A985D7935C7FE29; projectDirPath = ""; projectRoot = ""; targets = (CE4CE10FF3A0FD3AA7FF7605); }; + 6AEE7D5FA068DDF4AE3BC412 = {isa = PBXProject; buildConfigurationList = 167C45A180F421917A997478; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { CE4CE10FF3A0FD3AA7FF7605 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 6A9D07656A985D7935C7FE29; projectDirPath = ""; projectRoot = ""; targets = (CE4CE10FF3A0FD3AA7FF7605); }; }; rootObject = 6AEE7D5FA068DDF4AE3BC412; } diff --git a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor.sln b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor.sln index 2800fb5ce6..9f5460c81e 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor.sln +++ b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor.sln @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E59DC404-E625-1E60-3811-4F0BFB026DF1}.Debug|Win32.Build.0 = Debug|Win32 {E59DC404-E625-1E60-3811-4F0BFB026DF1}.Debug|Win32.ActiveCfg = Debug|Win32 - {E59DC404-E625-1E60-3811-4F0BFB026DF1}.Release|Win32.Build.0 = Release|Win32 + {E59DC404-E625-1E60-3811-4F0BFB026DF1}.Debug|Win32.Build.0 = Debug|Win32 {E59DC404-E625-1E60-3811-4F0BFB026DF1}.Release|Win32.ActiveCfg = Release|Win32 + {E59DC404-E625-1E60-3811-4F0BFB026DF1}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj index 280dbc5e0c..0b29ae8aa4 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj +++ b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj @@ -2137,6 +2137,7 @@ + diff --git a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj.filters b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj.filters index dd39bab59e..390c930fca 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj.filters +++ b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj.filters @@ -3300,6 +3300,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor.sln b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor.sln index f48dd80918..ca746562c0 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor.sln +++ b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E59DC404-E625-1E60-3811-4F0BFB026DF1}.Debug|x64.Build.0 = Debug|x64 {E59DC404-E625-1E60-3811-4F0BFB026DF1}.Debug|x64.ActiveCfg = Debug|x64 - {E59DC404-E625-1E60-3811-4F0BFB026DF1}.Release|x64.Build.0 = Release|x64 + {E59DC404-E625-1E60-3811-4F0BFB026DF1}.Debug|x64.Build.0 = Debug|x64 {E59DC404-E625-1E60-3811-4F0BFB026DF1}.Release|x64.ActiveCfg = Release|x64 + {E59DC404-E625-1E60-3811-4F0BFB026DF1}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj index ab8d07ed87..ec4d16161d 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj +++ b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj @@ -2136,6 +2136,7 @@ + diff --git a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj.filters b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj.filters index 2995624232..54c4316149 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj.filters +++ b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj.filters @@ -3300,6 +3300,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/OSCMonitor/JuceLibraryCode/AppConfig.h b/examples/OSCMonitor/JuceLibraryCode/AppConfig.h index 7c9c55e228..0ccddd7849 100644 --- a/examples/OSCMonitor/JuceLibraryCode/AppConfig.h +++ b/examples/OSCMonitor/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt b/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt index b4c48c28f2..d9667593e5 100644 --- a/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt +++ b/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt @@ -490,6 +490,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_graphics/native/juce_mac_IconHelpers.cpp" "../../../../../modules/juce_graphics/native/juce_RenderingHelpers.h" "../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp" + "../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h" "../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp" "../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp" "../../../../../modules/juce_graphics/native/juce_win32_Fonts.cpp" @@ -1310,6 +1311,7 @@ set_source_files_properties("../../../../../modules/juce_graphics/native/juce_ma set_source_files_properties("../../../../../modules/juce_graphics/native/juce_mac_IconHelpers.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_RenderingHelpers.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Fonts.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/OSCReceiver/Builds/Android/app/src/main/res/values/string.xml b/examples/OSCReceiver/Builds/Android/app/src/main/res/values/string.xml deleted file mode 100644 index c0f08bbd6f..0000000000 --- a/examples/OSCReceiver/Builds/Android/app/src/main/res/values/string.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - OSCReceiver - diff --git a/examples/OSCReceiver/Builds/MacOSX/OSCReceiver.xcodeproj/project.pbxproj b/examples/OSCReceiver/Builds/MacOSX/OSCReceiver.xcodeproj/project.pbxproj index fb8f144ac2..c1199cdacf 100644 --- a/examples/OSCReceiver/Builds/MacOSX/OSCReceiver.xcodeproj/project.pbxproj +++ b/examples/OSCReceiver/Builds/MacOSX/OSCReceiver.xcodeproj/project.pbxproj @@ -217,7 +217,7 @@ 2EA5C343F865CED412BD5E20, E95E181406F96A95EF81C474, 98DB1513FFCA4DC380991BE7, ); buildRules = ( ); dependencies = ( ); name = "OSCReceiver - App"; productName = OSCReceiver; productReference = 0AB2F0BDAF44CF1FE7BA007A; productType = "com.apple.product-type.application"; }; - 9CDCD4F1CF6D5405D574A953 = {isa = PBXProject; buildConfigurationList = 26D2BBF40A8AF71F3DDC53E0; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 5E1B6101A5D94EDEE60C306A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 9C0E80FC020192937C98CFC2; projectDirPath = ""; projectRoot = ""; targets = (5E1B6101A5D94EDEE60C306A); }; + 9CDCD4F1CF6D5405D574A953 = {isa = PBXProject; buildConfigurationList = 26D2BBF40A8AF71F3DDC53E0; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 5E1B6101A5D94EDEE60C306A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 9C0E80FC020192937C98CFC2; projectDirPath = ""; projectRoot = ""; targets = (5E1B6101A5D94EDEE60C306A); }; }; rootObject = 9CDCD4F1CF6D5405D574A953; } diff --git a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver.sln b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver.sln index fea221f971..e944356e5a 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver.sln +++ b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver.sln @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A40EAB9E-5492-90CF-0F05-8362CD22E2D2}.Debug|Win32.Build.0 = Debug|Win32 {A40EAB9E-5492-90CF-0F05-8362CD22E2D2}.Debug|Win32.ActiveCfg = Debug|Win32 - {A40EAB9E-5492-90CF-0F05-8362CD22E2D2}.Release|Win32.Build.0 = Release|Win32 + {A40EAB9E-5492-90CF-0F05-8362CD22E2D2}.Debug|Win32.Build.0 = Debug|Win32 {A40EAB9E-5492-90CF-0F05-8362CD22E2D2}.Release|Win32.ActiveCfg = Release|Win32 + {A40EAB9E-5492-90CF-0F05-8362CD22E2D2}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj index 3d49819d04..5ffb7dcad8 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj +++ b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj @@ -1532,6 +1532,7 @@ + diff --git a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj.filters b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj.filters index 3ed332687a..f9719f66e2 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj.filters +++ b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj.filters @@ -2163,6 +2163,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver.sln b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver.sln index cc2f265869..75e131ceda 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver.sln +++ b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A40EAB9E-5492-90CF-0F05-8362CD22E2D2}.Debug|x64.Build.0 = Debug|x64 {A40EAB9E-5492-90CF-0F05-8362CD22E2D2}.Debug|x64.ActiveCfg = Debug|x64 - {A40EAB9E-5492-90CF-0F05-8362CD22E2D2}.Release|x64.Build.0 = Release|x64 + {A40EAB9E-5492-90CF-0F05-8362CD22E2D2}.Debug|x64.Build.0 = Debug|x64 {A40EAB9E-5492-90CF-0F05-8362CD22E2D2}.Release|x64.ActiveCfg = Release|x64 + {A40EAB9E-5492-90CF-0F05-8362CD22E2D2}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj index 2d0f33fc3f..ee330734fa 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj +++ b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj @@ -1531,6 +1531,7 @@ + diff --git a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj.filters b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj.filters index 2eba98d777..257c114151 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj.filters +++ b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj.filters @@ -2163,6 +2163,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/OSCReceiver/Builds/iOS/OSCReceiver.xcodeproj/project.pbxproj b/examples/OSCReceiver/Builds/iOS/OSCReceiver.xcodeproj/project.pbxproj index 3d515c2e95..10af6de2ff 100644 --- a/examples/OSCReceiver/Builds/iOS/OSCReceiver.xcodeproj/project.pbxproj +++ b/examples/OSCReceiver/Builds/iOS/OSCReceiver.xcodeproj/project.pbxproj @@ -227,7 +227,7 @@ 2EA5C343F865CED412BD5E20, E95E181406F96A95EF81C474, 98DB1513FFCA4DC380991BE7, ); buildRules = ( ); dependencies = ( ); name = "OSCReceiver - App"; productName = OSCReceiver; productReference = 0AB2F0BDAF44CF1FE7BA007A; productType = "com.apple.product-type.application"; }; - 9CDCD4F1CF6D5405D574A953 = {isa = PBXProject; buildConfigurationList = 26D2BBF40A8AF71F3DDC53E0; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 5E1B6101A5D94EDEE60C306A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 9C0E80FC020192937C98CFC2; projectDirPath = ""; projectRoot = ""; targets = (5E1B6101A5D94EDEE60C306A); }; + 9CDCD4F1CF6D5405D574A953 = {isa = PBXProject; buildConfigurationList = 26D2BBF40A8AF71F3DDC53E0; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 5E1B6101A5D94EDEE60C306A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 9C0E80FC020192937C98CFC2; projectDirPath = ""; projectRoot = ""; targets = (5E1B6101A5D94EDEE60C306A); }; }; rootObject = 9CDCD4F1CF6D5405D574A953; } diff --git a/examples/OSCReceiver/JuceLibraryCode/AppConfig.h b/examples/OSCReceiver/JuceLibraryCode/AppConfig.h index c3c9796d5a..0b8c06a249 100644 --- a/examples/OSCReceiver/JuceLibraryCode/AppConfig.h +++ b/examples/OSCReceiver/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/OSCSender/Builds/Android/app/CMakeLists.txt b/examples/OSCSender/Builds/Android/app/CMakeLists.txt index bab6e3d0dd..7c8f5919e0 100644 --- a/examples/OSCSender/Builds/Android/app/CMakeLists.txt +++ b/examples/OSCSender/Builds/Android/app/CMakeLists.txt @@ -475,6 +475,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_graphics/native/juce_mac_IconHelpers.cpp" "../../../../../modules/juce_graphics/native/juce_RenderingHelpers.h" "../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp" + "../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h" "../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp" "../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp" "../../../../../modules/juce_graphics/native/juce_win32_Fonts.cpp" @@ -1224,6 +1225,7 @@ set_source_files_properties("../../../../../modules/juce_graphics/native/juce_ma set_source_files_properties("../../../../../modules/juce_graphics/native/juce_mac_IconHelpers.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_RenderingHelpers.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Fonts.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/OSCSender/Builds/Android/app/src/main/res/values/string.xml b/examples/OSCSender/Builds/Android/app/src/main/res/values/string.xml deleted file mode 100644 index 807c8a59f3..0000000000 --- a/examples/OSCSender/Builds/Android/app/src/main/res/values/string.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - OSCSender - diff --git a/examples/OSCSender/Builds/MacOSX/OSCSender.xcodeproj/project.pbxproj b/examples/OSCSender/Builds/MacOSX/OSCSender.xcodeproj/project.pbxproj index ed354fedce..c92dd3d71c 100644 --- a/examples/OSCSender/Builds/MacOSX/OSCSender.xcodeproj/project.pbxproj +++ b/examples/OSCSender/Builds/MacOSX/OSCSender.xcodeproj/project.pbxproj @@ -201,7 +201,7 @@ 1E9F219D82037569524E98CF, CDCF3ED48FB54EFBE0DD9046, 53E02F5676BF451851C9C06E, ); buildRules = ( ); dependencies = ( ); name = "OSCSender - App"; productName = OSCSender; productReference = E6F7F38EEF1BA55231F5B1D4; productType = "com.apple.product-type.application"; }; - 9CD8E1E30EDAF4E86990F260 = {isa = PBXProject; buildConfigurationList = ABFD3DA91CD9955D1FEC14F5; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 3D76C0E767055A9B4699DD95 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 168BF90B7EF8C12090B0A9B2; projectDirPath = ""; projectRoot = ""; targets = (3D76C0E767055A9B4699DD95); }; + 9CD8E1E30EDAF4E86990F260 = {isa = PBXProject; buildConfigurationList = ABFD3DA91CD9955D1FEC14F5; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 3D76C0E767055A9B4699DD95 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 168BF90B7EF8C12090B0A9B2; projectDirPath = ""; projectRoot = ""; targets = (3D76C0E767055A9B4699DD95); }; }; rootObject = 9CD8E1E30EDAF4E86990F260; } diff --git a/examples/OSCSender/Builds/VisualStudio2015/OSCSender.sln b/examples/OSCSender/Builds/VisualStudio2015/OSCSender.sln index b020465bb0..f19eacae90 100644 --- a/examples/OSCSender/Builds/VisualStudio2015/OSCSender.sln +++ b/examples/OSCSender/Builds/VisualStudio2015/OSCSender.sln @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5B0FE56E-266D-A62C-D8A9-D1F5E7905AF2}.Debug|Win32.Build.0 = Debug|Win32 {5B0FE56E-266D-A62C-D8A9-D1F5E7905AF2}.Debug|Win32.ActiveCfg = Debug|Win32 - {5B0FE56E-266D-A62C-D8A9-D1F5E7905AF2}.Release|Win32.Build.0 = Release|Win32 + {5B0FE56E-266D-A62C-D8A9-D1F5E7905AF2}.Debug|Win32.Build.0 = Debug|Win32 {5B0FE56E-266D-A62C-D8A9-D1F5E7905AF2}.Release|Win32.ActiveCfg = Release|Win32 + {5B0FE56E-266D-A62C-D8A9-D1F5E7905AF2}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj b/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj index f301b4de44..6a97cd81fe 100644 --- a/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj +++ b/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj @@ -1430,6 +1430,7 @@ + diff --git a/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj.filters b/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj.filters index b09d4260ee..c20cc3988a 100644 --- a/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj.filters +++ b/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj.filters @@ -1998,6 +1998,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/OSCSender/Builds/VisualStudio2017/OSCSender.sln b/examples/OSCSender/Builds/VisualStudio2017/OSCSender.sln index 00bb3dfa90..92fe5f48cc 100644 --- a/examples/OSCSender/Builds/VisualStudio2017/OSCSender.sln +++ b/examples/OSCSender/Builds/VisualStudio2017/OSCSender.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5B0FE56E-266D-A62C-D8A9-D1F5E7905AF2}.Debug|x64.Build.0 = Debug|x64 {5B0FE56E-266D-A62C-D8A9-D1F5E7905AF2}.Debug|x64.ActiveCfg = Debug|x64 - {5B0FE56E-266D-A62C-D8A9-D1F5E7905AF2}.Release|x64.Build.0 = Release|x64 + {5B0FE56E-266D-A62C-D8A9-D1F5E7905AF2}.Debug|x64.Build.0 = Debug|x64 {5B0FE56E-266D-A62C-D8A9-D1F5E7905AF2}.Release|x64.ActiveCfg = Release|x64 + {5B0FE56E-266D-A62C-D8A9-D1F5E7905AF2}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj b/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj index bddd13e91b..e1415bdcbe 100644 --- a/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj +++ b/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj @@ -1429,6 +1429,7 @@ + diff --git a/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj.filters b/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj.filters index 14ee96dce8..86d6be1474 100644 --- a/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj.filters +++ b/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj.filters @@ -1998,6 +1998,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/OSCSender/Builds/iOS/OSCSender.xcodeproj/project.pbxproj b/examples/OSCSender/Builds/iOS/OSCSender.xcodeproj/project.pbxproj index 70df098e53..f78b0cd322 100644 --- a/examples/OSCSender/Builds/iOS/OSCSender.xcodeproj/project.pbxproj +++ b/examples/OSCSender/Builds/iOS/OSCSender.xcodeproj/project.pbxproj @@ -215,7 +215,7 @@ 1E9F219D82037569524E98CF, CDCF3ED48FB54EFBE0DD9046, 53E02F5676BF451851C9C06E, ); buildRules = ( ); dependencies = ( ); name = "OSCSender - App"; productName = OSCSender; productReference = E6F7F38EEF1BA55231F5B1D4; productType = "com.apple.product-type.application"; }; - 9CD8E1E30EDAF4E86990F260 = {isa = PBXProject; buildConfigurationList = ABFD3DA91CD9955D1FEC14F5; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 3D76C0E767055A9B4699DD95 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 168BF90B7EF8C12090B0A9B2; projectDirPath = ""; projectRoot = ""; targets = (3D76C0E767055A9B4699DD95); }; + 9CD8E1E30EDAF4E86990F260 = {isa = PBXProject; buildConfigurationList = ABFD3DA91CD9955D1FEC14F5; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 3D76C0E767055A9B4699DD95 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 168BF90B7EF8C12090B0A9B2; projectDirPath = ""; projectRoot = ""; targets = (3D76C0E767055A9B4699DD95); }; }; rootObject = 9CD8E1E30EDAF4E86990F260; } diff --git a/examples/OSCSender/JuceLibraryCode/AppConfig.h b/examples/OSCSender/JuceLibraryCode/AppConfig.h index e33e981754..0c9e6ad80c 100644 --- a/examples/OSCSender/JuceLibraryCode/AppConfig.h +++ b/examples/OSCSender/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/OpenGLAppExample/Builds/MacOSX/OpenGLAppExample.xcodeproj/project.pbxproj b/examples/OpenGLAppExample/Builds/MacOSX/OpenGLAppExample.xcodeproj/project.pbxproj index 58531e7efa..90c4a9b26d 100644 --- a/examples/OpenGLAppExample/Builds/MacOSX/OpenGLAppExample.xcodeproj/project.pbxproj +++ b/examples/OpenGLAppExample/Builds/MacOSX/OpenGLAppExample.xcodeproj/project.pbxproj @@ -289,7 +289,7 @@ 56C1AB4D5E9F6E55C4A4D18C, 9C76B98AD0B6E256C4C90D77, 9CAA70AAF55A5D696C59AA51, ); buildRules = ( ); dependencies = ( ); name = "OpenGLAppExample - App"; productName = OpenGLAppExample; productReference = 7451C664E0B1FF42F028813E; productType = "com.apple.product-type.application"; }; - 92078120DD024E75D724B8AB = {isa = PBXProject; buildConfigurationList = 46FEBDB3E8E7421830E627F2; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 9F2051B91F59B036C151A2F9 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 5EB8D0E327356FA2D5323013; projectDirPath = ""; projectRoot = ""; targets = (9F2051B91F59B036C151A2F9); }; + 92078120DD024E75D724B8AB = {isa = PBXProject; buildConfigurationList = 46FEBDB3E8E7421830E627F2; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 9F2051B91F59B036C151A2F9 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 5EB8D0E327356FA2D5323013; projectDirPath = ""; projectRoot = ""; targets = (9F2051B91F59B036C151A2F9); }; }; rootObject = 92078120DD024E75D724B8AB; } diff --git a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample.sln b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample.sln index 349d9131c9..c8b1162034 100644 --- a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample.sln +++ b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {182ACA5F-046A-783D-4973-5D5DE8D7D5A5}.Debug|x64.Build.0 = Debug|x64 {182ACA5F-046A-783D-4973-5D5DE8D7D5A5}.Debug|x64.ActiveCfg = Debug|x64 - {182ACA5F-046A-783D-4973-5D5DE8D7D5A5}.Release|x64.Build.0 = Release|x64 + {182ACA5F-046A-783D-4973-5D5DE8D7D5A5}.Debug|x64.Build.0 = Debug|x64 {182ACA5F-046A-783D-4973-5D5DE8D7D5A5}.Release|x64.ActiveCfg = Release|x64 + {182ACA5F-046A-783D-4973-5D5DE8D7D5A5}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj index 3fa0743295..f3e8f94861 100644 --- a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj +++ b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj @@ -2109,6 +2109,7 @@ + diff --git a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj.filters b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj.filters index 57a9abc0d4..9f36dc0ee4 100644 --- a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj.filters +++ b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj.filters @@ -3270,6 +3270,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample.xcodeproj/project.pbxproj b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample.xcodeproj/project.pbxproj index df33ff7984..2cfed7fe55 100644 --- a/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample.xcodeproj/project.pbxproj +++ b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample.xcodeproj/project.pbxproj @@ -295,7 +295,7 @@ 56C1AB4D5E9F6E55C4A4D18C, 9C76B98AD0B6E256C4C90D77, 9CAA70AAF55A5D696C59AA51, ); buildRules = ( ); dependencies = ( ); name = "OpenGLAppExample - App"; productName = OpenGLAppExample; productReference = 7451C664E0B1FF42F028813E; productType = "com.apple.product-type.application"; }; - 92078120DD024E75D724B8AB = {isa = PBXProject; buildConfigurationList = 46FEBDB3E8E7421830E627F2; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 9F2051B91F59B036C151A2F9 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 5EB8D0E327356FA2D5323013; projectDirPath = ""; projectRoot = ""; targets = (9F2051B91F59B036C151A2F9); }; + 92078120DD024E75D724B8AB = {isa = PBXProject; buildConfigurationList = 46FEBDB3E8E7421830E627F2; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 9F2051B91F59B036C151A2F9 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 5EB8D0E327356FA2D5323013; projectDirPath = ""; projectRoot = ""; targets = (9F2051B91F59B036C151A2F9); }; }; rootObject = 92078120DD024E75D724B8AB; } diff --git a/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h b/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h index 53a250eaec..9c3110579c 100644 --- a/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/PluckedStringsDemo/Builds/MacOSX/PluckedStringsDemo.xcodeproj/project.pbxproj b/examples/PluckedStringsDemo/Builds/MacOSX/PluckedStringsDemo.xcodeproj/project.pbxproj index 490ccc08c1..c2518b9efc 100644 --- a/examples/PluckedStringsDemo/Builds/MacOSX/PluckedStringsDemo.xcodeproj/project.pbxproj +++ b/examples/PluckedStringsDemo/Builds/MacOSX/PluckedStringsDemo.xcodeproj/project.pbxproj @@ -259,7 +259,7 @@ 28277E0496F9A366F1E8A121, 5EDB4F61A6B9E9073901673E, 922CC2B83A0B55C36D188E46, ); buildRules = ( ); dependencies = ( ); name = "PluckedStringsDemo - App"; productName = PluckedStringsDemo; productReference = 3A8608CBA979E2BD17B50D0E; productType = "com.apple.product-type.application"; }; - 209D68C0E5F80B54B99D6435 = {isa = PBXProject; buildConfigurationList = DE12D5F044F75EB7B3CF17BB; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { B15B6C659E27D8982A94F805 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = B4D11720461A13D5D9F3E047; projectDirPath = ""; projectRoot = ""; targets = (B15B6C659E27D8982A94F805); }; + 209D68C0E5F80B54B99D6435 = {isa = PBXProject; buildConfigurationList = DE12D5F044F75EB7B3CF17BB; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { B15B6C659E27D8982A94F805 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = B4D11720461A13D5D9F3E047; projectDirPath = ""; projectRoot = ""; targets = (B15B6C659E27D8982A94F805); }; }; rootObject = 209D68C0E5F80B54B99D6435; } diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo.sln b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo.sln index d0f5c7dfc1..e2376ef5de 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo.sln +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo.sln @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A05B4CDE-58D3-4400-5280-63574E9C8D46}.Debug|Win32.Build.0 = Debug|Win32 {A05B4CDE-58D3-4400-5280-63574E9C8D46}.Debug|Win32.ActiveCfg = Debug|Win32 - {A05B4CDE-58D3-4400-5280-63574E9C8D46}.Release|Win32.Build.0 = Release|Win32 + {A05B4CDE-58D3-4400-5280-63574E9C8D46}.Debug|Win32.Build.0 = Debug|Win32 {A05B4CDE-58D3-4400-5280-63574E9C8D46}.Release|Win32.ActiveCfg = Release|Win32 + {A05B4CDE-58D3-4400-5280-63574E9C8D46}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj index 294a0a5df4..72b1963e5b 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj @@ -2096,6 +2096,7 @@ + diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj.filters b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj.filters index fab6b6882d..e6b5202613 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj.filters +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj.filters @@ -3240,6 +3240,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo.sln b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo.sln index 761214a825..9321368a85 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo.sln +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A05B4CDE-58D3-4400-5280-63574E9C8D46}.Debug|x64.Build.0 = Debug|x64 {A05B4CDE-58D3-4400-5280-63574E9C8D46}.Debug|x64.ActiveCfg = Debug|x64 - {A05B4CDE-58D3-4400-5280-63574E9C8D46}.Release|x64.Build.0 = Release|x64 + {A05B4CDE-58D3-4400-5280-63574E9C8D46}.Debug|x64.Build.0 = Debug|x64 {A05B4CDE-58D3-4400-5280-63574E9C8D46}.Release|x64.ActiveCfg = Release|x64 + {A05B4CDE-58D3-4400-5280-63574E9C8D46}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj index 23b0e101ae..1ddbefe57b 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj @@ -2095,6 +2095,7 @@ + diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj.filters b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj.filters index 877827023e..161fae0454 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj.filters +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj.filters @@ -3240,6 +3240,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h b/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h index 835847f811..3297659b93 100644 --- a/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h +++ b/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/PlugInSamples/Arpeggiator/Builds/MacOSX/Arpeggiator.xcodeproj/project.pbxproj b/examples/PlugInSamples/Arpeggiator/Builds/MacOSX/Arpeggiator.xcodeproj/project.pbxproj index 6a22d1558a..c4a20b327d 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/MacOSX/Arpeggiator.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/Arpeggiator/Builds/MacOSX/Arpeggiator.xcodeproj/project.pbxproj @@ -517,7 +517,7 @@ 2B8F857D37C80F13FC988EB2, ); runOnlyForDeploymentPostprocessing = 0; }; 319717B733C323BE76160BD4 = {isa = PBXNativeTarget; buildConfigurationList = AFF7B7B2889999928579D32F; buildPhases = ( 1CDAF3706AC2D6D164846859, ); buildRules = ( ); dependencies = ( ); name = "Arpeggiator - Shared Code"; productName = Arpeggiator; productReference = 6C612817F52B969A5F16CE94; productType = "com.apple.product-type.library.static"; }; - 4A5323BE8842B95E4FCCD6ED = {isa = PBXProject; buildConfigurationList = B601BADC34558F9AD61C80D7; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 08D74DB290FCD09A8D4810BB = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };892A28E616D56F05C8C11049 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };07D9D33E3466A8A497086BEE = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };319717B733C323BE76160BD4 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 7678EFC533FC99BEEF151913; projectDirPath = ""; projectRoot = ""; targets = (08D74DB290FCD09A8D4810BB, 892A28E616D56F05C8C11049, 07D9D33E3466A8A497086BEE, 319717B733C323BE76160BD4); }; + 4A5323BE8842B95E4FCCD6ED = {isa = PBXProject; buildConfigurationList = B601BADC34558F9AD61C80D7; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 08D74DB290FCD09A8D4810BB = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };892A28E616D56F05C8C11049 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };07D9D33E3466A8A497086BEE = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };319717B733C323BE76160BD4 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 7678EFC533FC99BEEF151913; projectDirPath = ""; projectRoot = ""; targets = (08D74DB290FCD09A8D4810BB, 892A28E616D56F05C8C11049, 07D9D33E3466A8A497086BEE, 319717B733C323BE76160BD4); }; }; rootObject = 4A5323BE8842B95E4FCCD6ED; } diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator.sln b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator.sln index d8330cff42..3ee3838997 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator.sln +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator.sln @@ -14,14 +14,14 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7B4A2CB7-0625-C36D-39FB-C651743A206F}.Debug|Win32.Build.0 = Debug|Win32 {7B4A2CB7-0625-C36D-39FB-C651743A206F}.Debug|Win32.ActiveCfg = Debug|Win32 - {7B4A2CB7-0625-C36D-39FB-C651743A206F}.Release|Win32.Build.0 = Release|Win32 + {7B4A2CB7-0625-C36D-39FB-C651743A206F}.Debug|Win32.Build.0 = Debug|Win32 {7B4A2CB7-0625-C36D-39FB-C651743A206F}.Release|Win32.ActiveCfg = Release|Win32 - {7B14DB3F-59CC-58D2-4DC7-03A1BD2836FB}.Debug|Win32.Build.0 = Debug|Win32 + {7B4A2CB7-0625-C36D-39FB-C651743A206F}.Release|Win32.Build.0 = Release|Win32 {7B14DB3F-59CC-58D2-4DC7-03A1BD2836FB}.Debug|Win32.ActiveCfg = Debug|Win32 - {7B14DB3F-59CC-58D2-4DC7-03A1BD2836FB}.Release|Win32.Build.0 = Release|Win32 + {7B14DB3F-59CC-58D2-4DC7-03A1BD2836FB}.Debug|Win32.Build.0 = Debug|Win32 {7B14DB3F-59CC-58D2-4DC7-03A1BD2836FB}.Release|Win32.ActiveCfg = Release|Win32 + {7B14DB3F-59CC-58D2-4DC7-03A1BD2836FB}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj index 154f3ba3bf..b8cc1a9935 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj @@ -2232,6 +2232,7 @@ + diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj.filters b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj.filters index f5ae004a5e..808629a673 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj.filters @@ -3495,6 +3495,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator.sln b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator.sln index 13ee3582ac..3107ab6662 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator.sln +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator.sln @@ -14,14 +14,14 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7B4A2CB7-0625-C36D-39FB-C651743A206F}.Debug|x64.Build.0 = Debug|x64 {7B4A2CB7-0625-C36D-39FB-C651743A206F}.Debug|x64.ActiveCfg = Debug|x64 - {7B4A2CB7-0625-C36D-39FB-C651743A206F}.Release|x64.Build.0 = Release|x64 + {7B4A2CB7-0625-C36D-39FB-C651743A206F}.Debug|x64.Build.0 = Debug|x64 {7B4A2CB7-0625-C36D-39FB-C651743A206F}.Release|x64.ActiveCfg = Release|x64 - {7B14DB3F-59CC-58D2-4DC7-03A1BD2836FB}.Debug|x64.Build.0 = Debug|x64 + {7B4A2CB7-0625-C36D-39FB-C651743A206F}.Release|x64.Build.0 = Release|x64 {7B14DB3F-59CC-58D2-4DC7-03A1BD2836FB}.Debug|x64.ActiveCfg = Debug|x64 - {7B14DB3F-59CC-58D2-4DC7-03A1BD2836FB}.Release|x64.Build.0 = Release|x64 + {7B14DB3F-59CC-58D2-4DC7-03A1BD2836FB}.Debug|x64.Build.0 = Debug|x64 {7B14DB3F-59CC-58D2-4DC7-03A1BD2836FB}.Release|x64.ActiveCfg = Release|x64 + {7B14DB3F-59CC-58D2-4DC7-03A1BD2836FB}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj index 309126d5f8..6fb6f9c69b 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj @@ -2225,6 +2225,7 @@ + diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj.filters b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj.filters index cb65f542e1..f05d69108a 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj.filters @@ -3495,6 +3495,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h index cb62fe2f2b..7dbf69c208 100644 --- a/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/PlugInSamples/GainPlugIn/Builds/MacOSX/GainPlugIn.xcodeproj/project.pbxproj b/examples/PlugInSamples/GainPlugIn/Builds/MacOSX/GainPlugIn.xcodeproj/project.pbxproj index 066f613842..31eb50991d 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/MacOSX/GainPlugIn.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/MacOSX/GainPlugIn.xcodeproj/project.pbxproj @@ -629,7 +629,7 @@ E7EDCC066F7BFE33413D78FE, ); runOnlyForDeploymentPostprocessing = 0; }; EF7E12AA943CABF4C9ACE9FC = {isa = PBXNativeTarget; buildConfigurationList = 2D1D1BFA76D5FF752D06187F; buildPhases = ( E57E58AA3A8632B697CF894F, ); buildRules = ( ); dependencies = ( ); name = "GainPlugIn - Shared Code"; productName = GainPlugIn; productReference = 074F1E0FAFBD4B127B869BC2; productType = "com.apple.product-type.library.static"; }; - 14B1FDE882BA4A9678780A26 = {isa = PBXProject; buildConfigurationList = 738DD13F786359A977312E92; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 67946078D4B1207C2A6BDB4F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };BBE761975F619DAA1B4D0F57 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };8777AC1501FECCF360363C10 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };95B232D53C8384ECDA8C519B = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };EF7E12AA943CABF4C9ACE9FC = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 807311746F9F870D03BE88D9; projectDirPath = ""; projectRoot = ""; targets = (67946078D4B1207C2A6BDB4F, BBE761975F619DAA1B4D0F57, 8777AC1501FECCF360363C10, 95B232D53C8384ECDA8C519B, EF7E12AA943CABF4C9ACE9FC); }; + 14B1FDE882BA4A9678780A26 = {isa = PBXProject; buildConfigurationList = 738DD13F786359A977312E92; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 67946078D4B1207C2A6BDB4F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };BBE761975F619DAA1B4D0F57 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };8777AC1501FECCF360363C10 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };95B232D53C8384ECDA8C519B = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };EF7E12AA943CABF4C9ACE9FC = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 807311746F9F870D03BE88D9; projectDirPath = ""; projectRoot = ""; targets = (67946078D4B1207C2A6BDB4F, BBE761975F619DAA1B4D0F57, 8777AC1501FECCF360363C10, 95B232D53C8384ECDA8C519B, EF7E12AA943CABF4C9ACE9FC); }; }; rootObject = 14B1FDE882BA4A9678780A26; } diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn.sln b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn.sln index e40f220703..9dbba38aaa 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn.sln +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn.sln @@ -19,18 +19,18 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2A769212-432C-7313-391E-68B46A0888F2}.Debug|Win32.Build.0 = Debug|Win32 {2A769212-432C-7313-391E-68B46A0888F2}.Debug|Win32.ActiveCfg = Debug|Win32 - {2A769212-432C-7313-391E-68B46A0888F2}.Release|Win32.Build.0 = Release|Win32 + {2A769212-432C-7313-391E-68B46A0888F2}.Debug|Win32.Build.0 = Debug|Win32 {2A769212-432C-7313-391E-68B46A0888F2}.Release|Win32.ActiveCfg = Release|Win32 - {5810FF56-5ACC-8BFE-EFCE-D9655FEC8E5B}.Debug|Win32.Build.0 = Debug|Win32 + {2A769212-432C-7313-391E-68B46A0888F2}.Release|Win32.Build.0 = Release|Win32 {5810FF56-5ACC-8BFE-EFCE-D9655FEC8E5B}.Debug|Win32.ActiveCfg = Debug|Win32 - {5810FF56-5ACC-8BFE-EFCE-D9655FEC8E5B}.Release|Win32.Build.0 = Release|Win32 + {5810FF56-5ACC-8BFE-EFCE-D9655FEC8E5B}.Debug|Win32.Build.0 = Debug|Win32 {5810FF56-5ACC-8BFE-EFCE-D9655FEC8E5B}.Release|Win32.ActiveCfg = Release|Win32 - {E83746D9-1736-E433-6CEF-9C347DF444D1}.Debug|Win32.Build.0 = Debug|Win32 + {5810FF56-5ACC-8BFE-EFCE-D9655FEC8E5B}.Release|Win32.Build.0 = Release|Win32 {E83746D9-1736-E433-6CEF-9C347DF444D1}.Debug|Win32.ActiveCfg = Debug|Win32 - {E83746D9-1736-E433-6CEF-9C347DF444D1}.Release|Win32.Build.0 = Release|Win32 + {E83746D9-1736-E433-6CEF-9C347DF444D1}.Debug|Win32.Build.0 = Debug|Win32 {E83746D9-1736-E433-6CEF-9C347DF444D1}.Release|Win32.ActiveCfg = Release|Win32 + {E83746D9-1736-E433-6CEF-9C347DF444D1}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj index 19c3d0b39f..9c6177bc98 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj @@ -2232,6 +2232,7 @@ + diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj.filters b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj.filters index 1aea36b611..01b4862866 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj.filters @@ -3495,6 +3495,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn.sln b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn.sln index 8d87621eec..acc6ab8db6 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn.sln +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn.sln @@ -19,18 +19,18 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2A769212-432C-7313-391E-68B46A0888F2}.Debug|x64.Build.0 = Debug|x64 {2A769212-432C-7313-391E-68B46A0888F2}.Debug|x64.ActiveCfg = Debug|x64 - {2A769212-432C-7313-391E-68B46A0888F2}.Release|x64.Build.0 = Release|x64 + {2A769212-432C-7313-391E-68B46A0888F2}.Debug|x64.Build.0 = Debug|x64 {2A769212-432C-7313-391E-68B46A0888F2}.Release|x64.ActiveCfg = Release|x64 - {5810FF56-5ACC-8BFE-EFCE-D9655FEC8E5B}.Debug|x64.Build.0 = Debug|x64 + {2A769212-432C-7313-391E-68B46A0888F2}.Release|x64.Build.0 = Release|x64 {5810FF56-5ACC-8BFE-EFCE-D9655FEC8E5B}.Debug|x64.ActiveCfg = Debug|x64 - {5810FF56-5ACC-8BFE-EFCE-D9655FEC8E5B}.Release|x64.Build.0 = Release|x64 + {5810FF56-5ACC-8BFE-EFCE-D9655FEC8E5B}.Debug|x64.Build.0 = Debug|x64 {5810FF56-5ACC-8BFE-EFCE-D9655FEC8E5B}.Release|x64.ActiveCfg = Release|x64 - {E83746D9-1736-E433-6CEF-9C347DF444D1}.Debug|x64.Build.0 = Debug|x64 + {5810FF56-5ACC-8BFE-EFCE-D9655FEC8E5B}.Release|x64.Build.0 = Release|x64 {E83746D9-1736-E433-6CEF-9C347DF444D1}.Debug|x64.ActiveCfg = Debug|x64 - {E83746D9-1736-E433-6CEF-9C347DF444D1}.Release|x64.Build.0 = Release|x64 + {E83746D9-1736-E433-6CEF-9C347DF444D1}.Debug|x64.Build.0 = Debug|x64 {E83746D9-1736-E433-6CEF-9C347DF444D1}.Release|x64.ActiveCfg = Release|x64 + {E83746D9-1736-E433-6CEF-9C347DF444D1}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj index f2b092f0eb..38c3604f44 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj @@ -2225,6 +2225,7 @@ + diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj.filters b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj.filters index 21748f8422..5e60fc7b2c 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj.filters @@ -3495,6 +3495,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h index e45316f9b0..f90b551436 100644 --- a/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/PlugInSamples/InterAppAudioEffect/Builds/iOS/InterAppAudioEffect.xcodeproj/project.pbxproj b/examples/PlugInSamples/InterAppAudioEffect/Builds/iOS/InterAppAudioEffect.xcodeproj/project.pbxproj index a96bd9904f..835fe3efe3 100644 --- a/examples/PlugInSamples/InterAppAudioEffect/Builds/iOS/InterAppAudioEffect.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/InterAppAudioEffect/Builds/iOS/InterAppAudioEffect.xcodeproj/project.pbxproj @@ -373,7 +373,7 @@ FAC41C26E955C024553DC96C, ); runOnlyForDeploymentPostprocessing = 0; }; A3401CC1AC6C5B89EFBAEF01 = {isa = PBXNativeTarget; buildConfigurationList = AA6F190D4FECB06C7A7A0658; buildPhases = ( 177DC2A7A303F23EDDE5183A, ); buildRules = ( ); dependencies = ( ); name = "InterAppAudioEffect - Shared Code"; productName = InterAppAudioEffect; productReference = 873711620EC157BCCFFF80B1; productType = "com.apple.product-type.library.static"; }; - DF3D0C1B88ADC0274AE6BD73 = {isa = PBXProject; buildConfigurationList = 016ACE6B9EC6F47020502F4F; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 03BD5476C606A5BA65CD4FDF = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };51FB6E6A2D0998D38E999826 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 1; }; com.apple.Sandbox = { enabled = 0; }; }; };A3401CC1AC6C5B89EFBAEF01 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = EC01685A042C62251C5AF093; projectDirPath = ""; projectRoot = ""; targets = (03BD5476C606A5BA65CD4FDF, 51FB6E6A2D0998D38E999826, A3401CC1AC6C5B89EFBAEF01); }; + DF3D0C1B88ADC0274AE6BD73 = {isa = PBXProject; buildConfigurationList = 016ACE6B9EC6F47020502F4F; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 03BD5476C606A5BA65CD4FDF = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };51FB6E6A2D0998D38E999826 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 1; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };A3401CC1AC6C5B89EFBAEF01 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = EC01685A042C62251C5AF093; projectDirPath = ""; projectRoot = ""; targets = (03BD5476C606A5BA65CD4FDF, 51FB6E6A2D0998D38E999826, A3401CC1AC6C5B89EFBAEF01); }; }; rootObject = DF3D0C1B88ADC0274AE6BD73; } diff --git a/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/AppConfig.h index eb65a8b071..94faef9153 100644 --- a/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/MacOSX/MultiOutSynth.xcodeproj/project.pbxproj b/examples/PlugInSamples/MultiOutSynth/Builds/MacOSX/MultiOutSynth.xcodeproj/project.pbxproj index 49db23e049..48aa93177b 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/MacOSX/MultiOutSynth.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/MacOSX/MultiOutSynth.xcodeproj/project.pbxproj @@ -753,7 +753,7 @@ 46A39F2ED379F6CA576517EC, ); runOnlyForDeploymentPostprocessing = 0; }; 744AC9FB5FF46367E6EAB865 = {isa = PBXNativeTarget; buildConfigurationList = 73259124A13B6ED37AC0BCEF; buildPhases = ( 6EE42F29415E0C1BCA23ACEE, ); buildRules = ( ); dependencies = ( ); name = "MultiOutSynth - Shared Code"; productName = MultiOutSynth; productReference = 03B7AAA7C11BC7F21B857177; productType = "com.apple.product-type.library.static"; }; - BEAECE0013C448921D99879E = {isa = PBXProject; buildConfigurationList = 7D1924CF413FEA0C1FCDF335; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { F142F5144E24B9733BC560AA = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };B377E1482A96692F10D48B50 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };2CFA1B5A759BEA36D2129738 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };78448B618A99813B399CCE6A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };D7588383E404F0E9A3C21185 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };744AC9FB5FF46367E6EAB865 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = FB6D20503B6A21E15DD99922; projectDirPath = ""; projectRoot = ""; targets = (F142F5144E24B9733BC560AA, B377E1482A96692F10D48B50, 2CFA1B5A759BEA36D2129738, 78448B618A99813B399CCE6A, D7588383E404F0E9A3C21185, 744AC9FB5FF46367E6EAB865); }; + BEAECE0013C448921D99879E = {isa = PBXProject; buildConfigurationList = 7D1924CF413FEA0C1FCDF335; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { F142F5144E24B9733BC560AA = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };B377E1482A96692F10D48B50 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };2CFA1B5A759BEA36D2129738 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };78448B618A99813B399CCE6A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };D7588383E404F0E9A3C21185 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };744AC9FB5FF46367E6EAB865 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = FB6D20503B6A21E15DD99922; projectDirPath = ""; projectRoot = ""; targets = (F142F5144E24B9733BC560AA, B377E1482A96692F10D48B50, 2CFA1B5A759BEA36D2129738, 78448B618A99813B399CCE6A, D7588383E404F0E9A3C21185, 744AC9FB5FF46367E6EAB865); }; }; rootObject = BEAECE0013C448921D99879E; } diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth.sln b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth.sln index a3631a65a4..12fbac8ce3 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth.sln +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth.sln @@ -24,22 +24,22 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7790E2A1-4049-EC16-F460-753EE395D0C9}.Debug|Win32.Build.0 = Debug|Win32 {7790E2A1-4049-EC16-F460-753EE395D0C9}.Debug|Win32.ActiveCfg = Debug|Win32 - {7790E2A1-4049-EC16-F460-753EE395D0C9}.Release|Win32.Build.0 = Release|Win32 + {7790E2A1-4049-EC16-F460-753EE395D0C9}.Debug|Win32.Build.0 = Debug|Win32 {7790E2A1-4049-EC16-F460-753EE395D0C9}.Release|Win32.ActiveCfg = Release|Win32 - {44876436-075F-C9F0-C107-5BB5C5DE6638}.Debug|Win32.Build.0 = Debug|Win32 + {7790E2A1-4049-EC16-F460-753EE395D0C9}.Release|Win32.Build.0 = Release|Win32 {44876436-075F-C9F0-C107-5BB5C5DE6638}.Debug|Win32.ActiveCfg = Debug|Win32 - {44876436-075F-C9F0-C107-5BB5C5DE6638}.Release|Win32.Build.0 = Release|Win32 + {44876436-075F-C9F0-C107-5BB5C5DE6638}.Debug|Win32.Build.0 = Debug|Win32 {44876436-075F-C9F0-C107-5BB5C5DE6638}.Release|Win32.ActiveCfg = Release|Win32 - {6682B889-29F8-82A9-59E4-6F23A6DEF43F}.Debug|Win32.Build.0 = Debug|Win32 + {44876436-075F-C9F0-C107-5BB5C5DE6638}.Release|Win32.Build.0 = Release|Win32 {6682B889-29F8-82A9-59E4-6F23A6DEF43F}.Debug|Win32.ActiveCfg = Debug|Win32 - {6682B889-29F8-82A9-59E4-6F23A6DEF43F}.Release|Win32.Build.0 = Release|Win32 + {6682B889-29F8-82A9-59E4-6F23A6DEF43F}.Debug|Win32.Build.0 = Debug|Win32 {6682B889-29F8-82A9-59E4-6F23A6DEF43F}.Release|Win32.ActiveCfg = Release|Win32 - {33FE4627-BBEA-82E1-5512-8C1F218CF560}.Debug|Win32.Build.0 = Debug|Win32 + {6682B889-29F8-82A9-59E4-6F23A6DEF43F}.Release|Win32.Build.0 = Release|Win32 {33FE4627-BBEA-82E1-5512-8C1F218CF560}.Debug|Win32.ActiveCfg = Debug|Win32 - {33FE4627-BBEA-82E1-5512-8C1F218CF560}.Release|Win32.Build.0 = Release|Win32 + {33FE4627-BBEA-82E1-5512-8C1F218CF560}.Debug|Win32.Build.0 = Debug|Win32 {33FE4627-BBEA-82E1-5512-8C1F218CF560}.Release|Win32.ActiveCfg = Release|Win32 + {33FE4627-BBEA-82E1-5512-8C1F218CF560}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj index b6181e95af..6f885cefb5 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj @@ -2233,6 +2233,7 @@ + diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj.filters b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj.filters index 1a06096a78..197c88a502 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj.filters @@ -3501,6 +3501,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth.sln b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth.sln index 3ab79baec7..5fb434d050 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth.sln +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth.sln @@ -24,22 +24,22 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7790E2A1-4049-EC16-F460-753EE395D0C9}.Debug|x64.Build.0 = Debug|x64 {7790E2A1-4049-EC16-F460-753EE395D0C9}.Debug|x64.ActiveCfg = Debug|x64 - {7790E2A1-4049-EC16-F460-753EE395D0C9}.Release|x64.Build.0 = Release|x64 + {7790E2A1-4049-EC16-F460-753EE395D0C9}.Debug|x64.Build.0 = Debug|x64 {7790E2A1-4049-EC16-F460-753EE395D0C9}.Release|x64.ActiveCfg = Release|x64 - {44876436-075F-C9F0-C107-5BB5C5DE6638}.Debug|x64.Build.0 = Debug|x64 + {7790E2A1-4049-EC16-F460-753EE395D0C9}.Release|x64.Build.0 = Release|x64 {44876436-075F-C9F0-C107-5BB5C5DE6638}.Debug|x64.ActiveCfg = Debug|x64 - {44876436-075F-C9F0-C107-5BB5C5DE6638}.Release|x64.Build.0 = Release|x64 + {44876436-075F-C9F0-C107-5BB5C5DE6638}.Debug|x64.Build.0 = Debug|x64 {44876436-075F-C9F0-C107-5BB5C5DE6638}.Release|x64.ActiveCfg = Release|x64 - {6682B889-29F8-82A9-59E4-6F23A6DEF43F}.Debug|x64.Build.0 = Debug|x64 + {44876436-075F-C9F0-C107-5BB5C5DE6638}.Release|x64.Build.0 = Release|x64 {6682B889-29F8-82A9-59E4-6F23A6DEF43F}.Debug|x64.ActiveCfg = Debug|x64 - {6682B889-29F8-82A9-59E4-6F23A6DEF43F}.Release|x64.Build.0 = Release|x64 + {6682B889-29F8-82A9-59E4-6F23A6DEF43F}.Debug|x64.Build.0 = Debug|x64 {6682B889-29F8-82A9-59E4-6F23A6DEF43F}.Release|x64.ActiveCfg = Release|x64 - {33FE4627-BBEA-82E1-5512-8C1F218CF560}.Debug|x64.Build.0 = Debug|x64 + {6682B889-29F8-82A9-59E4-6F23A6DEF43F}.Release|x64.Build.0 = Release|x64 {33FE4627-BBEA-82E1-5512-8C1F218CF560}.Debug|x64.ActiveCfg = Debug|x64 - {33FE4627-BBEA-82E1-5512-8C1F218CF560}.Release|x64.Build.0 = Release|x64 + {33FE4627-BBEA-82E1-5512-8C1F218CF560}.Debug|x64.Build.0 = Debug|x64 {33FE4627-BBEA-82E1-5512-8C1F218CF560}.Release|x64.ActiveCfg = Release|x64 + {33FE4627-BBEA-82E1-5512-8C1F218CF560}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj index 17a2e9d80f..61b5e7dad5 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj @@ -2226,6 +2226,7 @@ + diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj.filters b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj.filters index 4c3dfa49f5..cc7f97f1f7 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj.filters @@ -3501,6 +3501,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h index f31825cd1b..5857391781 100644 --- a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/PlugInSamples/NoiseGate/Builds/MacOSX/NoiseGate.xcodeproj/project.pbxproj b/examples/PlugInSamples/NoiseGate/Builds/MacOSX/NoiseGate.xcodeproj/project.pbxproj index 523bedd3e5..fc89482e46 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/MacOSX/NoiseGate.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/MacOSX/NoiseGate.xcodeproj/project.pbxproj @@ -743,7 +743,7 @@ 9417CBFA63740D17BE2F6288, ); runOnlyForDeploymentPostprocessing = 0; }; C6A39FF70BF77051D89E2CE4 = {isa = PBXNativeTarget; buildConfigurationList = 17413E5C8ECD089086907FAE; buildPhases = ( 61132FB6D58EDB3690AECF80, ); buildRules = ( ); dependencies = ( ); name = "NoiseGate - Shared Code"; productName = NoiseGate; productReference = B15F50973CE5D365D77D282B; productType = "com.apple.product-type.library.static"; }; - BAD3113DEB12EFF472860A51 = {isa = PBXProject; buildConfigurationList = 1283F0CE36BC5AD8241EC08A; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { BE96E7C5FAB338297CC69BA9 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };89095DFC434F1A8EB6368E3A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };822408E00D8E4658EE40468E = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C31F9AF2D73B265832C65F18 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };5B796CD6929336C2CDEDBCD1 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C6A39FF70BF77051D89E2CE4 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 1E8CE067EFE6F03AB97CACC0; projectDirPath = ""; projectRoot = ""; targets = (BE96E7C5FAB338297CC69BA9, 89095DFC434F1A8EB6368E3A, 822408E00D8E4658EE40468E, C31F9AF2D73B265832C65F18, 5B796CD6929336C2CDEDBCD1, C6A39FF70BF77051D89E2CE4); }; + BAD3113DEB12EFF472860A51 = {isa = PBXProject; buildConfigurationList = 1283F0CE36BC5AD8241EC08A; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { BE96E7C5FAB338297CC69BA9 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };89095DFC434F1A8EB6368E3A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };822408E00D8E4658EE40468E = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C31F9AF2D73B265832C65F18 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };5B796CD6929336C2CDEDBCD1 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C6A39FF70BF77051D89E2CE4 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 1E8CE067EFE6F03AB97CACC0; projectDirPath = ""; projectRoot = ""; targets = (BE96E7C5FAB338297CC69BA9, 89095DFC434F1A8EB6368E3A, 822408E00D8E4658EE40468E, C31F9AF2D73B265832C65F18, 5B796CD6929336C2CDEDBCD1, C6A39FF70BF77051D89E2CE4); }; }; rootObject = BAD3113DEB12EFF472860A51; } diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate.sln b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate.sln index f9f5f73b9b..81d9ac6509 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate.sln +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate.sln @@ -24,22 +24,22 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A536DDEE-63EA-6626-E173-346797F44F1C}.Debug|Win32.Build.0 = Debug|Win32 {A536DDEE-63EA-6626-E173-346797F44F1C}.Debug|Win32.ActiveCfg = Debug|Win32 - {A536DDEE-63EA-6626-E173-346797F44F1C}.Release|Win32.Build.0 = Release|Win32 + {A536DDEE-63EA-6626-E173-346797F44F1C}.Debug|Win32.Build.0 = Debug|Win32 {A536DDEE-63EA-6626-E173-346797F44F1C}.Release|Win32.ActiveCfg = Release|Win32 - {79CECA03-F5D8-FAA6-DF41-B5C10F2E99DC}.Debug|Win32.Build.0 = Debug|Win32 + {A536DDEE-63EA-6626-E173-346797F44F1C}.Release|Win32.Build.0 = Release|Win32 {79CECA03-F5D8-FAA6-DF41-B5C10F2E99DC}.Debug|Win32.ActiveCfg = Debug|Win32 - {79CECA03-F5D8-FAA6-DF41-B5C10F2E99DC}.Release|Win32.Build.0 = Release|Win32 + {79CECA03-F5D8-FAA6-DF41-B5C10F2E99DC}.Debug|Win32.Build.0 = Debug|Win32 {79CECA03-F5D8-FAA6-DF41-B5C10F2E99DC}.Release|Win32.ActiveCfg = Release|Win32 - {047A8F76-26B6-FCC1-DC5E-2B0920870033}.Debug|Win32.Build.0 = Debug|Win32 + {79CECA03-F5D8-FAA6-DF41-B5C10F2E99DC}.Release|Win32.Build.0 = Release|Win32 {047A8F76-26B6-FCC1-DC5E-2B0920870033}.Debug|Win32.ActiveCfg = Debug|Win32 - {047A8F76-26B6-FCC1-DC5E-2B0920870033}.Release|Win32.Build.0 = Release|Win32 + {047A8F76-26B6-FCC1-DC5E-2B0920870033}.Debug|Win32.Build.0 = Debug|Win32 {047A8F76-26B6-FCC1-DC5E-2B0920870033}.Release|Win32.ActiveCfg = Release|Win32 - {C400EBA2-5D53-0AF7-AA8B-7F64FB12D8EC}.Debug|Win32.Build.0 = Debug|Win32 + {047A8F76-26B6-FCC1-DC5E-2B0920870033}.Release|Win32.Build.0 = Release|Win32 {C400EBA2-5D53-0AF7-AA8B-7F64FB12D8EC}.Debug|Win32.ActiveCfg = Debug|Win32 - {C400EBA2-5D53-0AF7-AA8B-7F64FB12D8EC}.Release|Win32.Build.0 = Release|Win32 + {C400EBA2-5D53-0AF7-AA8B-7F64FB12D8EC}.Debug|Win32.Build.0 = Debug|Win32 {C400EBA2-5D53-0AF7-AA8B-7F64FB12D8EC}.Release|Win32.ActiveCfg = Release|Win32 + {C400EBA2-5D53-0AF7-AA8B-7F64FB12D8EC}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj index a7fdb0fa8b..1656a0b2e1 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj @@ -2232,6 +2232,7 @@ + diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj.filters b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj.filters index 5c6aeae7d4..fc938a672c 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj.filters @@ -3495,6 +3495,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate.sln b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate.sln index 603374431f..92d4206257 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate.sln +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate.sln @@ -24,22 +24,22 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A536DDEE-63EA-6626-E173-346797F44F1C}.Debug|x64.Build.0 = Debug|x64 {A536DDEE-63EA-6626-E173-346797F44F1C}.Debug|x64.ActiveCfg = Debug|x64 - {A536DDEE-63EA-6626-E173-346797F44F1C}.Release|x64.Build.0 = Release|x64 + {A536DDEE-63EA-6626-E173-346797F44F1C}.Debug|x64.Build.0 = Debug|x64 {A536DDEE-63EA-6626-E173-346797F44F1C}.Release|x64.ActiveCfg = Release|x64 - {79CECA03-F5D8-FAA6-DF41-B5C10F2E99DC}.Debug|x64.Build.0 = Debug|x64 + {A536DDEE-63EA-6626-E173-346797F44F1C}.Release|x64.Build.0 = Release|x64 {79CECA03-F5D8-FAA6-DF41-B5C10F2E99DC}.Debug|x64.ActiveCfg = Debug|x64 - {79CECA03-F5D8-FAA6-DF41-B5C10F2E99DC}.Release|x64.Build.0 = Release|x64 + {79CECA03-F5D8-FAA6-DF41-B5C10F2E99DC}.Debug|x64.Build.0 = Debug|x64 {79CECA03-F5D8-FAA6-DF41-B5C10F2E99DC}.Release|x64.ActiveCfg = Release|x64 - {047A8F76-26B6-FCC1-DC5E-2B0920870033}.Debug|x64.Build.0 = Debug|x64 + {79CECA03-F5D8-FAA6-DF41-B5C10F2E99DC}.Release|x64.Build.0 = Release|x64 {047A8F76-26B6-FCC1-DC5E-2B0920870033}.Debug|x64.ActiveCfg = Debug|x64 - {047A8F76-26B6-FCC1-DC5E-2B0920870033}.Release|x64.Build.0 = Release|x64 + {047A8F76-26B6-FCC1-DC5E-2B0920870033}.Debug|x64.Build.0 = Debug|x64 {047A8F76-26B6-FCC1-DC5E-2B0920870033}.Release|x64.ActiveCfg = Release|x64 - {C400EBA2-5D53-0AF7-AA8B-7F64FB12D8EC}.Debug|x64.Build.0 = Debug|x64 + {047A8F76-26B6-FCC1-DC5E-2B0920870033}.Release|x64.Build.0 = Release|x64 {C400EBA2-5D53-0AF7-AA8B-7F64FB12D8EC}.Debug|x64.ActiveCfg = Debug|x64 - {C400EBA2-5D53-0AF7-AA8B-7F64FB12D8EC}.Release|x64.Build.0 = Release|x64 + {C400EBA2-5D53-0AF7-AA8B-7F64FB12D8EC}.Debug|x64.Build.0 = Debug|x64 {C400EBA2-5D53-0AF7-AA8B-7F64FB12D8EC}.Release|x64.ActiveCfg = Release|x64 + {C400EBA2-5D53-0AF7-AA8B-7F64FB12D8EC}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj index e33c140c24..a5f1ec7328 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj @@ -2225,6 +2225,7 @@ + diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj.filters b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj.filters index d0556be306..abd9fb8ac8 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj.filters @@ -3495,6 +3495,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h index d84b2a9169..693a3526a0 100644 --- a/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/PlugInSamples/Surround/Builds/MacOSX/Surround.xcodeproj/project.pbxproj b/examples/PlugInSamples/Surround/Builds/MacOSX/Surround.xcodeproj/project.pbxproj index 24bed04c2c..4b89e6e49f 100644 --- a/examples/PlugInSamples/Surround/Builds/MacOSX/Surround.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/Surround/Builds/MacOSX/Surround.xcodeproj/project.pbxproj @@ -755,7 +755,7 @@ 56CD31005B93225A3BA73ADE, ); runOnlyForDeploymentPostprocessing = 0; }; ECF21C83A6EB88D73C09E713 = {isa = PBXNativeTarget; buildConfigurationList = 2027B4509482C03CE7628088; buildPhases = ( 533BEF452ABC455670C57273, ); buildRules = ( ); dependencies = ( ); name = "Surround - Shared Code"; productName = Surround; productReference = ED7C79D32D589E0F8123BB6A; productType = "com.apple.product-type.library.static"; }; - 1350D0395A6BD8D60471CF92 = {isa = PBXProject; buildConfigurationList = B617DCD972781EFAD4370890; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 662E24C61A67634787C1DDDA = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };BCE8135290C1E3CF37F2E6EA = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };050134A7A9B0AD26AD788AB7 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };1406423C2E104DB2C01413A8 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };3DE552C28C67B3599B47F6D5 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };ECF21C83A6EB88D73C09E713 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = C16B685A8A4A888CBFC241D5; projectDirPath = ""; projectRoot = ""; targets = (662E24C61A67634787C1DDDA, BCE8135290C1E3CF37F2E6EA, 050134A7A9B0AD26AD788AB7, 1406423C2E104DB2C01413A8, 3DE552C28C67B3599B47F6D5, ECF21C83A6EB88D73C09E713); }; + 1350D0395A6BD8D60471CF92 = {isa = PBXProject; buildConfigurationList = B617DCD972781EFAD4370890; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 662E24C61A67634787C1DDDA = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };BCE8135290C1E3CF37F2E6EA = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };050134A7A9B0AD26AD788AB7 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };1406423C2E104DB2C01413A8 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };3DE552C28C67B3599B47F6D5 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };ECF21C83A6EB88D73C09E713 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = C16B685A8A4A888CBFC241D5; projectDirPath = ""; projectRoot = ""; targets = (662E24C61A67634787C1DDDA, BCE8135290C1E3CF37F2E6EA, 050134A7A9B0AD26AD788AB7, 1406423C2E104DB2C01413A8, 3DE552C28C67B3599B47F6D5, ECF21C83A6EB88D73C09E713); }; }; rootObject = 1350D0395A6BD8D60471CF92; } diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround.sln b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround.sln index 2ee3e95828..d4cb5b0b4f 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround.sln +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround.sln @@ -24,22 +24,22 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {55C862BB-34A6-D462-7677-B40B5A2B2D47}.Debug|x64.Build.0 = Debug|x64 {55C862BB-34A6-D462-7677-B40B5A2B2D47}.Debug|x64.ActiveCfg = Debug|x64 - {55C862BB-34A6-D462-7677-B40B5A2B2D47}.Release|x64.Build.0 = Release|x64 + {55C862BB-34A6-D462-7677-B40B5A2B2D47}.Debug|x64.Build.0 = Debug|x64 {55C862BB-34A6-D462-7677-B40B5A2B2D47}.Release|x64.ActiveCfg = Release|x64 - {02900CD6-1E72-2F77-FBBC-5E75F6E44D01}.Debug|x64.Build.0 = Debug|x64 + {55C862BB-34A6-D462-7677-B40B5A2B2D47}.Release|x64.Build.0 = Release|x64 {02900CD6-1E72-2F77-FBBC-5E75F6E44D01}.Debug|x64.ActiveCfg = Debug|x64 - {02900CD6-1E72-2F77-FBBC-5E75F6E44D01}.Release|x64.Build.0 = Release|x64 + {02900CD6-1E72-2F77-FBBC-5E75F6E44D01}.Debug|x64.Build.0 = Debug|x64 {02900CD6-1E72-2F77-FBBC-5E75F6E44D01}.Release|x64.ActiveCfg = Release|x64 - {14B52CC8-E419-ABEE-5E58-923ED2747D28}.Debug|x64.Build.0 = Debug|x64 + {02900CD6-1E72-2F77-FBBC-5E75F6E44D01}.Release|x64.Build.0 = Release|x64 {14B52CC8-E419-ABEE-5E58-923ED2747D28}.Debug|x64.ActiveCfg = Debug|x64 - {14B52CC8-E419-ABEE-5E58-923ED2747D28}.Release|x64.Build.0 = Release|x64 + {14B52CC8-E419-ABEE-5E58-923ED2747D28}.Debug|x64.Build.0 = Debug|x64 {14B52CC8-E419-ABEE-5E58-923ED2747D28}.Release|x64.ActiveCfg = Release|x64 - {E23EFE1E-497A-07DF-40A4-45EC79B5684F}.Debug|x64.Build.0 = Debug|x64 + {14B52CC8-E419-ABEE-5E58-923ED2747D28}.Release|x64.Build.0 = Release|x64 {E23EFE1E-497A-07DF-40A4-45EC79B5684F}.Debug|x64.ActiveCfg = Debug|x64 - {E23EFE1E-497A-07DF-40A4-45EC79B5684F}.Release|x64.Build.0 = Release|x64 + {E23EFE1E-497A-07DF-40A4-45EC79B5684F}.Debug|x64.Build.0 = Debug|x64 {E23EFE1E-497A-07DF-40A4-45EC79B5684F}.Release|x64.ActiveCfg = Release|x64 + {E23EFE1E-497A-07DF-40A4-45EC79B5684F}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj index 28b8589a35..ae42ef6401 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj @@ -2226,6 +2226,7 @@ + diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj.filters b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj.filters index 6aad3855bb..c9b76f1c83 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj.filters @@ -3498,6 +3498,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround.sln b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround.sln index 98a903b1dc..7bd33e6aba 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround.sln +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround.sln @@ -24,22 +24,22 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {55C862BB-34A6-D462-7677-B40B5A2B2D47}.Debug|x64.Build.0 = Debug|x64 {55C862BB-34A6-D462-7677-B40B5A2B2D47}.Debug|x64.ActiveCfg = Debug|x64 - {55C862BB-34A6-D462-7677-B40B5A2B2D47}.Release|x64.Build.0 = Release|x64 + {55C862BB-34A6-D462-7677-B40B5A2B2D47}.Debug|x64.Build.0 = Debug|x64 {55C862BB-34A6-D462-7677-B40B5A2B2D47}.Release|x64.ActiveCfg = Release|x64 - {02900CD6-1E72-2F77-FBBC-5E75F6E44D01}.Debug|x64.Build.0 = Debug|x64 + {55C862BB-34A6-D462-7677-B40B5A2B2D47}.Release|x64.Build.0 = Release|x64 {02900CD6-1E72-2F77-FBBC-5E75F6E44D01}.Debug|x64.ActiveCfg = Debug|x64 - {02900CD6-1E72-2F77-FBBC-5E75F6E44D01}.Release|x64.Build.0 = Release|x64 + {02900CD6-1E72-2F77-FBBC-5E75F6E44D01}.Debug|x64.Build.0 = Debug|x64 {02900CD6-1E72-2F77-FBBC-5E75F6E44D01}.Release|x64.ActiveCfg = Release|x64 - {14B52CC8-E419-ABEE-5E58-923ED2747D28}.Debug|x64.Build.0 = Debug|x64 + {02900CD6-1E72-2F77-FBBC-5E75F6E44D01}.Release|x64.Build.0 = Release|x64 {14B52CC8-E419-ABEE-5E58-923ED2747D28}.Debug|x64.ActiveCfg = Debug|x64 - {14B52CC8-E419-ABEE-5E58-923ED2747D28}.Release|x64.Build.0 = Release|x64 + {14B52CC8-E419-ABEE-5E58-923ED2747D28}.Debug|x64.Build.0 = Debug|x64 {14B52CC8-E419-ABEE-5E58-923ED2747D28}.Release|x64.ActiveCfg = Release|x64 - {E23EFE1E-497A-07DF-40A4-45EC79B5684F}.Debug|x64.Build.0 = Debug|x64 + {14B52CC8-E419-ABEE-5E58-923ED2747D28}.Release|x64.Build.0 = Release|x64 {E23EFE1E-497A-07DF-40A4-45EC79B5684F}.Debug|x64.ActiveCfg = Debug|x64 - {E23EFE1E-497A-07DF-40A4-45EC79B5684F}.Release|x64.Build.0 = Release|x64 + {E23EFE1E-497A-07DF-40A4-45EC79B5684F}.Debug|x64.Build.0 = Debug|x64 {E23EFE1E-497A-07DF-40A4-45EC79B5684F}.Release|x64.ActiveCfg = Release|x64 + {E23EFE1E-497A-07DF-40A4-45EC79B5684F}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj index 83b220660b..78325100a0 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj @@ -2226,6 +2226,7 @@ + diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj.filters b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj.filters index 722fc8b179..b998603797 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj.filters @@ -3498,6 +3498,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h index 9fd5e151d9..efac35f7a0 100644 --- a/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/SimpleFFTExample/Builds/MacOSX/SimpleFFTExample.xcodeproj/project.pbxproj b/examples/SimpleFFTExample/Builds/MacOSX/SimpleFFTExample.xcodeproj/project.pbxproj index 62bcd8fa6b..d95ee945c7 100644 --- a/examples/SimpleFFTExample/Builds/MacOSX/SimpleFFTExample.xcodeproj/project.pbxproj +++ b/examples/SimpleFFTExample/Builds/MacOSX/SimpleFFTExample.xcodeproj/project.pbxproj @@ -255,7 +255,7 @@ 48322B9DE3337E69E96F7551, 69128EEF3B23EA7E960EBE08, B8B3353D164D52CC62A584F2, ); buildRules = ( ); dependencies = ( ); name = "SimpleFFTExample - App"; productName = SimpleFFTExample; productReference = 8D8ED3E7474D65E7177750A8; productType = "com.apple.product-type.application"; }; - CF307CC82EF6FB552266854D = {isa = PBXProject; buildConfigurationList = C877108FC7BF2DA280A51F46; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { D0E4014BABB86AAE963C0EC0 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4DB04A617E8DFE6D06731154; projectDirPath = ""; projectRoot = ""; targets = (D0E4014BABB86AAE963C0EC0); }; + CF307CC82EF6FB552266854D = {isa = PBXProject; buildConfigurationList = C877108FC7BF2DA280A51F46; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { D0E4014BABB86AAE963C0EC0 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4DB04A617E8DFE6D06731154; projectDirPath = ""; projectRoot = ""; targets = (D0E4014BABB86AAE963C0EC0); }; }; rootObject = CF307CC82EF6FB552266854D; } diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample.sln b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample.sln index 3fc8186466..dd57f88cdb 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample.sln +++ b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample.sln @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5F11C54A-E1F5-0119-1E0A-E26E0B8E911C}.Debug|Win32.Build.0 = Debug|Win32 {5F11C54A-E1F5-0119-1E0A-E26E0B8E911C}.Debug|Win32.ActiveCfg = Debug|Win32 - {5F11C54A-E1F5-0119-1E0A-E26E0B8E911C}.Release|Win32.Build.0 = Release|Win32 + {5F11C54A-E1F5-0119-1E0A-E26E0B8E911C}.Debug|Win32.Build.0 = Debug|Win32 {5F11C54A-E1F5-0119-1E0A-E26E0B8E911C}.Release|Win32.ActiveCfg = Release|Win32 + {5F11C54A-E1F5-0119-1E0A-E26E0B8E911C}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj index 32c55ede2e..31a5374b74 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj +++ b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj @@ -2094,6 +2094,7 @@ + diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj.filters b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj.filters index 356a710c58..861c25d16c 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj.filters +++ b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj.filters @@ -3234,6 +3234,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample.sln b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample.sln index 6fddebd300..6ce721ced3 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample.sln +++ b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5F11C54A-E1F5-0119-1E0A-E26E0B8E911C}.Debug|x64.Build.0 = Debug|x64 {5F11C54A-E1F5-0119-1E0A-E26E0B8E911C}.Debug|x64.ActiveCfg = Debug|x64 - {5F11C54A-E1F5-0119-1E0A-E26E0B8E911C}.Release|x64.Build.0 = Release|x64 + {5F11C54A-E1F5-0119-1E0A-E26E0B8E911C}.Debug|x64.Build.0 = Debug|x64 {5F11C54A-E1F5-0119-1E0A-E26E0B8E911C}.Release|x64.ActiveCfg = Release|x64 + {5F11C54A-E1F5-0119-1E0A-E26E0B8E911C}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj index ba880fdcd0..ca5fba37bd 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj +++ b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj @@ -2093,6 +2093,7 @@ + diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj.filters b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj.filters index cc5dc5519a..df4a2644af 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj.filters +++ b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj.filters @@ -3234,6 +3234,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h b/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h index 835847f811..3297659b93 100644 --- a/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h +++ b/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt b/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt index 6b5a1174f0..4eade5dbb3 100644 --- a/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt +++ b/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt @@ -921,6 +921,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_graphics/native/juce_mac_IconHelpers.cpp" "../../../../../modules/juce_graphics/native/juce_RenderingHelpers.h" "../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp" + "../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h" "../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp" "../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp" "../../../../../modules/juce_graphics/native/juce_win32_Fonts.cpp" @@ -2158,6 +2159,7 @@ set_source_files_properties("../../../../../modules/juce_graphics/native/juce_ma set_source_files_properties("../../../../../modules/juce_graphics/native/juce_mac_IconHelpers.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_RenderingHelpers.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Fonts.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/audio plugin demo/Builds/Android/app/src/main/res/values/string.xml b/examples/audio plugin demo/Builds/Android/app/src/main/res/values/string.xml deleted file mode 100644 index 73aad349fb..0000000000 --- a/examples/audio plugin demo/Builds/Android/app/src/main/res/values/string.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - JuceDemoPlugin - diff --git a/examples/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj b/examples/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj index 1872bb9cf8..9565d192eb 100644 --- a/examples/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj +++ b/examples/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj @@ -710,7 +710,7 @@ 80AB3252A67CCE24226B54A2, ); runOnlyForDeploymentPostprocessing = 0; }; C3F206BB3277FBADE3BD615B = {isa = PBXNativeTarget; buildConfigurationList = 08D73ACBC0F6E2A4747629EE; buildPhases = ( 4E087312D44130771EB1E9C2, ); buildRules = ( ); dependencies = ( ); name = "JuceDemoPlugin - Shared Code"; productName = JuceDemoPlugin; productReference = 4D6248E85C22578615FA809C; productType = "com.apple.product-type.library.static"; }; - 85250052F3E019894332668E = {isa = PBXProject; buildConfigurationList = 0720B453F376663EAB98BF9B; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { D4A200CA175E6673EB359B63 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };921CB4BBA34ADBC5270F81EF = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };71E1E34CFC671ACBBCE0726C = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C6D88D358CA321193FD3CC4F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 1; }; }; };F2918F451F1385B37AF4A6ED = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C3F206BB3277FBADE3BD615B = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4074359E1E7C4D54E87C3461; projectDirPath = ""; projectRoot = ""; targets = (D4A200CA175E6673EB359B63, 921CB4BBA34ADBC5270F81EF, 71E1E34CFC671ACBBCE0726C, C6D88D358CA321193FD3CC4F, F2918F451F1385B37AF4A6ED, C3F206BB3277FBADE3BD615B); }; + 85250052F3E019894332668E = {isa = PBXProject; buildConfigurationList = 0720B453F376663EAB98BF9B; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { D4A200CA175E6673EB359B63 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };921CB4BBA34ADBC5270F81EF = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };71E1E34CFC671ACBBCE0726C = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C6D88D358CA321193FD3CC4F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 1; }; }; };F2918F451F1385B37AF4A6ED = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C3F206BB3277FBADE3BD615B = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4074359E1E7C4D54E87C3461; projectDirPath = ""; projectRoot = ""; targets = (D4A200CA175E6673EB359B63, 921CB4BBA34ADBC5270F81EF, 71E1E34CFC671ACBBCE0726C, C6D88D358CA321193FD3CC4F, F2918F451F1385B37AF4A6ED, C3F206BB3277FBADE3BD615B); }; }; rootObject = 85250052F3E019894332668E; } diff --git a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin.sln b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin.sln index d43fa98bc5..dcde4a6fc3 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin.sln +++ b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin.sln @@ -19,18 +19,18 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D82A1FD0-FB5C-8174-477C-8EF5CA51D2A8}.Debug|x64.Build.0 = Debug|x64 {D82A1FD0-FB5C-8174-477C-8EF5CA51D2A8}.Debug|x64.ActiveCfg = Debug|x64 - {D82A1FD0-FB5C-8174-477C-8EF5CA51D2A8}.Release|x64.Build.0 = Release|x64 + {D82A1FD0-FB5C-8174-477C-8EF5CA51D2A8}.Debug|x64.Build.0 = Debug|x64 {D82A1FD0-FB5C-8174-477C-8EF5CA51D2A8}.Release|x64.ActiveCfg = Release|x64 - {DF786751-7581-02E8-2BB4-E217CD55C907}.Debug|x64.Build.0 = Debug|x64 + {D82A1FD0-FB5C-8174-477C-8EF5CA51D2A8}.Release|x64.Build.0 = Release|x64 {DF786751-7581-02E8-2BB4-E217CD55C907}.Debug|x64.ActiveCfg = Debug|x64 - {DF786751-7581-02E8-2BB4-E217CD55C907}.Release|x64.Build.0 = Release|x64 + {DF786751-7581-02E8-2BB4-E217CD55C907}.Debug|x64.Build.0 = Debug|x64 {DF786751-7581-02E8-2BB4-E217CD55C907}.Release|x64.ActiveCfg = Release|x64 - {1AB90829-CCC5-D7C1-BC4A-70C8D3DAD372}.Debug|x64.Build.0 = Debug|x64 + {DF786751-7581-02E8-2BB4-E217CD55C907}.Release|x64.Build.0 = Release|x64 {1AB90829-CCC5-D7C1-BC4A-70C8D3DAD372}.Debug|x64.ActiveCfg = Debug|x64 - {1AB90829-CCC5-D7C1-BC4A-70C8D3DAD372}.Release|x64.Build.0 = Release|x64 + {1AB90829-CCC5-D7C1-BC4A-70C8D3DAD372}.Debug|x64.Build.0 = Debug|x64 {1AB90829-CCC5-D7C1-BC4A-70C8D3DAD372}.Release|x64.ActiveCfg = Release|x64 + {1AB90829-CCC5-D7C1-BC4A-70C8D3DAD372}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj index b3005fe0c0..fcb9121923 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj +++ b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj @@ -2215,6 +2215,7 @@ + diff --git a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj.filters b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj.filters index 7b0cf08fad..f5e82e4a93 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj.filters +++ b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj.filters @@ -3477,6 +3477,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin.sln b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin.sln index d1c39bc3b7..82de5aec00 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin.sln +++ b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin.sln @@ -19,18 +19,18 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D82A1FD0-FB5C-8174-477C-8EF5CA51D2A8}.Debug|x64.Build.0 = Debug|x64 {D82A1FD0-FB5C-8174-477C-8EF5CA51D2A8}.Debug|x64.ActiveCfg = Debug|x64 - {D82A1FD0-FB5C-8174-477C-8EF5CA51D2A8}.Release|x64.Build.0 = Release|x64 + {D82A1FD0-FB5C-8174-477C-8EF5CA51D2A8}.Debug|x64.Build.0 = Debug|x64 {D82A1FD0-FB5C-8174-477C-8EF5CA51D2A8}.Release|x64.ActiveCfg = Release|x64 - {DF786751-7581-02E8-2BB4-E217CD55C907}.Debug|x64.Build.0 = Debug|x64 + {D82A1FD0-FB5C-8174-477C-8EF5CA51D2A8}.Release|x64.Build.0 = Release|x64 {DF786751-7581-02E8-2BB4-E217CD55C907}.Debug|x64.ActiveCfg = Debug|x64 - {DF786751-7581-02E8-2BB4-E217CD55C907}.Release|x64.Build.0 = Release|x64 + {DF786751-7581-02E8-2BB4-E217CD55C907}.Debug|x64.Build.0 = Debug|x64 {DF786751-7581-02E8-2BB4-E217CD55C907}.Release|x64.ActiveCfg = Release|x64 - {1AB90829-CCC5-D7C1-BC4A-70C8D3DAD372}.Debug|x64.Build.0 = Debug|x64 + {DF786751-7581-02E8-2BB4-E217CD55C907}.Release|x64.Build.0 = Release|x64 {1AB90829-CCC5-D7C1-BC4A-70C8D3DAD372}.Debug|x64.ActiveCfg = Debug|x64 - {1AB90829-CCC5-D7C1-BC4A-70C8D3DAD372}.Release|x64.Build.0 = Release|x64 + {1AB90829-CCC5-D7C1-BC4A-70C8D3DAD372}.Debug|x64.Build.0 = Debug|x64 {1AB90829-CCC5-D7C1-BC4A-70C8D3DAD372}.Release|x64.ActiveCfg = Release|x64 + {1AB90829-CCC5-D7C1-BC4A-70C8D3DAD372}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj index dd15b709fe..b3663ad5e0 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj +++ b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj @@ -2215,6 +2215,7 @@ + diff --git a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj.filters b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj.filters index 03fe5c973f..1a86ca4aa2 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj.filters +++ b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj.filters @@ -3477,6 +3477,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/audio plugin demo/Builds/iOS/JuceDemoPlugin.xcodeproj/project.pbxproj b/examples/audio plugin demo/Builds/iOS/JuceDemoPlugin.xcodeproj/project.pbxproj index b0226edba9..9894806cc4 100644 --- a/examples/audio plugin demo/Builds/iOS/JuceDemoPlugin.xcodeproj/project.pbxproj +++ b/examples/audio plugin demo/Builds/iOS/JuceDemoPlugin.xcodeproj/project.pbxproj @@ -467,7 +467,7 @@ 80AB3252A67CCE24226B54A2, ); runOnlyForDeploymentPostprocessing = 0; }; C3F206BB3277FBADE3BD615B = {isa = PBXNativeTarget; buildConfigurationList = 08D73ACBC0F6E2A4747629EE; buildPhases = ( 4E087312D44130771EB1E9C2, ); buildRules = ( ); dependencies = ( ); name = "JuceDemoPlugin - Shared Code"; productName = JuceDemoPlugin; productReference = 4D6248E85C22578615FA809C; productType = "com.apple.product-type.library.static"; }; - 85250052F3E019894332668E = {isa = PBXProject; buildConfigurationList = 0720B453F376663EAB98BF9B; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { D4A200CA175E6673EB359B63 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C6D88D358CA321193FD3CC4F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 1; }; }; };F2918F451F1385B37AF4A6ED = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C3F206BB3277FBADE3BD615B = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4074359E1E7C4D54E87C3461; projectDirPath = ""; projectRoot = ""; targets = (D4A200CA175E6673EB359B63, C6D88D358CA321193FD3CC4F, F2918F451F1385B37AF4A6ED, C3F206BB3277FBADE3BD615B); }; + 85250052F3E019894332668E = {isa = PBXProject; buildConfigurationList = 0720B453F376663EAB98BF9B; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { D4A200CA175E6673EB359B63 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C6D88D358CA321193FD3CC4F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 1; }; }; };F2918F451F1385B37AF4A6ED = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C3F206BB3277FBADE3BD615B = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4074359E1E7C4D54E87C3461; projectDirPath = ""; projectRoot = ""; targets = (D4A200CA175E6673EB359B63, C6D88D358CA321193FD3CC4F, F2918F451F1385B37AF4A6ED, C3F206BB3277FBADE3BD615B); }; }; rootObject = 85250052F3E019894332668E; } diff --git a/examples/audio plugin demo/JuceLibraryCode/AppConfig.h b/examples/audio plugin demo/JuceLibraryCode/AppConfig.h index ae362d7a3b..250fbd91ef 100644 --- a/examples/audio plugin demo/JuceLibraryCode/AppConfig.h +++ b/examples/audio plugin demo/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj b/examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj index cf321fbc9f..560401c5b0 100644 --- a/examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj +++ b/examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj @@ -321,7 +321,7 @@ 2429BB4D705CC57F49418CFB, E8E94B3C187DA578BFCBDA98, C515A1FE1A53D3968C22FAEF, ); buildRules = ( ); dependencies = ( ); name = "Plugin Host - App"; productName = "Plugin Host"; productReference = 8D8BBC353637DA442C5575DA; productType = "com.apple.product-type.application"; }; - ADE6E539DB98A302483A82D0 = {isa = PBXProject; buildConfigurationList = 493C2C5E457692E5149C5525; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { DE12B7643D374BFF7E4FEB1C = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 65BEFC705A89E5C8A9E35C97; projectDirPath = ""; projectRoot = ""; targets = (DE12B7643D374BFF7E4FEB1C); }; + ADE6E539DB98A302483A82D0 = {isa = PBXProject; buildConfigurationList = 493C2C5E457692E5149C5525; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { DE12B7643D374BFF7E4FEB1C = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 65BEFC705A89E5C8A9E35C97; projectDirPath = ""; projectRoot = ""; targets = (DE12B7643D374BFF7E4FEB1C); }; }; rootObject = ADE6E539DB98A302483A82D0; } diff --git a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host.sln b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host.sln index 5153569804..c849d615e4 100644 --- a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host.sln +++ b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host.sln @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5666EAA2-C82B-D06A-5228-D0E810428536}.Debug|Win32.Build.0 = Debug|Win32 {5666EAA2-C82B-D06A-5228-D0E810428536}.Debug|Win32.ActiveCfg = Debug|Win32 - {5666EAA2-C82B-D06A-5228-D0E810428536}.Release|Win32.Build.0 = Release|Win32 + {5666EAA2-C82B-D06A-5228-D0E810428536}.Debug|Win32.Build.0 = Debug|Win32 {5666EAA2-C82B-D06A-5228-D0E810428536}.Release|Win32.ActiveCfg = Release|Win32 + {5666EAA2-C82B-D06A-5228-D0E810428536}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE 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 ad406410d4..304a45c904 100644 --- a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj +++ b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj @@ -2179,6 +2179,7 @@ + diff --git a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj.filters b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj.filters index 0defa9cd5a..0672510535 100644 --- a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj.filters +++ b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj.filters @@ -3405,6 +3405,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host.sln b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host.sln index abded0f68c..0e4ab32c3c 100644 --- a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host.sln +++ b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5666EAA2-C82B-D06A-5228-D0E810428536}.Debug|x64.Build.0 = Debug|x64 {5666EAA2-C82B-D06A-5228-D0E810428536}.Debug|x64.ActiveCfg = Debug|x64 - {5666EAA2-C82B-D06A-5228-D0E810428536}.Release|x64.Build.0 = Release|x64 + {5666EAA2-C82B-D06A-5228-D0E810428536}.Debug|x64.Build.0 = Debug|x64 {5666EAA2-C82B-D06A-5228-D0E810428536}.Release|x64.ActiveCfg = Release|x64 + {5666EAA2-C82B-D06A-5228-D0E810428536}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE 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 60645fb673..7cd4a65707 100644 --- a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj +++ b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj @@ -2178,6 +2178,7 @@ + diff --git a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj.filters b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj.filters index b8d0fbc274..47ea7d4525 100644 --- a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj.filters +++ b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj.filters @@ -3405,6 +3405,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host.sln b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host.sln index 66d5c36dad..78a549f801 100644 --- a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host.sln +++ b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5666EAA2-C82B-D06A-5228-D0E810428536}.Debug|x64.Build.0 = Debug|x64 {5666EAA2-C82B-D06A-5228-D0E810428536}.Debug|x64.ActiveCfg = Debug|x64 - {5666EAA2-C82B-D06A-5228-D0E810428536}.Release|x64.Build.0 = Release|x64 + {5666EAA2-C82B-D06A-5228-D0E810428536}.Debug|x64.Build.0 = Debug|x64 {5666EAA2-C82B-D06A-5228-D0E810428536}.Release|x64.ActiveCfg = Release|x64 + {5666EAA2-C82B-D06A-5228-D0E810428536}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE 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 d8a992ac28..97ff2f0968 100644 --- a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj +++ b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj @@ -2178,6 +2178,7 @@ + diff --git a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj.filters b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj.filters index 68f3c64e07..5a2a19795d 100644 --- a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj.filters +++ b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj.filters @@ -3405,6 +3405,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/examples/audio plugin host/JuceLibraryCode/AppConfig.h b/examples/audio plugin host/JuceLibraryCode/AppConfig.h index 8fb32c5b73..d8411afaa6 100644 --- a/examples/audio plugin host/JuceLibraryCode/AppConfig.h +++ b/examples/audio plugin host/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt index e260b74ffe..c54769b1fa 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt @@ -820,6 +820,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_graphics/native/juce_mac_IconHelpers.cpp" "../../../../../modules/juce_graphics/native/juce_RenderingHelpers.h" "../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp" + "../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h" "../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp" "../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp" "../../../../../modules/juce_graphics/native/juce_win32_Fonts.cpp" @@ -1955,6 +1956,7 @@ set_source_files_properties("../../../../../modules/juce_graphics/native/juce_ma set_source_files_properties("../../../../../modules/juce_graphics/native/juce_mac_IconHelpers.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_RenderingHelpers.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_graphics/native/juce_win32_Fonts.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/extras/AudioPerformanceTest/Builds/Android/app/src/main/res/values/string.xml b/extras/AudioPerformanceTest/Builds/Android/app/src/main/res/values/string.xml deleted file mode 100644 index 251c59cb81..0000000000 --- a/extras/AudioPerformanceTest/Builds/Android/app/src/main/res/values/string.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - AudioPerformanceTest - diff --git a/extras/AudioPerformanceTest/Builds/MacOSX/AudioPerformanceTest.xcodeproj/project.pbxproj b/extras/AudioPerformanceTest/Builds/MacOSX/AudioPerformanceTest.xcodeproj/project.pbxproj index b9eab79c0b..0cdda0f71e 100644 --- a/extras/AudioPerformanceTest/Builds/MacOSX/AudioPerformanceTest.xcodeproj/project.pbxproj +++ b/extras/AudioPerformanceTest/Builds/MacOSX/AudioPerformanceTest.xcodeproj/project.pbxproj @@ -255,7 +255,7 @@ C86DD529EC94922C2AB61742, 6C2BE2DE2ECC96615ED827AB, 409D569C572B6EF7F4F1702D, ); buildRules = ( ); dependencies = ( ); name = "AudioPerformanceTest - App"; productName = AudioPerformanceTest; productReference = 614F2084407B35D62101F69F; productType = "com.apple.product-type.application"; }; - 9CE2A44801B5B4BE7A9667DA = {isa = PBXProject; buildConfigurationList = 7097CF6AC086DAC346ACCCD9; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { E9FD2656EC625C9C8DE30219 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3BA1BA0CAFE969E99950C06B; projectDirPath = ""; projectRoot = ""; targets = (E9FD2656EC625C9C8DE30219); }; + 9CE2A44801B5B4BE7A9667DA = {isa = PBXProject; buildConfigurationList = 7097CF6AC086DAC346ACCCD9; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { E9FD2656EC625C9C8DE30219 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3BA1BA0CAFE969E99950C06B; projectDirPath = ""; projectRoot = ""; targets = (E9FD2656EC625C9C8DE30219); }; }; rootObject = 9CE2A44801B5B4BE7A9667DA; } diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest.sln b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest.sln index 779f679507..b436f9b486 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest.sln +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest.sln @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {78607AE9-F43B-3DDB-0FE1-D745771AF527}.Debug|Win32.Build.0 = Debug|Win32 {78607AE9-F43B-3DDB-0FE1-D745771AF527}.Debug|Win32.ActiveCfg = Debug|Win32 - {78607AE9-F43B-3DDB-0FE1-D745771AF527}.Release|Win32.Build.0 = Release|Win32 + {78607AE9-F43B-3DDB-0FE1-D745771AF527}.Debug|Win32.Build.0 = Debug|Win32 {78607AE9-F43B-3DDB-0FE1-D745771AF527}.Release|Win32.ActiveCfg = Release|Win32 + {78607AE9-F43B-3DDB-0FE1-D745771AF527}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj index 65a39a6884..938790f471 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj @@ -2094,6 +2094,7 @@ + diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj.filters b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj.filters index 8b265f7589..05bc3afca0 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj.filters +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj.filters @@ -3234,6 +3234,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/extras/AudioPerformanceTest/Builds/iOS/AudioPerformanceTest.xcodeproj/project.pbxproj b/extras/AudioPerformanceTest/Builds/iOS/AudioPerformanceTest.xcodeproj/project.pbxproj index 0dbd39edc8..37d57bfb27 100644 --- a/extras/AudioPerformanceTest/Builds/iOS/AudioPerformanceTest.xcodeproj/project.pbxproj +++ b/extras/AudioPerformanceTest/Builds/iOS/AudioPerformanceTest.xcodeproj/project.pbxproj @@ -269,7 +269,7 @@ C86DD529EC94922C2AB61742, 6C2BE2DE2ECC96615ED827AB, 409D569C572B6EF7F4F1702D, ); buildRules = ( ); dependencies = ( ); name = "AudioPerformanceTest - App"; productName = AudioPerformanceTest; productReference = 614F2084407B35D62101F69F; productType = "com.apple.product-type.application"; }; - 9CE2A44801B5B4BE7A9667DA = {isa = PBXProject; buildConfigurationList = 7097CF6AC086DAC346ACCCD9; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { E9FD2656EC625C9C8DE30219 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3BA1BA0CAFE969E99950C06B; projectDirPath = ""; projectRoot = ""; targets = (E9FD2656EC625C9C8DE30219); }; + 9CE2A44801B5B4BE7A9667DA = {isa = PBXProject; buildConfigurationList = 7097CF6AC086DAC346ACCCD9; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { E9FD2656EC625C9C8DE30219 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3BA1BA0CAFE969E99950C06B; projectDirPath = ""; projectRoot = ""; targets = (E9FD2656EC625C9C8DE30219); }; }; rootObject = 9CE2A44801B5B4BE7A9667DA; } diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h b/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h index 835847f811..3297659b93 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h +++ b/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj index 84f51f76d7..3018488a95 100644 --- a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj +++ b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj @@ -911,7 +911,7 @@ C262D0F297DDE25326F5AC81, 5CB869A8DA78BE6FA2757034, D150288A32EE596408C2B99F, ); buildRules = ( ); dependencies = ( ); name = "Projucer - App"; productName = Projucer; productReference = 09DE066936CF037E9709ADB1; productType = "com.apple.product-type.application"; }; - 74EA481348A24104E6ACE009 = {isa = PBXProject; buildConfigurationList = F90407F24422C589DA251604; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 0039FE1A254FE518518BF8B8 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3CC531922CC2D398E283A845; projectDirPath = ""; projectRoot = ""; targets = (0039FE1A254FE518518BF8B8); }; + 74EA481348A24104E6ACE009 = {isa = PBXProject; buildConfigurationList = F90407F24422C589DA251604; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 0039FE1A254FE518518BF8B8 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3CC531922CC2D398E283A845; projectDirPath = ""; projectRoot = ""; targets = (0039FE1A254FE518518BF8B8); }; }; rootObject = 74EA481348A24104E6ACE009; } diff --git a/extras/Projucer/Builds/VisualStudio2013/Projucer.sln b/extras/Projucer/Builds/VisualStudio2013/Projucer.sln index 2e56c45692..8c3cf0cb3a 100644 --- a/extras/Projucer/Builds/VisualStudio2013/Projucer.sln +++ b/extras/Projucer/Builds/VisualStudio2013/Projucer.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Debug|x64.Build.0 = Debug|x64 {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Debug|x64.ActiveCfg = Debug|x64 - {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Release|x64.Build.0 = Release|x64 + {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Debug|x64.Build.0 = Debug|x64 {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Release|x64.ActiveCfg = Release|x64 + {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj index 21cbe5aa81..4aaca25e5b 100644 --- a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj @@ -1764,6 +1764,7 @@ + diff --git a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters index 23c4138f6e..1ed4943777 100644 --- a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters @@ -2868,6 +2868,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer.sln b/extras/Projucer/Builds/VisualStudio2015/Projucer.sln index f74fd162c4..b1d6d7a89c 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer.sln +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Debug|x64.Build.0 = Debug|x64 {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Debug|x64.ActiveCfg = Debug|x64 - {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Release|x64.Build.0 = Release|x64 + {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Debug|x64.Build.0 = Debug|x64 {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Release|x64.ActiveCfg = Release|x64 + {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj index d942124a8d..ea3d4d943f 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj @@ -1764,6 +1764,7 @@ + diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters index f0e3759050..d3bbd966de 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters @@ -2868,6 +2868,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer.sln b/extras/Projucer/Builds/VisualStudio2017/Projucer.sln index 8f0d1f4bf2..bec537385b 100644 --- a/extras/Projucer/Builds/VisualStudio2017/Projucer.sln +++ b/extras/Projucer/Builds/VisualStudio2017/Projucer.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Debug|x64.Build.0 = Debug|x64 {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Debug|x64.ActiveCfg = Debug|x64 - {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Release|x64.Build.0 = Release|x64 + {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Debug|x64.Build.0 = Debug|x64 {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Release|x64.ActiveCfg = Release|x64 + {E4CFCE31-1AF5-C360-751D-9682E333BE4D}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj index d1c59ee1ae..fcd56b2e4e 100644 --- a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj @@ -1764,6 +1764,7 @@ + diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters index 351952b98a..e754746f72 100644 --- a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters @@ -2868,6 +2868,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/extras/Projucer/JuceLibraryCode/AppConfig.h b/extras/Projucer/JuceLibraryCode/AppConfig.h index 13c2efc550..47ff481180 100644 --- a/extras/Projucer/JuceLibraryCode/AppConfig.h +++ b/extras/Projucer/JuceLibraryCode/AppConfig.h @@ -52,8 +52,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner.sln b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner.sln index 7b85b37a9d..ea21386da6 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner.sln +++ b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner.sln @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8059D6DB-7FA3-D129-4ADE-B3C1A560027C}.Debug|Win32.Build.0 = Debug|Win32 {8059D6DB-7FA3-D129-4ADE-B3C1A560027C}.Debug|Win32.ActiveCfg = Debug|Win32 - {8059D6DB-7FA3-D129-4ADE-B3C1A560027C}.Release|Win32.Build.0 = Release|Win32 + {8059D6DB-7FA3-D129-4ADE-B3C1A560027C}.Debug|Win32.Build.0 = Debug|Win32 {8059D6DB-7FA3-D129-4ADE-B3C1A560027C}.Release|Win32.ActiveCfg = Release|Win32 + {8059D6DB-7FA3-D129-4ADE-B3C1A560027C}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj index ec1cef7a09..198ca47621 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj @@ -2135,6 +2135,7 @@ + diff --git a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj.filters index 1f24602b99..3fd1f7c065 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -3294,6 +3294,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner.sln b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner.sln index 4e9bc5524c..6c947423ae 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner.sln +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8059D6DB-7FA3-D129-4ADE-B3C1A560027C}.Debug|x64.Build.0 = Debug|x64 {8059D6DB-7FA3-D129-4ADE-B3C1A560027C}.Debug|x64.ActiveCfg = Debug|x64 - {8059D6DB-7FA3-D129-4ADE-B3C1A560027C}.Release|x64.Build.0 = Release|x64 + {8059D6DB-7FA3-D129-4ADE-B3C1A560027C}.Debug|x64.Build.0 = Debug|x64 {8059D6DB-7FA3-D129-4ADE-B3C1A560027C}.Release|x64.ActiveCfg = Release|x64 + {8059D6DB-7FA3-D129-4ADE-B3C1A560027C}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj index 6303520a12..e6fa835431 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj @@ -2134,6 +2134,7 @@ + diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters index 77d0853dbc..69e3584e1e 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -3294,6 +3294,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h b/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h index 7c9c55e228..0ccddd7849 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h +++ b/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder.sln b/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder.sln index d3b3c645fd..329844cd4f 100644 --- a/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder.sln +++ b/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {88983F7C-DB65-9E04-84E7-05F8979E0383}.Debug|x64.Build.0 = Debug|x64 {88983F7C-DB65-9E04-84E7-05F8979E0383}.Debug|x64.ActiveCfg = Debug|x64 - {88983F7C-DB65-9E04-84E7-05F8979E0383}.Release|x64.Build.0 = Release|x64 + {88983F7C-DB65-9E04-84E7-05F8979E0383}.Debug|x64.Build.0 = Debug|x64 {88983F7C-DB65-9E04-84E7-05F8979E0383}.Release|x64.ActiveCfg = Release|x64 + {88983F7C-DB65-9E04-84E7-05F8979E0383}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/extras/binarybuilder/JuceLibraryCode/AppConfig.h b/extras/binarybuilder/JuceLibraryCode/AppConfig.h index 827e77879a..28d7899c72 100644 --- a/extras/binarybuilder/JuceLibraryCode/AppConfig.h +++ b/extras/binarybuilder/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A diff --git a/extras/windows dll/Builds/VisualStudio2017/juce_dll.sln b/extras/windows dll/Builds/VisualStudio2017/juce_dll.sln index a059b8b035..ffe6ba88d1 100644 --- a/extras/windows dll/Builds/VisualStudio2017/juce_dll.sln +++ b/extras/windows dll/Builds/VisualStudio2017/juce_dll.sln @@ -9,10 +9,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B636B53B-C44B-1E04-8668-D61B3900BAA4}.Debug|x64.Build.0 = Debug|x64 {B636B53B-C44B-1E04-8668-D61B3900BAA4}.Debug|x64.ActiveCfg = Debug|x64 - {B636B53B-C44B-1E04-8668-D61B3900BAA4}.Release|x64.Build.0 = Release|x64 + {B636B53B-C44B-1E04-8668-D61B3900BAA4}.Debug|x64.Build.0 = Debug|x64 {B636B53B-C44B-1E04-8668-D61B3900BAA4}.Release|x64.ActiveCfg = Release|x64 + {B636B53B-C44B-1E04-8668-D61B3900BAA4}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj index 7f5d4c6e8d..e10d79613a 100644 --- a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj +++ b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj @@ -2167,6 +2167,7 @@ + diff --git a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj.filters b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj.filters index bbf1a65cc3..024d827b00 100644 --- a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj.filters +++ b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj.filters @@ -3369,6 +3369,9 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\placement diff --git a/extras/windows dll/JuceLibraryCode/AppConfig.h b/extras/windows dll/JuceLibraryCode/AppConfig.h index 2aa7724fea..88d18d77c1 100644 --- a/extras/windows dll/JuceLibraryCode/AppConfig.h +++ b/extras/windows dll/JuceLibraryCode/AppConfig.h @@ -34,8 +34,14 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 0 -#define JUCE_REPORT_APP_USAGE 0 +#ifndef JUCE_DISPLAY_SPLASH_SCREEN + #define JUCE_DISPLAY_SPLASH_SCREEN 0 +#endif + +#ifndef JUCE_REPORT_APP_USAGE + #define JUCE_REPORT_APP_USAGE 0 +#endif + // END SECTION A