mirror of
https://github.com/cemu-project/Cemu.git
synced 2025-07-02 13:01:18 +12:00
Fix build using clang-cl on windows and improve driver detection (#129)
This commit is contained in:
parent
4ed18a65c3
commit
a54a3ec74e
8 changed files with 32 additions and 9 deletions
7
dependencies/DirectX_2010/XAudio2.h
vendored
7
dependencies/DirectX_2010/XAudio2.h
vendored
|
@ -48,10 +48,15 @@
|
|||
//DEFINE_CLSID(XAudio2_Debug, 47199894, 7cc2, 444d, 98, 73, ce, d2, 56, 2c, c6, 0e);
|
||||
|
||||
// XAudio 2.7 (June 2010 SDK)
|
||||
#ifdef __clang__
|
||||
class __declspec(uuid("5a508685-a254-4fba-9b82-9a24b00306af")) XAudio2; extern "C" const GUID CLSID_XAudio2;
|
||||
class __declspec(uuid("db05ea35-0329-4d4b-a53a-6dead03d3852")) XAudio2_Debug; extern "C" const GUID CLSID_XAudio2_Debug;
|
||||
struct __declspec(uuid("8bcf1f58-9fe7-4583-8ac6-e2adc465c8bb")) IXAudio2; extern "C" const GUID IID_IXAudio2;
|
||||
#else
|
||||
DEFINE_CLSID(XAudio2, 5a508685, a254, 4fba, 9b, 82, 9a, 24, b0, 03, 06, af);
|
||||
DEFINE_CLSID(XAudio2_Debug, db05ea35, 0329, 4d4b, a5, 3a, 6d, ea, d0, 3d, 38, 52);
|
||||
DEFINE_IID(IXAudio2, 8bcf1f58, 9fe7, 4583, 8a, c6, e2, ad, c4, 65, c8, bb);
|
||||
|
||||
#endif
|
||||
|
||||
// Ignore the rest of this header if only the GUID definitions were requested
|
||||
#ifndef GUID_DEFS_ONLY
|
||||
|
|
|
@ -40,6 +40,9 @@
|
|||
|
||||
#include <stdint.h>
|
||||
#include <immintrin.h>
|
||||
#if defined(_MSC_VER) && defined(__clang__)
|
||||
#include <intrin.h>
|
||||
#endif
|
||||
|
||||
#define CLIP_U8(x) CLIP3(0, UINT8_MAX, (x))
|
||||
#define CLIP_S8(x) CLIP3(INT8_MIN, INT8_MAX, (x))
|
||||
|
@ -71,7 +74,7 @@
|
|||
|
||||
/* For MSVC x64 */
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#if defined(_MSC_VER) && !defined(__clang__)
|
||||
|
||||
static inline int __builtin_clz(unsigned x)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue