Browse Source

Fixed a few VS2008 build errors

tags/2021-05-28
hogliux 8 years ago
parent
commit
b5fb095696
4 changed files with 19 additions and 3 deletions
  1. +7
    -0
      modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp
  2. +2
    -0
      modules/juce_core/native/juce_BasicNativeHeaders.h
  3. +1
    -0
      modules/juce_core/system/juce_StandardHeader.h
  4. +9
    -3
      modules/juce_gui_basics/native/juce_win32_Windowing.cpp

+ 7
- 0
modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp View File

@@ -32,6 +32,13 @@
#define JUCE_VST3HEADERS_INCLUDE_HEADERS_ONLY 1
#endif
#if (_WIN32 || _WIN64)
// old VS2008 needs this to include the VST3 SDK
#ifndef nullptr
#define nullptr (0)
#endif
#endif
#include "../../juce_audio_processors/format_types/juce_VST3Headers.h"
#undef JUCE_VST3HEADERS_INCLUDE_HEADERS_ONLY


+ 2
- 0
modules/juce_core/native/juce_BasicNativeHeaders.h View File

@@ -78,6 +78,8 @@
#pragma warning (push, 0) // disable all warnings whilst including system headers
#endif
#define NOMINMAX
#define STRICT 1
#define WIN32_LEAN_AND_MEAN 1
#if JUCE_MINGW


+ 1
- 0
modules/juce_core/system/juce_StandardHeader.h View File

@@ -56,6 +56,7 @@
#include <iostream>
#include <functional>
#include <algorithm>
#include <limits>
//==============================================================================
#include "juce_CompilerSupport.h"


+ 9
- 3
modules/juce_gui_basics/native/juce_win32_Windowing.cpp View File

@@ -1304,11 +1304,12 @@ private:
case WM_NCMOUSEHOVER:
case WM_MOUSEHOVER:
case WM_TOUCH:
#ifdef WM_POINTERUPDATE
case WM_POINTERUPDATE:
case WM_POINTERDOWN:
case WM_POINTERUP:
#endif
return isHWNDBlockedByModalComponents (m.hwnd);
case WM_NCLBUTTONDOWN:
case WM_NCLBUTTONDBLCLK:
case WM_NCRBUTTONDOWN:
@@ -2035,6 +2036,7 @@ private:
return true;
}
#ifdef WM_POINTERUPDATE
TOUCHINPUT emulateTouchEventFromPointer (LPARAM lParam, WPARAM wParam)
{
TOUCHINPUT touchInput;
@@ -2045,6 +2047,7 @@ private:
return touchInput;
}
#endif
//==============================================================================
void sendModifierKeyChangeIfNeeded()
@@ -2535,16 +2538,19 @@ private:
return 1;
//==============================================================================
#ifdef WM_POINTERUPDATE
case WM_POINTERUPDATE: handleTouchInput (emulateTouchEventFromPointer (lParam, wParam), false, false); return 0;
case WM_POINTERDOWN: handleTouchInput (emulateTouchEventFromPointer (lParam, wParam), true, false); return 0;
case WM_POINTERUP: handleTouchInput (emulateTouchEventFromPointer (lParam, wParam), false, true); return 0;
#endif
case WM_MOUSEMOVE: doMouseMove (getPointFromLParam (lParam), false); return 0;
case WM_MOUSELEAVE: doMouseExit(); return 0;
case WM_POINTERDOWN: handleTouchInput (emulateTouchEventFromPointer (lParam, wParam), true, false); return 0;
case WM_LBUTTONDOWN:
case WM_MBUTTONDOWN:
case WM_RBUTTONDOWN: doMouseDown (getPointFromLParam (lParam), wParam); return 0;
case WM_POINTERUP: handleTouchInput (emulateTouchEventFromPointer (lParam, wParam), false, true); return 0;
case WM_LBUTTONUP:
case WM_MBUTTONUP:
case WM_RBUTTONUP: doMouseUp (getPointFromLParam (lParam), wParam); return 0;


Loading…
Cancel
Save