From 557b4f99aca72a4dff73d1737b947e8cb75bf496 Mon Sep 17 00:00:00 2001 From: jules Date: Mon, 25 Jun 2012 18:26:38 +0100 Subject: [PATCH] Fix for START_JUCE_APPLICATION when windows.h has been included. --- .../application/juce_Initialisation.h | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/modules/juce_gui_basics/application/juce_Initialisation.h b/modules/juce_gui_basics/application/juce_Initialisation.h index 6819f76ea5..985af39c68 100644 --- a/modules/juce_gui_basics/application/juce_Initialisation.h +++ b/modules/juce_gui_basics/application/juce_Initialisation.h @@ -89,14 +89,23 @@ public: #define START_JUCE_APPLICATION(AppClass) \ juce::JUCEApplication* juce_CreateApplication() { return new AppClass(); } +#elif JUCE_WINDOWS && defined (WINAPI) + #define START_JUCE_APPLICATION(AppClass) \ + static juce::JUCEApplicationBase* juce_CreateApplication() { return new AppClass(); } \ + int WINAPI WinMain (HINSTANCE, HINSTANCE, LPSTR, int) \ + { \ + juce::JUCEApplication::createInstance = &juce_CreateApplication; \ + return juce::JUCEApplication::main(); \ + } + #elif JUCE_WINDOWS #define START_JUCE_APPLICATION(AppClass) \ - static juce::JUCEApplicationBase* juce_CreateApplication() { return new AppClass(); } \ - int __stdcall WinMain (void*, void*, const char*, int) \ - { \ - juce::JUCEApplication::createInstance = &juce_CreateApplication; \ - return juce::JUCEApplication::main(); \ - } + static juce::JUCEApplicationBase* juce_CreateApplication() { return new AppClass(); } \ + int __stdcall WinMain (void*, void*, const char*, int) \ + { \ + juce::JUCEApplication::createInstance = &juce_CreateApplication; \ + return juce::JUCEApplication::main(); \ + } #else #define START_JUCE_APPLICATION(AppClass) \