summaryrefslogtreecommitdiff
path: root/Source/Core/Common
diff options
context:
space:
mode:
authorMarkus Wick <degasus@users.noreply.github.com>2017-01-24 14:35:05 +0100
committerGitHub <noreply@github.com>2017-01-24 14:35:05 +0100
commit63f56ccd023af0ffeb7bac64e9c91b86760d5aa3 (patch)
tree91e66333eb3c2bdf50b37f06199b9901cd6c9110 /Source/Core/Common
parent221be63cb4b8615f3b889807cefb0d84a8211d61 (diff)
parent803ea7b14365c05b437dfb616c7c4cc1b891ba16 (diff)
Merge pull request #4741 from Orphis/cmake_cleanup
CMake cleanup
Diffstat (limited to 'Source/Core/Common')
-rw-r--r--Source/Core/Common/Common.h6
-rw-r--r--Source/Core/Common/x64CPUDetect.cpp2
2 files changed, 2 insertions, 6 deletions
diff --git a/Source/Core/Common/Common.h b/Source/Core/Common/Common.h
index a48203a874..ff9cea5104 100644
--- a/Source/Core/Common/Common.h
+++ b/Source/Core/Common/Common.h
@@ -37,12 +37,6 @@ extern const std::string scm_distributor_str;
// Memory leak checks
#define CHECK_HEAP_INTEGRITY()
-// Since they are always around on Windows
-#define HAVE_WX 1
-#define HAVE_OPENAL 1
-
-#define HAVE_PORTAUDIO 1
-
// Debug definitions
#if defined(_DEBUG)
#include <crtdbg.h>
diff --git a/Source/Core/Common/x64CPUDetect.cpp b/Source/Core/Common/x64CPUDetect.cpp
index b35a91b50e..5e655b1850 100644
--- a/Source/Core/Common/x64CPUDetect.cpp
+++ b/Source/Core/Common/x64CPUDetect.cpp
@@ -12,6 +12,8 @@
#ifndef _WIN32
#ifdef __FreeBSD__
+#include <unistd.h>
+
#include <machine/cpufunc.h>
#include <sys/types.h>
#endif