Browse Source

Some mingw compatibility tweaks.

tags/2021-05-28
jules 13 years ago
parent
commit
2451b3762c
3 changed files with 8 additions and 5 deletions
  1. +6
    -3
      modules/juce_core/juce_core.cpp
  2. +1
    -1
      modules/juce_core/native/juce_win32_Threads.cpp
  3. +1
    -1
      modules/juce_core/system/juce_SystemStats.cpp

+ 6
- 3
modules/juce_core/juce_core.cpp View File

@@ -52,10 +52,13 @@
#include <ctime>
#include <winsock2.h>
#include <ws2tcpip.h>
#include <Dbghelp.h>
#if ! JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
#pragma comment (lib, "DbgHelp.lib")
#if ! JUCE_MINGW
#include <Dbghelp.h>
#if ! JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
#pragma comment (lib, "DbgHelp.lib")
#endif
#endif
#if JUCE_MINGW


+ 1
- 1
modules/juce_core/native/juce_win32_Threads.cpp View File

@@ -608,7 +608,7 @@ struct HighResolutionTimer::Pimpl
const int actualPeriod = jlimit ((int) tc.wPeriodMin, (int) tc.wPeriodMax, newPeriod);
timerID = timeSetEvent (actualPeriod, tc.wPeriodMin, callbackFunction, (DWORD_PTR) this,
TIME_PERIODIC | TIME_CALLBACK_FUNCTION | TIME_KILL_SYNCHRONOUS);
TIME_PERIODIC | TIME_CALLBACK_FUNCTION | 0x100 /*TIME_KILL_SYNCHRONOUS*/);
}
}
}


+ 1
- 1
modules/juce_core/system/juce_SystemStats.cpp View File

@@ -70,7 +70,7 @@ String SystemStats::getStackBacktrace()
{
String result;
#if JUCE_ANDROID
#if JUCE_ANDROID || JUCE_MINGW
jassertfalse; // sorry, not implemented yet!
#elif JUCE_WINDOWS


Loading…
Cancel
Save