Merge branch 'master' of https://github.com/Marukyu/NecroEdit

Marukyu · May 5, 2016 · 88b2774 · 88b2774
2 parents 839f005 + bc9b448
commit 88b2774
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Client/Editor/SelectionPanel.cpp b/src/Client/Editor/SelectionPanel.cpp
@@ -9,6 +9,7 @@
 #include <Shared/Utils/Utilities.hpp>
 #include <algorithm>
 #include <memory>
+#include <cmath>
 
 namespace gui2
 {

diff --git a/src/Shared/Utils/OSDetect.hpp b/src/Shared/Utils/OSDetect.hpp
@@ -5,7 +5,7 @@
 		#define WOS_WINDOWS
 	#elif defined __linux__ || defined __linux || defined linux
 		#define WOS_LINUX
-	#elif defined __APPLE__ && TARGET_OS_MAC
+	#elif defined __APPLE__ || defined TARGET_OS_MAC
 		#define WOS_OSX
 	#else
 		#error Unsupported operating system.