Merge pull request #2590 from endrift/fix-freebsd-build

Fix FreeBSD

11 files changed, 36 insertions, 10 deletions

diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
index 925e3f1ed3..4709c011b2 100644
--- a/Source/Core/Common/FileUtil.cpp
+++ b/Source/Core/Common/FileUtil.cpp
@@ -42,7 +42,7 @@
 #define S_ISDIR(m)  (((m)&S_IFMT) == S_IFDIR)
 #endif
 
-#ifdef BSD4_4
+#if defined BSD4_4 || defined __FreeBSD__
 #define stat64 stat
 #define fstat64 fstat
 #endif
diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp
index 291a23ed1f..31ed7f9c8f 100644
--- a/Source/Core/Common/MemArena.cpp
+++ b/Source/Core/Common/MemArena.cpp
@@ -63,7 +63,7 @@ void MemArena::GrabSHMSegment(size_t size)
 #else
 	for (int i = 0; i < 10000; i++)
 	{
-		std::string file_name = StringFromFormat("dolphinmem.%d", i);
+		std::string file_name = StringFromFormat("/dolphinmem.%d", i);
 		fd = shm_open(file_name.c_str(), O_RDWR | O_CREAT | O_EXCL, 0600);
 		if (fd != -1)
 		{
diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp
index 510b258b09..c2befe56a6 100644
--- a/Source/Core/Common/MemoryUtil.cpp
+++ b/Source/Core/Common/MemoryUtil.cpp
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <sys/mman.h>
 #include <sys/types.h>
-#ifdef __APPLE__
+#if defined __APPLE__ || defined __FreeBSD__
 #include <sys/sysctl.h>
 #else
 #include <sys/sysinfo.h>
@@ -256,11 +256,15 @@ size_t MemPhysical()
 	memInfo.dwLength = sizeof(MEMORYSTATUSEX);
 	GlobalMemoryStatusEx(&memInfo);
 	return memInfo.ullTotalPhys;
-#elif defined(__APPLE__)
+#elif defined __APPLE__ || defined __FreeBSD__
 	int mib[2];
 	size_t physical_memory;
 	mib[0] = CTL_HW;
+#ifdef __APPLE__
 	mib[1] = HW_MEMSIZE;
+#elif defined __FreeBSD__
+	mib[1] = HW_REALMEM;
+#endif
 	size_t length = sizeof(size_t);
 	sysctl(mib, 2, &physical_memory, &length, NULL, 0);
 	return physical_memory;
diff --git a/Source/Core/Common/Thread.cpp b/Source/Core/Common/Thread.cpp
index fb091ee2a7..1e60fbb29f 100644
--- a/Source/Core/Common/Thread.cpp
+++ b/Source/Core/Common/Thread.cpp
@@ -8,7 +8,7 @@
 
 #ifdef __APPLE__
 #include <mach/mach.h>
-#elif defined BSD4_4
+#elif defined BSD4_4 || defined __FreeBSD__
 #include <pthread_np.h>
 #endif
 
@@ -94,8 +94,12 @@ void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask)
 #ifdef __APPLE__
 	thread_policy_set(pthread_mach_thread_np(thread),
 		THREAD_AFFINITY_POLICY, (integer_t *)&mask, 1);
-#elif (defined __linux__ || defined BSD4_4) && !(defined ANDROID)
+#elif (defined __linux__ || defined BSD4_4 || defined __FreeBSD__) && !(defined ANDROID)
+#ifdef __FreeBSD__
+	cpuset_t cpu_set;
+#else
 	cpu_set_t cpu_set;
+#endif
 	CPU_ZERO(&cpu_set);
 
 	for (int i = 0; i != sizeof(mask) * 8; ++i)
@@ -125,6 +129,8 @@ void SetCurrentThreadName(const char* szThreadName)
 {
 #ifdef __APPLE__
 	pthread_setname_np(szThreadName);
+#elif defined __FreeBSD__
+	pthread_set_name_np(pthread_self(), szThreadName);
 #else
 	pthread_setname_np(pthread_self(), szThreadName);
 #endif
diff --git a/Source/Core/Core/HW/EXI_DeviceEthernet.h b/Source/Core/Core/HW/EXI_DeviceEthernet.h
index db5e92bc43..465bf40893 100644
--- a/Source/Core/Core/HW/EXI_DeviceEthernet.h
+++ b/Source/Core/Core/HW/EXI_DeviceEthernet.h
@@ -327,7 +327,7 @@ public:
 	DWORD mMtu;
 	OVERLAPPED mReadOverlapped;
 	static VOID CALLBACK ReadWaitCallback(PVOID lpParameter, BOOLEAN TimerFired);
-#elif defined(__linux__) || defined(__APPLE__)
+#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
 	int fd;
 	std::thread readThread;
 	std::atomic<bool> readEnabled;
diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.h b/Source/Core/Core/IPC_HLE/WII_Socket.h
index a38d1bb60d..edbb6ee60d 100644
--- a/Source/Core/Core/IPC_HLE/WII_Socket.h
+++ b/Source/Core/Core/IPC_HLE/WII_Socket.h
@@ -15,7 +15,7 @@ typedef pollfd pollfd_t;
 #define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x))
 #define FREE(x) HeapFree(GetProcessHeap(), 0, (x))
 
-#elif defined(__linux__) or defined(__APPLE__)
+#elif defined(__linux__) or defined(__APPLE__) or defined(__FreeBSD__)
 #include <netdb.h>
 #include <arpa/inet.h>
 #include <sys/types.h>
diff --git a/Source/Core/Core/MemTools.cpp b/Source/Core/Core/MemTools.cpp
index e028b40faa..2c1f688d5b 100644
--- a/Source/Core/Core/MemTools.cpp
+++ b/Source/Core/Core/MemTools.cpp
@@ -18,6 +18,9 @@
 #ifndef _M_GENERIC
 #include "Core/PowerPC/JitCommon/JitBase.h"
 #endif
+#ifdef __FreeBSD__
+#include <signal.h>
+#endif
 
 namespace EMM
 {
@@ -256,7 +259,11 @@ static void sigsegv_handler(int sig, siginfo_t *info, void *raw_context)
 void InstallExceptionHandler()
 {
 	stack_t signal_stack;
+#ifdef __FreeBSD__
+	signal_stack.ss_sp = (char*)malloc(SIGSTKSZ);
+#else
 	signal_stack.ss_sp = malloc(SIGSTKSZ);
+#endif
 	signal_stack.ss_size = SIGSTKSZ;
 	signal_stack.ss_flags = 0;
 	if (sigaltstack(&signal_stack, nullptr))
diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index f378716dd2..d9cdb9bd9b 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -64,7 +64,11 @@ if(USE_X11)
 	set(NOGUI_SRCS ${NOGUI_SRCS} X11Utils.cpp)
 endif()
 
-set(WXLIBS ${wxWidgets_LIBRARIES} dl)
+set(WXLIBS ${wxWidgets_LIBRARIES})
+
+if(NOT CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+	set(WXLIBS ${WXLIBS} dl)
+endif()
 
 list(APPEND LIBS core uicommon)
 
diff --git a/Source/Core/VideoBackends/OGL/CMakeLists.txt b/Source/Core/VideoBackends/OGL/CMakeLists.txt
index 85964a3185..b4ece69de1 100644
--- a/Source/Core/VideoBackends/OGL/CMakeLists.txt
+++ b/Source/Core/VideoBackends/OGL/CMakeLists.txt
@@ -45,8 +45,10 @@ set(LIBS	${LIBS}
 			videocommon
 			SOIL
 			common
-			dl
 			${X11_LIBRARIES})
+if(NOT CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+	set(LIBS ${LIBS} dl)
+endif()
 if(USE_EGL)
 	set(LIBS ${LIBS} EGL)
 endif()
diff --git a/Source/Core/VideoCommon/DriverDetails.cpp b/Source/Core/VideoCommon/DriverDetails.cpp
index aa2e34d184..d3b1883cb3 100644
--- a/Source/Core/VideoCommon/DriverDetails.cpp
+++ b/Source/Core/VideoCommon/DriverDetails.cpp
@@ -30,6 +30,8 @@ namespace DriverDetails
 	const u32 m_os = OS_ALL | OS_OSX;
 #elif __linux__
 	const u32 m_os = OS_ALL | OS_LINUX;
+#elif __FreeBSD__
+	const u32 m_os = OS_ALL | OS_FREEBSD;
 #endif
 
 	static Vendor m_vendor = VENDOR_UNKNOWN;
diff --git a/Source/Core/VideoCommon/DriverDetails.h b/Source/Core/VideoCommon/DriverDetails.h
index 86fc2b04b6..cdc5026dc2 100644
--- a/Source/Core/VideoCommon/DriverDetails.h
+++ b/Source/Core/VideoCommon/DriverDetails.h
@@ -14,6 +14,7 @@ namespace DriverDetails
 		OS_LINUX   = (1 << 2),
 		OS_OSX     = (1 << 3),
 		OS_ANDROID = (1 << 4),
+		OS_FREEBSD = (1 << 5),
 	};
 	// Enum of known vendors
 	// Tegra and Nvidia are separated out due to such substantial differences