diff options
| author | victorfisac <[email protected]> | 2016-07-05 11:57:05 +0200 |
|---|---|---|
| committer | victorfisac <[email protected]> | 2016-07-05 11:57:05 +0200 |
| commit | 1aecd5be072083e27e4289499865b5681f1ea656 (patch) | |
| tree | 808159aa95df9b2be5509d83791aa6cad4ddf6b8 /src/external/OculusSDK/LibOVR/Include/OVR_CAPI_Audio.h | |
| parent | 1b0996fb0bcf68e2a14bc6260c6f2c5366ab033f (diff) | |
| parent | 2ff2096b36d80078cbda5e61ff77d7fedeeeaeb5 (diff) | |
| download | raylib-1aecd5be072083e27e4289499865b5681f1ea656.tar.gz raylib-1aecd5be072083e27e4289499865b5681f1ea656.zip | |
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'src/external/OculusSDK/LibOVR/Include/OVR_CAPI_Audio.h')
| -rw-r--r-- | src/external/OculusSDK/LibOVR/Include/OVR_CAPI_Audio.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/external/OculusSDK/LibOVR/Include/OVR_CAPI_Audio.h b/src/external/OculusSDK/LibOVR/Include/OVR_CAPI_Audio.h index c5344813..930dfcbe 100644 --- a/src/external/OculusSDK/LibOVR/Include/OVR_CAPI_Audio.h +++ b/src/external/OculusSDK/LibOVR/Include/OVR_CAPI_Audio.h @@ -9,6 +9,10 @@ #define OVR_CAPI_Audio_h #ifdef _WIN32 +// Prevents <Windows.h> from defining min() and max() macro symbols. +#ifndef NOMINMAX +#define NOMINMAX +#endif #include <windows.h> #include "OVR_CAPI.h" #define OVR_AUDIO_MAX_DEVICE_STR_SIZE 128 |