Mercurial > hg > touchkeys
diff JuceLibraryCode/AppConfig.h @ 56:b4a2d2ae43cf tip
merge
author | Andrew McPherson <andrewm@eecs.qmul.ac.uk> |
---|---|
date | Fri, 23 Nov 2018 15:48:14 +0000 |
parents | e468cb91794a |
children |
line wrap: on
line diff
--- a/JuceLibraryCode/AppConfig.h Fri Nov 23 15:39:25 2018 +0000 +++ b/JuceLibraryCode/AppConfig.h Fri Nov 23 15:48:14 2018 +0000 @@ -4,8 +4,8 @@ project - if you alter its contents, your changes may be overwritten! There's a section below where you can add your own custom code safely, and the - Introjucer will preserve the contents of that block, but the best way to change - any of these definitions is by using the Introjucer's project settings. + Projucer will preserve the contents of that block, but the best way to change + any of these definitions is by using the Projucer's project settings. Any commented-out settings will assume their default values. @@ -34,6 +34,17 @@ #define JUCE_MODULE_AVAILABLE_juce_opengl 1 //============================================================================== +#ifndef JUCE_STANDALONE_APPLICATION + #ifdef JucePlugin_Build_Standalone + #define JUCE_STANDALONE_APPLICATION JucePlugin_Build_Standalone + #else + #define JUCE_STANDALONE_APPLICATION 1 + #endif +#endif + +#define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1 + +//============================================================================== // juce_audio_devices flags: #ifndef JUCE_ASIO @@ -64,14 +75,6 @@ //#define JUCE_USE_ANDROID_OPENSLES #endif -#ifndef JUCE_USE_CDREADER - //#define JUCE_USE_CDREADER -#endif - -#ifndef JUCE_USE_CDBURNER - //#define JUCE_USE_CDBURNER -#endif - //============================================================================== // juce_audio_formats flags: @@ -118,6 +121,18 @@ //#define JUCE_INCLUDE_ZLIB_CODE #endif +#ifndef JUCE_USE_CURL + //#define JUCE_USE_CURL +#endif + +#ifndef JUCE_CATCH_UNHANDLED_EXCEPTIONS + //#define JUCE_CATCH_UNHANDLED_EXCEPTIONS +#endif + +#ifndef JUCE_ALLOW_STATIC_NULL_VARIABLES + //#define JUCE_ALLOW_STATIC_NULL_VARIABLES +#endif + //============================================================================== // juce_graphics flags: