Merge remote-tracking branch 'upstream/master'

3 files changed, 31 insertions, 10 deletions

diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index 5703cbc546..22cee0527e 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -11,15 +11,17 @@ def get_name():
 
 def can_build():
 
-	if (sys.platform != "darwin"):
-		return False
+	if (sys.platform == "darwin" or os.environ.has_key("OSXCROSS_ROOT")):
+		return True
 
-	return True # osx enabled
+
+	return False
 
 def get_opts():
 
 	return [
 	    ('force_64_bits','Force 64 bits binary','no'),
+	    ('osxcross_sdk','OSXCross SDK version','darwin14'),
 
 	 ]
 
@@ -59,12 +61,31 @@ def configure(env):
 		env.Append(CPPPATH=['#tools/freetype'])
 		env.Append(CPPPATH=['#tools/freetype/freetype/include'])
 
-	if (env["bits"]=="64"):
-		env.Append(CCFLAGS=['-arch', 'x86_64'])
-		env.Append(LINKFLAGS=['-arch', 'x86_64'])
+
+
+	if (not os.environ.has_key("OSXCROSS_ROOT")):
+		#regular native build
+		if (env["bits"]=="64"):
+		    env.Append(CCFLAGS=['-arch', 'x86_64'])
+		    env.Append(LINKFLAGS=['-arch', 'x86_64'])
+		else:
+		    env.Append(CCFLAGS=['-arch', 'i386'])
+		    env.Append(LINKFLAGS=['-arch', 'i386'])
 	else:
-		env.Append(CCFLAGS=['-arch', 'i386'])
-		env.Append(LINKFLAGS=['-arch', 'i386'])
+		#osxcross build
+		root=os.environ.get("OSXCROSS_ROOT",0)
+		if env["bits"]=="64":
+			basecmd=root+"/target/bin/x86_64-apple-"+env["osxcross_sdk"]+"-"
+		else:
+			basecmd=root+"/target/bin/i386-apple-"+env["osxcross_sdk"]+"-"
+
+
+		env['CC'] = basecmd+"cc"
+		env['CXX'] = basecmd+"c++"
+		env['AR'] = basecmd+"ar"
+		env['RANLIB'] = basecmd+"ranlib"
+		env['AS'] = basecmd+"as"
+
 
 #	env.Append(CPPPATH=['#platform/osx/include/freetype2', '#platform/osx/include'])
 #	env.Append(LIBPATH=['#platform/osx/lib'])
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h
index 144037b1cb..869997f190 100644
--- a/platform/osx/os_osx.h
+++ b/platform/osx/os_osx.h
@@ -170,7 +170,7 @@ public:
 	virtual int get_screen_count() const;
 	virtual int get_current_screen() const;
 	virtual void set_current_screen(int p_screen);
-	virtual Point2 get_screen_position(int p_screen=0);
+	virtual Point2 get_screen_position(int p_screen=0) const;
 	virtual Point2 get_window_position() const;
 	virtual void set_window_position(const Point2& p_position);
 	virtual void set_window_size(const Size2 p_size);
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index 72699366c4..abfe42beda 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -1279,7 +1279,7 @@ void OS_OSX::set_current_screen(int p_screen) {
 	current_screen = p_screen;
 };
 
-Point2 OS_OSX::get_screen_position(int p_screen) {
+Point2 OS_OSX::get_screen_position(int p_screen) const {
 
 	ERR_FAIL_INDEX_V(p_screen, screens.size(), Point2());
 	return screens[p_screen].pos;