Browse Source

Reworked START_JUCE_APPLICATION to work on Windows if windows.h has been included after the juce headers.

tags/2021-05-28
jules 10 years ago
parent
commit
1d9161d55e
1 changed files with 4 additions and 10 deletions
  1. +4
    -10
      modules/juce_events/messages/juce_Initialisation.h

+ 4
- 10
modules/juce_events/messages/juce_Initialisation.h View File

@@ -93,17 +93,11 @@ public:
#else
#if JUCE_WINDOWS && ! defined (_CONSOLE)
#if defined (WINAPI) || defined (_WINDOWS_)
#define JUCE_MAIN_FUNCTION int __stdcall WinMain (HINSTANCE, HINSTANCE, const LPSTR, int)
#elif defined (_UNICODE)
#define JUCE_MAIN_FUNCTION int __stdcall WinMain (void*, void*, const wchar_t*, int)
#else
#define JUCE_MAIN_FUNCTION int __stdcall WinMain (void*, void*, const char*, int)
#endif
#define JUCE_MAIN_FUNCTION_ARGS
#define JUCE_MAIN_FUNCTION int __stdcall WinMain (struct HINSTANCE__*, struct HINSTANCE__*, char*, int)
#define JUCE_MAIN_FUNCTION_ARGS
#else
#define JUCE_MAIN_FUNCTION int main (int argc, char* argv[])
#define JUCE_MAIN_FUNCTION_ARGS argc, (const char**) argv
#define JUCE_MAIN_FUNCTION int main (int argc, char* argv[])
#define JUCE_MAIN_FUNCTION_ARGS argc, (const char**) argv
#endif
#define START_JUCE_APPLICATION(AppClass) \


Loading…
Cancel
Save