3 files changed, 12 insertions, 23 deletions
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index 9191f1aabc..ccd86177ab 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -80,10 +80,12 @@ def configure(env):
 
     env.Append(CPPFLAGS=["-DAPPLE_STYLE_KEYS"])
     env.Append(CPPFLAGS=['-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DOSX_ENABLED'])
+    env.Append(CPPFLAGS=["-mmacosx-version-min=10.9"])
     env.Append(LIBS=['pthread'])
     #env.Append(CPPFLAGS=['-F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks', '-isysroot', '/Developer/SDKs/MacOSX10.4u.sdk', '-mmacosx-version-min=10.4'])
     #env.Append(LINKFLAGS=['-mmacosx-version-min=10.4', '-isysroot', '/Developer/SDKs/MacOSX10.4u.sdk', '-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk'])
     env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-framework', 'OpenGL', '-framework', 'AGL', '-framework', 'AudioUnit', '-lz', '-framework', 'IOKit', '-framework', 'ForceFeedback'])
+    env.Append(LINKFLAGS=["-mmacosx-version-min=10.9"])
 
     if (env["CXX"] == "clang++"):
         env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 3987044d80..04afe63e64 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -1329,10 +1329,18 @@ void OS_Windows::vprint(const char* p_format, va_list p_list, bool p_stderr) {
 	MultiByteToWideChar(CP_UTF8,0,buf,len,wbuf,wlen);
 	wbuf[wlen]=0;
 
+// Recent MinGW and MSVC compilers seem to disagree on the case here
+#ifdef __MINGW32__
 	if (p_stderr)
-		fwprintf(stderr,L"%s",wbuf);
+		fwprintf(stderr, L"%S", wbuf);
 	else
-		wprintf(L"%s",wbuf);
+		wprintf(L"%S", wbuf);
+#else  // MSVC
+	if (p_stderr)
+		fwprintf(stderr, L"%s", wbuf);
+	else
+		wprintf(L"%s", wbuf);
+#endif
 
 #ifdef STDOUT_FILE
 	//vwfprintf(stdo,p_format,p_list);
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index 65f546e2ee..0172dca4c4 100755..100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -880,9 +880,6 @@ bool OS_X11::is_window_minimized() const {
 }
 
 void OS_X11::set_window_maximized(bool p_enabled) {
-
-	if (is_window_maximized() == p_enabled) return;
-
 	// Using EWMH -- Extended Window Manager Hints
 	XEvent xev;
 	Atom wm_state = XInternAtom(x11_display, "_NET_WM_STATE", False);
@@ -901,23 +898,6 @@ void OS_X11::set_window_maximized(bool p_enabled) {
 	XSendEvent(x11_display, DefaultRootWindow(x11_display), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev);
 
 	maximized = p_enabled;
-
-	//wait until the window has been resized and update video mode
-	while (true) {
-		XEvent ev;
-		XNextEvent(x11_display, &ev);
-		if (ev.type == ConfigureNotify) {
-			XConfigureEvent &xc = ev.xconfigure;
-			if (xc.send_event == 1 &&
-			   (xc.width == get_screen_size(get_current_screen()).width || (!p_enabled && xc.width < current_videomode.width))) {
-
-				current_videomode.width=xc.width;
-				current_videomode.height=xc.height;
-				break;
-			};
-		}
-	};
-
 }
 
 bool OS_X11::is_window_maximized() const {
@@ -2010,7 +1990,6 @@ OS_X11::OS_X11() {
 	AudioDriverManagerSW::add_driver(&driver_alsa);
 #endif
 
-	maximized = false;
 	minimized = false;
 	xim_style=0L;
 	mouse_mode=MOUSE_MODE_VISIBLE;