untested fix for compiling waves audiobackend on case-sensitive FS with mingw.

This commit is contained in:
Robin Gareus 2014-10-01 04:02:30 +02:00
parent d75d6a833a
commit cd60fd9dfe
16 changed files with 20 additions and 10 deletions

View file

@ -9,6 +9,10 @@
#include "BasicTypes/WUMathConsts.h" #include "BasicTypes/WUMathConsts.h"
#include "WavesPublicAPI/wstdint.h" #include "WavesPublicAPI/wstdint.h"
#ifdef __GNUC__
#undef round
#endif
// New accelerated templates // New accelerated templates
#if defined ( __cplusplus ) && !defined (__WUMinMax) #if defined ( __cplusplus ) && !defined (__WUMinMax)
#define __WUMinMax // Also defined in Nativepr.h #define __WUMinMax // Also defined in Nativepr.h
@ -30,12 +34,18 @@ template<class T> inline T WUMinMax(const T &Smallest, const T &Biggest, const T
} }
*/ */
// Absolute value // Absolute value
#ifdef PLATFORM_WINDOWS #ifdef PLATFORM_WINDOWS
#include <math.h> #include <math.h>
#ifndef __GNUC__
#define __abs(x) abs(x) #define __abs(x) abs(x)
#define __labs(x) labs(x) #define __labs(x) labs(x)
#define __fabs(x) fabs(x) #define __fabs(x) fabs(x)
#endif #endif
#endif
#ifdef __GNUC__ #ifdef __GNUC__
#include <iostream> // why don't know makes it work need to check #include <iostream> // why don't know makes it work need to check
#include <cstdlib> #include <cstdlib>

View file

@ -20,7 +20,7 @@
#endif #endif
#if (defined (PLATFORM_WINDOWS) || defined(WIN32) || defined(WIN64)) #if (defined (PLATFORM_WINDOWS) || defined(WIN32) || defined(WIN64))
#if (_MSC_VER > 1600) || defined(__MINGW64__) #if (_MSC_VER > 1600) || defined(__MINGW64__) || defined(__MINGW32__)
// Taken from MSDN official page: // Taken from MSDN official page:
// In Visual Studio 2010 _MSC_VER is defined as 1600, In Visual Studio 2012 _MSC_VER is defined as 1700. // In Visual Studio 2010 _MSC_VER is defined as 1600, In Visual Studio 2012 _MSC_VER is defined as 1700.
#include <stdint.h> #include <stdint.h>

View file

@ -23,8 +23,8 @@
#define NOMINMAX // DO NOT REMOVE NOMINMAX - DOING SO CAUSES CONFLICTS WITH STD INCLUDES (<limits> ...) #define NOMINMAX // DO NOT REMOVE NOMINMAX - DOING SO CAUSES CONFLICTS WITH STD INCLUDES (<limits> ...)
#endif #endif
#include <WinSock2.h> #include <winsock2.h>
#include <Windows.h> #include <windows.h>
#include <objbase.h> #include <objbase.h>
#endif // #if PLATFORM_WINDOWS #endif // #if PLATFORM_WINDOWS
#endif // #ifndef __IncludeWindows_h__ #endif // #ifndef __IncludeWindows_h__

View file

@ -16,7 +16,7 @@
#include <list> #include <list>
using namespace wvNS; using namespace wvNS;
#include "IncludeWindows.h" #include "IncludeWindows.h"
#include <MMSystem.h> #include <mmsystem.h>
#include "pa_asio.h" #include "pa_asio.h"
#include "asio.h" #include "asio.h"

View file

@ -52,14 +52,14 @@ def build(bld):
'wavesapi/refmanager/WCRefManager.cpp', 'wavesapi/refmanager/WCRefManager.cpp',
'wavesapi/devicemanager/WCMRAudioDeviceManager.cpp', 'wavesapi/devicemanager/WCMRAudioDeviceManager.cpp',
'wavesapi/devicemanager/WCMRNativeAudio.cpp', 'wavesapi/devicemanager/WCMRNativeAudio.cpp',
'wavesapi/threads/WCThreadSafe.cpp', 'wavesapi/Threads/WCThreadSafe.cpp',
'portmidi/src/pm_common/pmutil.c', 'portmidi/src/pm_common/pmutil.c',
'portmidi/src/pm_common/portmidi.c' 'portmidi/src/pm_common/portmidi.c'
] ]
if bld.env['build_target'] == 'mingw': if bld.env['build_target'] == 'mingw':
platform_dependent = [ platform_dependent = [
'wavesapi/miscutils/UMicroseconds.cpp', 'wavesapi/MiscUtils/UMicroseconds.cpp',
'wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp', 'wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp',
'portmidi/src/pm_win/pmwin.c', 'portmidi/src/pm_win/pmwin.c',
'portmidi/src/pm_win/pmwinmm.c', 'portmidi/src/pm_win/pmwinmm.c',
@ -80,10 +80,10 @@ def build(bld):
obj.includes = ['.', obj.includes = ['.',
'wavesapi', 'wavesapi',
'wavesapi/refmanager', 'wavesapi/refmanager',
'wavesapi/wavespublicapi', 'wavesapi/WavesPublicAPI',
'wavesapi/devicemanager', 'wavesapi/devicemanager',
'wavesapi/miscutils', 'wavesapi/MiscUtils',
'wavesapi/threads', 'wavesapi/Threads',
'portmidi', 'portmidi',
'portmidi/src/pm_common' 'portmidi/src/pm_common'
] ]

View file

@ -31,7 +31,7 @@ def backend_list():
else: else:
backends = [ ] backends = [ ]
if sys.platform == 'darwin' or sys.platform == 'mingw' or sys.platform == 'msvc' or Options.options.dist_target == 'mingw': if sys.platform == 'darwin' or sys.platform == 'mingw' or sys.platform == 'msvc': # or Options.options.dist_target == 'mingw':
backends += [ 'wavesaudio' ] backends += [ 'wavesaudio' ]
return backends return backends