diff options
author | Robin Gareus <robin@gareus.org> | 2014-10-01 04:02:30 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2014-10-01 04:02:30 +0200 |
commit | cd60fd9dfe28d91de9b4b4f261347f25a06c7720 (patch) | |
tree | 27cb3c6a9440238c9c08f3d0f833c5a7d941efb2 | |
parent | d75d6a833afd8f876355dcd851fc7d00e9c1c6af (diff) |
untested fix for compiling waves audiobackend on case-sensitive FS with mingw.
-rw-r--r-- | libs/backends/wavesaudio/wavesapi/MiscUtils/MinMaxUtilities.h (renamed from libs/backends/wavesaudio/wavesapi/miscutils/MinMaxUtilities.h) | 10 | ||||
-rw-r--r-- | libs/backends/wavesaudio/wavesapi/MiscUtils/UMicroseconds.cpp (renamed from libs/backends/wavesaudio/wavesapi/miscutils/UMicroseconds.cpp) | 0 | ||||
-rw-r--r-- | libs/backends/wavesaudio/wavesapi/MiscUtils/UMicroseconds.h (renamed from libs/backends/wavesaudio/wavesapi/miscutils/UMicroseconds.h) | 0 | ||||
-rw-r--r-- | libs/backends/wavesaudio/wavesapi/MiscUtils/WCFixedString.h (renamed from libs/backends/wavesaudio/wavesapi/miscutils/WCFixedString.h) | 0 | ||||
-rw-r--r-- | libs/backends/wavesaudio/wavesapi/MiscUtils/WUErrors.h (renamed from libs/backends/wavesaudio/wavesapi/miscutils/WUErrors.h) | 0 | ||||
-rw-r--r-- | libs/backends/wavesaudio/wavesapi/MiscUtils/pthread_utils.h (renamed from libs/backends/wavesaudio/wavesapi/miscutils/pthread_utils.h) | 0 | ||||
-rw-r--r-- | libs/backends/wavesaudio/wavesapi/MiscUtils/safe_delete.h (renamed from libs/backends/wavesaudio/wavesapi/miscutils/safe_delete.h) | 0 | ||||
-rw-r--r-- | libs/backends/wavesaudio/wavesapi/Threads/WCThreadSafe.cpp (renamed from libs/backends/wavesaudio/wavesapi/threads/WCThreadSafe.cpp) | 0 | ||||
-rw-r--r-- | libs/backends/wavesaudio/wavesapi/Threads/WCThreadSafe.h (renamed from libs/backends/wavesaudio/wavesapi/threads/WCThreadSafe.h) | 0 | ||||
-rw-r--r-- | libs/backends/wavesaudio/wavesapi/WavesPublicAPI/1.0/WavesPublicAPI_Defines.h (renamed from libs/backends/wavesaudio/wavesapi/wavespublicapi/1.0/WavesPublicAPI_Defines.h) | 0 | ||||
-rw-r--r-- | libs/backends/wavesaudio/wavesapi/WavesPublicAPI/WTErr.h (renamed from libs/backends/wavesaudio/wavesapi/wavespublicapi/WTErr.h) | 0 | ||||
-rw-r--r-- | libs/backends/wavesaudio/wavesapi/WavesPublicAPI/wstdint.h (renamed from libs/backends/wavesaudio/wavesapi/wavespublicapi/wstdint.h) | 2 | ||||
-rw-r--r-- | libs/backends/wavesaudio/wavesapi/devicemanager/IncludeWindows.h | 4 | ||||
-rw-r--r-- | libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp | 2 | ||||
-rw-r--r-- | libs/backends/wavesaudio/wscript | 10 | ||||
-rw-r--r-- | libs/backends/wscript | 2 |
16 files changed, 20 insertions, 10 deletions
diff --git a/libs/backends/wavesaudio/wavesapi/miscutils/MinMaxUtilities.h b/libs/backends/wavesaudio/wavesapi/MiscUtils/MinMaxUtilities.h index 560e274ae3..d6a86ff93e 100644 --- a/libs/backends/wavesaudio/wavesapi/miscutils/MinMaxUtilities.h +++ b/libs/backends/wavesaudio/wavesapi/MiscUtils/MinMaxUtilities.h @@ -9,6 +9,10 @@ #include "BasicTypes/WUMathConsts.h" #include "WavesPublicAPI/wstdint.h" +#ifdef __GNUC__ +#undef round +#endif + // New accelerated templates #if defined ( __cplusplus ) && !defined (__WUMinMax) #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 + #ifdef PLATFORM_WINDOWS #include <math.h> + +#ifndef __GNUC__ #define __abs(x) abs(x) #define __labs(x) labs(x) #define __fabs(x) fabs(x) #endif + +#endif + #ifdef __GNUC__ #include <iostream> // why don't know makes it work need to check #include <cstdlib> diff --git a/libs/backends/wavesaudio/wavesapi/miscutils/UMicroseconds.cpp b/libs/backends/wavesaudio/wavesapi/MiscUtils/UMicroseconds.cpp index 5e3d2b4da8..5e3d2b4da8 100644 --- a/libs/backends/wavesaudio/wavesapi/miscutils/UMicroseconds.cpp +++ b/libs/backends/wavesaudio/wavesapi/MiscUtils/UMicroseconds.cpp diff --git a/libs/backends/wavesaudio/wavesapi/miscutils/UMicroseconds.h b/libs/backends/wavesaudio/wavesapi/MiscUtils/UMicroseconds.h index 45f7794d8f..45f7794d8f 100644 --- a/libs/backends/wavesaudio/wavesapi/miscutils/UMicroseconds.h +++ b/libs/backends/wavesaudio/wavesapi/MiscUtils/UMicroseconds.h diff --git a/libs/backends/wavesaudio/wavesapi/miscutils/WCFixedString.h b/libs/backends/wavesaudio/wavesapi/MiscUtils/WCFixedString.h index 681cea2547..681cea2547 100644 --- a/libs/backends/wavesaudio/wavesapi/miscutils/WCFixedString.h +++ b/libs/backends/wavesaudio/wavesapi/MiscUtils/WCFixedString.h diff --git a/libs/backends/wavesaudio/wavesapi/miscutils/WUErrors.h b/libs/backends/wavesaudio/wavesapi/MiscUtils/WUErrors.h index f0080e4019..f0080e4019 100644 --- a/libs/backends/wavesaudio/wavesapi/miscutils/WUErrors.h +++ b/libs/backends/wavesaudio/wavesapi/MiscUtils/WUErrors.h diff --git a/libs/backends/wavesaudio/wavesapi/miscutils/pthread_utils.h b/libs/backends/wavesaudio/wavesapi/MiscUtils/pthread_utils.h index e5202ece7e..e5202ece7e 100644 --- a/libs/backends/wavesaudio/wavesapi/miscutils/pthread_utils.h +++ b/libs/backends/wavesaudio/wavesapi/MiscUtils/pthread_utils.h diff --git a/libs/backends/wavesaudio/wavesapi/miscutils/safe_delete.h b/libs/backends/wavesaudio/wavesapi/MiscUtils/safe_delete.h index 30976224c1..30976224c1 100644 --- a/libs/backends/wavesaudio/wavesapi/miscutils/safe_delete.h +++ b/libs/backends/wavesaudio/wavesapi/MiscUtils/safe_delete.h diff --git a/libs/backends/wavesaudio/wavesapi/threads/WCThreadSafe.cpp b/libs/backends/wavesaudio/wavesapi/Threads/WCThreadSafe.cpp index 32e099b518..32e099b518 100644 --- a/libs/backends/wavesaudio/wavesapi/threads/WCThreadSafe.cpp +++ b/libs/backends/wavesaudio/wavesapi/Threads/WCThreadSafe.cpp diff --git a/libs/backends/wavesaudio/wavesapi/threads/WCThreadSafe.h b/libs/backends/wavesaudio/wavesapi/Threads/WCThreadSafe.h index 71fc1b7943..71fc1b7943 100644 --- a/libs/backends/wavesaudio/wavesapi/threads/WCThreadSafe.h +++ b/libs/backends/wavesaudio/wavesapi/Threads/WCThreadSafe.h diff --git a/libs/backends/wavesaudio/wavesapi/wavespublicapi/1.0/WavesPublicAPI_Defines.h b/libs/backends/wavesaudio/wavesapi/WavesPublicAPI/1.0/WavesPublicAPI_Defines.h index 92c935adba..92c935adba 100644 --- a/libs/backends/wavesaudio/wavesapi/wavespublicapi/1.0/WavesPublicAPI_Defines.h +++ b/libs/backends/wavesaudio/wavesapi/WavesPublicAPI/1.0/WavesPublicAPI_Defines.h diff --git a/libs/backends/wavesaudio/wavesapi/wavespublicapi/WTErr.h b/libs/backends/wavesaudio/wavesapi/WavesPublicAPI/WTErr.h index 9078d7666d..9078d7666d 100644 --- a/libs/backends/wavesaudio/wavesapi/wavespublicapi/WTErr.h +++ b/libs/backends/wavesaudio/wavesapi/WavesPublicAPI/WTErr.h diff --git a/libs/backends/wavesaudio/wavesapi/wavespublicapi/wstdint.h b/libs/backends/wavesaudio/wavesapi/WavesPublicAPI/wstdint.h index 0daebdaed0..e00f889404 100644 --- a/libs/backends/wavesaudio/wavesapi/wavespublicapi/wstdint.h +++ b/libs/backends/wavesaudio/wavesapi/WavesPublicAPI/wstdint.h @@ -20,7 +20,7 @@ #endif #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: // In Visual Studio 2010 _MSC_VER is defined as 1600, In Visual Studio 2012 _MSC_VER is defined as 1700. #include <stdint.h> diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/IncludeWindows.h b/libs/backends/wavesaudio/wavesapi/devicemanager/IncludeWindows.h index 31158a7fe0..2b5dc5b7aa 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/IncludeWindows.h +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/IncludeWindows.h @@ -23,8 +23,8 @@ #define NOMINMAX // DO NOT REMOVE NOMINMAX - DOING SO CAUSES CONFLICTS WITH STD INCLUDES (<limits> ...) #endif -#include <WinSock2.h> -#include <Windows.h> +#include <winsock2.h> +#include <windows.h> #include <objbase.h> #endif // #if PLATFORM_WINDOWS #endif // #ifndef __IncludeWindows_h__ diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp index 1c7149f78a..69b677b025 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp @@ -16,7 +16,7 @@ #include <list> using namespace wvNS; #include "IncludeWindows.h" -#include <MMSystem.h> +#include <mmsystem.h> #include "pa_asio.h" #include "asio.h" diff --git a/libs/backends/wavesaudio/wscript b/libs/backends/wavesaudio/wscript index c1ff717d10..f083128e84 100644 --- a/libs/backends/wavesaudio/wscript +++ b/libs/backends/wavesaudio/wscript @@ -52,14 +52,14 @@ def build(bld): 'wavesapi/refmanager/WCRefManager.cpp', 'wavesapi/devicemanager/WCMRAudioDeviceManager.cpp', 'wavesapi/devicemanager/WCMRNativeAudio.cpp', - 'wavesapi/threads/WCThreadSafe.cpp', + 'wavesapi/Threads/WCThreadSafe.cpp', 'portmidi/src/pm_common/pmutil.c', 'portmidi/src/pm_common/portmidi.c' ] if bld.env['build_target'] == 'mingw': platform_dependent = [ - 'wavesapi/miscutils/UMicroseconds.cpp', + 'wavesapi/MiscUtils/UMicroseconds.cpp', 'wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp', 'portmidi/src/pm_win/pmwin.c', 'portmidi/src/pm_win/pmwinmm.c', @@ -80,10 +80,10 @@ def build(bld): obj.includes = ['.', 'wavesapi', 'wavesapi/refmanager', - 'wavesapi/wavespublicapi', + 'wavesapi/WavesPublicAPI', 'wavesapi/devicemanager', - 'wavesapi/miscutils', - 'wavesapi/threads', + 'wavesapi/MiscUtils', + 'wavesapi/Threads', 'portmidi', 'portmidi/src/pm_common' ] diff --git a/libs/backends/wscript b/libs/backends/wscript index a8629253f5..7923a34c94 100644 --- a/libs/backends/wscript +++ b/libs/backends/wscript @@ -31,7 +31,7 @@ def backend_list(): else: 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' ] return backends |