Browse Source

Fix for START_JUCE_APPLICATION when windows.h has been included.

tags/2021-05-28
jules 13 years ago
parent
commit
557b4f99ac
1 changed files with 15 additions and 6 deletions
  1. +15
    -6
      modules/juce_gui_basics/application/juce_Initialisation.h

+ 15
- 6
modules/juce_gui_basics/application/juce_Initialisation.h View File

@@ -89,14 +89,23 @@ public:
#define START_JUCE_APPLICATION(AppClass) \ #define START_JUCE_APPLICATION(AppClass) \
juce::JUCEApplication* juce_CreateApplication() { return new 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 #elif JUCE_WINDOWS
#define START_JUCE_APPLICATION(AppClass) \ #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 #else
#define START_JUCE_APPLICATION(AppClass) \ #define START_JUCE_APPLICATION(AppClass) \


Loading…
Cancel
Save