diff options
| author | Sven Gothel <[email protected]> | 2015-07-16 02:46:59 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-07-16 02:46:59 +0200 |
| commit | eea4866ec9af301985d3eb2f648b8c95661fae2f (patch) | |
| tree | 3ef27761233f8cf8d06d5906ab9cfd66f9e0048b | |
| parent | 1f262ca2dbe00ba761e9b91994e93fee65d6efc1 (diff) | |
Fix build for Windows/MingW64 (32bit target)
| -rw-r--r-- | LibOVR/Src/Service/Service_Win32_FastIPC_Client.cpp | 6 | ||||
| -rw-r--r-- | LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/LibOVR/Src/Service/Service_Win32_FastIPC_Client.cpp b/LibOVR/Src/Service/Service_Win32_FastIPC_Client.cpp index 22a0b4a..2bb1ff8 100644 --- a/LibOVR/Src/Service/Service_Win32_FastIPC_Client.cpp +++ b/LibOVR/Src/Service/Service_Win32_FastIPC_Client.cpp @@ -26,6 +26,12 @@ limitations under the License. #include "Service_Win32_FastIPC_Client.h" +#if !defined(OVR_CC_MSVC) +// mingw64: add definition of MemoryBarrier() and _mm_mfence() .. and the like +#include <intrin.h> +#include <winnt.h> +#endif /* !defined(OVR_CC_MSVC) */ + namespace OVR { namespace Service { namespace Win32 { using namespace OVR::Net; diff --git a/LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp b/LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp index 736b734..97fc77c 100644 --- a/LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp +++ b/LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp @@ -35,6 +35,12 @@ limitations under the License. // For _beginthreadex / _endtheadex #include <process.h> +#if !defined(OVR_CC_MSVC) +// mingw64: add definition of MemoryBarrier() and _mm_mfence() .. and the like +#include <intrin.h> +#include <winnt.h> +#endif /* !defined(OVR_CC_MSVC) */ + namespace OVR { @@ -1148,4 +1154,4 @@ ThreadId GetCurrentThreadId() } // OVR -#endif +#endif /* OVR_ENABLE_THREADS */ |