diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py
index 7f357029..9c28ab75 100644
--- a/ext/toolchain/commands1.py
+++ b/ext/toolchain/commands1.py
@@ -430,14 +430,16 @@ class InternalCommands:
 		if generator.cmakeName.find('Unix Makefiles') != -1:
 			cmake_args += ' -DCMAKE_BUILD_TYPE=' + target.capitalize()
 			
-		elif sys.platform == "darwin":
+		if sys.platform == "darwin":
 			macSdkMatch = re.match("(\d+)\.(\d+)", self.macSdk)
 			if not macSdkMatch:
 				raise Exception("unknown osx version: " + self.macSdk)
 
-			sdkDir = self.getMacSdkDir()
-			cmake_args += " -DCMAKE_OSX_SYSROOT=" + sdkDir
-			cmake_args += " -DCMAKE_OSX_DEPLOYMENT_TARGET=" + self.macSdk
+			if generator.cmakeName.find('Unix Makefiles') == -1:
+				sdkDir = self.getMacSdkDir()
+				cmake_args += " -DCMAKE_OSX_SYSROOT=" + sdkDir
+				cmake_args += " -DCMAKE_OSX_DEPLOYMENT_TARGET=" + self.macSdk
+
 			cmake_args += " -DOSX_TARGET_MAJOR=" + macSdkMatch.group(1)
 			cmake_args += " -DOSX_TARGET_MINOR=" + macSdkMatch.group(2)
 		
@@ -551,6 +553,7 @@ class InternalCommands:
 		if os.path.exists(sdkPath):
 			return sdkPath
 
+		# return os.popen('xcodebuild -version -sdk macosx' + self.macSdk + ' Path').read().strip()
 		return "/Developer/SDKs/" + sdkDirName + ".sdk"
 	
 	# http://tinyurl.com/cs2rxxb
diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt
index 6c272c21..481d8ef9 100644
--- a/src/lib/platform/CMakeLists.txt
+++ b/src/lib/platform/CMakeLists.txt
@@ -19,7 +19,7 @@ if (WIN32)
 	file(GLOB sources "MSWindows*.cpp")
 elseif (APPLE)
 	file(GLOB headers "OSX*.h" "IOSX*.h")
-	file(GLOB sources "OSX*.cpp" "IOSX*.cpp" "OSX*.m")
+	file(GLOB sources "OSX*.cpp" "IOSX*.cpp" "OSX*.m" "OSX*.mm")
 elseif (UNIX)
 	file(GLOB headers "XWindows*.h")
 	file(GLOB sources "XWindows*.cpp")
diff --git a/src/lib/platform/OSXClipboard.cpp b/src/lib/platform/OSXClipboard.cpp
index 84f7c7ce..7dae2081 100644
--- a/src/lib/platform/OSXClipboard.cpp
+++ b/src/lib/platform/OSXClipboard.cpp
@@ -122,7 +122,7 @@ OSXClipboard::add(EFormat format, const String & data)
 
             PasteboardPutItemFlavor(
                 m_pboard,
-                (PasteboardItemID) 0,
+                nullptr,
                 flavorType,
                 dataRef,
                 kPasteboardFlavorNoFlags);
diff --git a/src/lib/platform/OSXScreen.h b/src/lib/platform/OSXScreen.h
index dce5ac08..0357583e 100644
--- a/src/lib/platform/OSXScreen.h
+++ b/src/lib/platform/OSXScreen.h
@@ -344,4 +344,6 @@ private:
 	Mutex*					m_carbonLoopMutex;
 	CondVar<bool>*			m_carbonLoopReady;
 #endif
+
+	class OSXScreenImpl*	m_impl;
 };
diff --git a/src/lib/platform/OSXScreen.cpp b/src/lib/platform/OSXScreen.mm
similarity index 99%
rename from src/lib/platform/OSXScreen.cpp
rename to src/lib/platform/OSXScreen.mm
index e81f1621..2c2e66d6 100644
--- a/src/lib/platform/OSXScreen.cpp
+++ b/src/lib/platform/OSXScreen.mm
@@ -45,6 +45,8 @@
 #include <AvailabilityMacros.h>
 #include <IOKit/hidsystem/event_status_driver.h>
 
+#import <appkit/NSEvent.h>
+
 // Set some enums for fast user switching if we're building with an SDK
 // from before such support was added.
 #if !defined(MAC_OS_X_VERSION_10_3) || \
@@ -112,7 +114,8 @@ OSXScreen::OSXScreen(IEventQueue* events, bool isPrimary, bool autoShowHideCurso
 	m_lastSingleClickYCursor(0),
 	m_autoShowHideCursor(autoShowHideCursor),
 	m_events(events),
-	m_getDropTargetThread(NULL)
+	m_getDropTargetThread(NULL),
+	m_impl(NULL)
 {
 	try {
 		m_displayID   = CGMainDisplayID();
@@ -526,9 +529,7 @@ OSXScreen::fakeMouseButton(ButtonID id, bool press)
 	// we define our own defaults.
 	const double maxDiff = sqrt(2) + 0.0001;
     
-    
-    NXEventHandle handle = NXOpenEventStatus();
-    double clickTime = NXClickTime(handle);
+    double clickTime = [NSEvent doubleClickInterval];
     
     // As long as the click is within the time window and distance window
     // increase clickState (double click, triple click, etc)