style: Start applying PEP8 to Python files, indentation issues

Done with `autopep8 --select=E1`, fixes:

- E101 - Reindent all lines.
- E112 - Fix under-indented comments.
- E113 - Fix over-indented comments.
- E115 - Fix under-indented comments.
- E116 - Fix over-indented comments.
- E121 - Fix a badly indented line.
- E122 - Fix a badly indented line.
- E123 - Fix a badly indented line.
- E124 - Fix a badly indented line.
- E125 - Fix indentation undistinguish from the next logical line.
- E126 - Fix a badly indented line.
- E127 - Fix a badly indented line.
- E128 - Fix a badly indented line.
- E129 - Fix a badly indented line.

20 files changed, 1264 insertions, 1264 deletions

diff --git a/platform/android/SCsub b/platform/android/SCsub
index 4f9a9709cb..9db6636f8b 100644
--- a/platform/android/SCsub
+++ b/platform/android/SCsub
@@ -6,20 +6,20 @@ Import('env')
 
 android_files = [
 
-	'os_android.cpp',
-	'godot_android.cpp',
-	'file_access_android.cpp',
-	'dir_access_android.cpp',
-	'audio_driver_opensl.cpp',
-	'file_access_jandroid.cpp',
-	'dir_access_jandroid.cpp',
-	'thread_jandroid.cpp',
-	'audio_driver_jandroid.cpp',
-	'ifaddrs_android.cpp',
-	'android_native_app_glue.c',
-	'java_glue.cpp',
-	'cpu-features.c',
-	'java_class_wrapper.cpp'
+    'os_android.cpp',
+    'godot_android.cpp',
+    'file_access_android.cpp',
+    'dir_access_android.cpp',
+    'audio_driver_opensl.cpp',
+    'file_access_jandroid.cpp',
+    'dir_access_jandroid.cpp',
+    'thread_jandroid.cpp',
+    'audio_driver_jandroid.cpp',
+    'ifaddrs_android.cpp',
+    'android_native_app_glue.c',
+    'java_glue.cpp',
+    'cpu-features.c',
+    'java_class_wrapper.cpp'
 ]
 
 #env.Depends('#core/math/vector3.h', 'vector3_psp.h')
@@ -28,11 +28,11 @@ android_files = [
 
 env_android = env.Clone()
 if env['target'] == "profile":
-	env_android.Append(CPPFLAGS=['-DPROFILER_ENABLED'])
+    env_android.Append(CPPFLAGS=['-DPROFILER_ENABLED'])
 
 android_objects=[]
 for x in android_files:
-	android_objects.append( env_android.SharedObject( x ) )
+    android_objects.append( env_android.SharedObject( x ) )
 
 prog = None
 
@@ -48,43 +48,43 @@ gradle_text = gradle_basein.read()
 gradle_maven_repos_text=""
 
 if len(env.android_maven_repos) > 0:
-	gradle_maven_repos_text+="maven {\n"
-	for x in env.android_maven_repos:
-		gradle_maven_repos_text+="\t\t"+x+"\n"
-	gradle_maven_repos_text+="\t}\n"
+    gradle_maven_repos_text+="maven {\n"
+    for x in env.android_maven_repos:
+        gradle_maven_repos_text+="\t\t"+x+"\n"
+    gradle_maven_repos_text+="\t}\n"
 
 gradle_maven_dependencies_text=""
 
 for x in env.android_dependencies:
-	gradle_maven_dependencies_text+=x+"\n"
+    gradle_maven_dependencies_text+=x+"\n"
 
 gradle_java_dirs_text=""
 
 for x in env.android_java_dirs:
-	gradle_java_dirs_text+=",'"+x.replace("\\","/")+"'"
+    gradle_java_dirs_text+=",'"+x.replace("\\","/")+"'"
 
 
 gradle_res_dirs_text=""
 
 for x in env.android_res_dirs:
-	gradle_res_dirs_text+=",'"+x.replace("\\","/")+"'"
+    gradle_res_dirs_text+=",'"+x.replace("\\","/")+"'"
 
 gradle_aidl_dirs_text=""
 
 for x in env.android_aidl_dirs:
-	gradle_aidl_dirs_text+=",'"+x.replace("\\","/")+"'"
+    gradle_aidl_dirs_text+=",'"+x.replace("\\","/")+"'"
 
 gradle_jni_dirs_text=""
 
 for x in env.android_jni_dirs:
-	gradle_jni_dirs_text+=",'"+x.replace("\\","/")+"'"
+    gradle_jni_dirs_text+=",'"+x.replace("\\","/")+"'"
 
 gradle_asset_dirs_text=""
 
 gradle_default_config_text=""
 
 for x in env.android_default_config:
-	gradle_default_config_text+=x+"\n\t\t"
+    gradle_default_config_text+=x+"\n\t\t"
 
 gradle_text = gradle_text.replace("$$GRADLE_REPOSITORY_URLS$$",gradle_maven_repos_text)
 gradle_text = gradle_text.replace("$$GRADLE_DEPENDENCIES$$",gradle_maven_dependencies_text)
@@ -114,19 +114,19 @@ env_android.SharedLibrary("#bin/libgodot",[android_objects],SHLIBSUFFIX=env["SHL
 
 lib_arch_dir = ''
 if env['android_arch'] == 'armv6':
-	lib_arch_dir = 'armeabi'
+    lib_arch_dir = 'armeabi'
 elif env['android_arch'] == 'armv7':
-	lib_arch_dir = 'armeabi-v7a'
+    lib_arch_dir = 'armeabi-v7a'
 elif env['android_arch'] == 'x86':
-	lib_arch_dir = 'x86'
+    lib_arch_dir = 'x86'
 else:
-	print 'WARN: Architecture not suitable for embedding into APK; keeping .so at \\bin'
+    print 'WARN: Architecture not suitable for embedding into APK; keeping .so at \\bin'
 
 if lib_arch_dir != '':
-	if env['target'] == 'release':
-		lib_type_dir = 'release'
-	else: # release_debug, debug
-		lib_type_dir = 'debug'
-		
-	out_dir = '#platform/android/java/libs/'+lib_type_dir+'/'+lib_arch_dir
-	env_android.Command(out_dir+'/libgodot_android.so', '#bin/libgodot'+env['SHLIBSUFFIX'], Move("$TARGET", "$SOURCE"))
+    if env['target'] == 'release':
+        lib_type_dir = 'release'
+    else: # release_debug, debug
+        lib_type_dir = 'debug'
+
+    out_dir = '#platform/android/java/libs/'+lib_type_dir+'/'+lib_arch_dir
+    env_android.Command(out_dir+'/libgodot_android.so', '#bin/libgodot'+env['SHLIBSUFFIX'], Move("$TARGET", "$SOURCE"))
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 842036f986..9a14452862 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -4,247 +4,247 @@ import string
 import platform
 
 def is_active():
-	return True
+    return True
 
 def get_name():
-	return "Android"
+    return "Android"
 
 def can_build():
 
-        import os
-        if (not os.environ.has_key("ANDROID_NDK_ROOT")):
-        	return False
+    import os
+    if (not os.environ.has_key("ANDROID_NDK_ROOT")):
+        return False
 
-	return True
+    return True
 
 def get_opts():
 
-	return [
-			('ANDROID_NDK_ROOT', 'the path to Android NDK', os.environ.get("ANDROID_NDK_ROOT", 0)),
-			('NDK_TARGET', 'toolchain to use for the NDK',os.environ.get("NDK_TARGET", "arm-linux-androideabi-4.9")),
-			('NDK_TARGET_X86', 'toolchain to use for the NDK x86',os.environ.get("NDK_TARGET_X86", "x86-4.9")),
-			('ndk_platform', 'compile for platform: (android-<api> , example: android-14)',"android-14"),
-			('android_arch', 'select compiler architecture: (armv7/armv6/x86)',"armv7"),
-			('android_neon','enable neon (armv7 only)',"yes"),
-			('android_stl','enable STL support in android port (for modules)',"no")
-	]
+    return [
+        ('ANDROID_NDK_ROOT', 'the path to Android NDK', os.environ.get("ANDROID_NDK_ROOT", 0)),
+        ('NDK_TARGET', 'toolchain to use for the NDK',os.environ.get("NDK_TARGET", "arm-linux-androideabi-4.9")),
+        ('NDK_TARGET_X86', 'toolchain to use for the NDK x86',os.environ.get("NDK_TARGET_X86", "x86-4.9")),
+        ('ndk_platform', 'compile for platform: (android-<api> , example: android-14)',"android-14"),
+        ('android_arch', 'select compiler architecture: (armv7/armv6/x86)',"armv7"),
+        ('android_neon','enable neon (armv7 only)',"yes"),
+        ('android_stl','enable STL support in android port (for modules)',"no")
+    ]
 
 
 def get_flags():
 
-	return [
-		('tools', 'no'),
-		('openssl', 'builtin'), #use builtin openssl
-	]
+    return [
+        ('tools', 'no'),
+        ('openssl', 'builtin'), #use builtin openssl
+    ]
 
 
 def create(env):
-	tools = env['TOOLS']
-	if "mingw" in tools:
-		tools.remove('mingw')
-	if "applelink" in tools:
-		tools.remove("applelink")
-		env.Tool('gcc')
-	return env.Clone(tools=tools);
+    tools = env['TOOLS']
+    if "mingw" in tools:
+        tools.remove('mingw')
+    if "applelink" in tools:
+        tools.remove("applelink")
+        env.Tool('gcc')
+    return env.Clone(tools=tools);
 
 def configure(env):
 
-	# Workaround for MinGW. See:
-	# http://www.scons.org/wiki/LongCmdLinesOnWin32
-	import os
-	if (os.name=="nt"):
-
-		import subprocess
-
-		def mySubProcess(cmdline,env):
-			#print "SPAWNED : " + cmdline
-			startupinfo = subprocess.STARTUPINFO()
-			startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
-			proc = subprocess.Popen(cmdline, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-				stderr=subprocess.PIPE, startupinfo=startupinfo, shell = False, env = env)
-			data, err = proc.communicate()
-			rv = proc.wait()
-			if rv:
-				print "====="
-				print err
-				print "====="
-			return rv
-
-		def mySpawn(sh, escape, cmd, args, env):
-
-			newargs = ' '.join(args[1:])
-			cmdline = cmd + " " + newargs
-
-			rv=0
-			if len(cmdline) > 32000 and cmd.endswith("ar") :
-				cmdline = cmd + " " + args[1] + " " + args[2] + " "
-				for i in range(3,len(args)) :
-					rv = mySubProcess( cmdline + args[i], env )
-					if rv :
-						break
-			else:
-				rv = mySubProcess( cmdline, env )
-
-			return rv
-
-		env['SPAWN'] = mySpawn
-
-	ndk_platform=env['ndk_platform']
-
-	if env['android_arch'] not in ['armv7','armv6','x86']:
-		env['android_arch']='armv7'
-
-	if env['android_arch']=='x86':
-		env['NDK_TARGET']=env['NDK_TARGET_X86']
-		env["x86_libtheora_opt_gcc"]=True
-
-	if env['PLATFORM'] == 'win32':
-		env.Tool('gcc')
-		env['SHLIBSUFFIX'] = '.so'
-
-
-	neon_text=""
-	if env["android_arch"]=="armv7" and env['android_neon']=='yes':
-		neon_text=" (with neon)"
-	print("Godot Android!!!!! ("+env['android_arch']+")"+neon_text)
-
-	env.Append(CPPPATH=['#platform/android'])
-
-	if env['android_arch']=='x86':
-		env.extra_suffix=".x86"+env.extra_suffix
-	elif env['android_arch']=='armv6':
-		env.extra_suffix=".armv6"+env.extra_suffix
-	elif env["android_arch"]=="armv7":
-		if env['android_neon']=='yes':
-			env.extra_suffix=".armv7.neon"+env.extra_suffix
-		else:
-			env.extra_suffix=".armv7"+env.extra_suffix
-
-	gcc_path=env["ANDROID_NDK_ROOT"]+"/toolchains/"+env["NDK_TARGET"]+"/prebuilt/";
-
-	if (sys.platform.startswith("linux")):
-		if (platform.machine().endswith('64')):
-			gcc_path=gcc_path+"/linux-x86_64/bin"
-		else:
-			gcc_path=gcc_path+"/linux-x86/bin"
-	elif (sys.platform.startswith("darwin")):
-		gcc_path=gcc_path+"/darwin-x86_64/bin"
-		env['SHLINKFLAGS'][1] = '-shared'
-		env['SHLIBSUFFIX'] = '.so'
-	elif (sys.platform.startswith('win')):
-                if (platform.machine().endswith('64')):
-			gcc_path=gcc_path+"/windows-x86_64/bin"
-                else:
-			gcc_path=gcc_path+"/windows-x86/bin"
-
-	env['ENV']['PATH'] = gcc_path+":"+env['ENV']['PATH']
-	if env['android_arch']=='x86':
-		env['CC'] = gcc_path+'/i686-linux-android-gcc'
-		env['CXX'] = gcc_path+'/i686-linux-android-g++'
-		env['AR'] = gcc_path+"/i686-linux-android-ar"
-		env['RANLIB'] = gcc_path+"/i686-linux-android-ranlib"
-		env['AS'] = gcc_path+"/i686-linux-android-as"
-	else:
-		env['CC'] = gcc_path+'/arm-linux-androideabi-gcc'
-		env['CXX'] = gcc_path+'/arm-linux-androideabi-g++'
-		env['AR'] = gcc_path+"/arm-linux-androideabi-ar"
-		env['RANLIB'] = gcc_path+"/arm-linux-androideabi-ranlib"
-		env['AS'] = gcc_path+"/arm-linux-androideabi-as"
-
-	if env['android_arch']=='x86':
-		env['ARCH'] = 'arch-x86'
-	else:
-		env['ARCH'] = 'arch-arm'
-
-	import string
-	#include path
-	gcc_include=env["ANDROID_NDK_ROOT"]+"/platforms/"+ndk_platform+"/"+env['ARCH'] +"/usr/include"
-	ld_sysroot=env["ANDROID_NDK_ROOT"]+"/platforms/"+ndk_platform+"/"+env['ARCH']
-	#glue_include=env["ANDROID_NDK_ROOT"]+"/sources/android/native_app_glue"
-	ld_path=env["ANDROID_NDK_ROOT"]+"/platforms/"+ndk_platform+"/"+env['ARCH']+"/usr/lib"
-	env.Append(CPPPATH=[gcc_include])
+    # Workaround for MinGW. See:
+    # http://www.scons.org/wiki/LongCmdLinesOnWin32
+    import os
+    if (os.name=="nt"):
+
+        import subprocess
+
+        def mySubProcess(cmdline,env):
+            #print "SPAWNED : " + cmdline
+            startupinfo = subprocess.STARTUPINFO()
+            startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+            proc = subprocess.Popen(cmdline, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+                                    stderr=subprocess.PIPE, startupinfo=startupinfo, shell = False, env = env)
+            data, err = proc.communicate()
+            rv = proc.wait()
+            if rv:
+                print "====="
+                print err
+                print "====="
+            return rv
+
+        def mySpawn(sh, escape, cmd, args, env):
+
+            newargs = ' '.join(args[1:])
+            cmdline = cmd + " " + newargs
+
+            rv=0
+            if len(cmdline) > 32000 and cmd.endswith("ar") :
+                cmdline = cmd + " " + args[1] + " " + args[2] + " "
+                for i in range(3,len(args)) :
+                    rv = mySubProcess( cmdline + args[i], env )
+                    if rv :
+                        break
+            else:
+                rv = mySubProcess( cmdline, env )
+
+            return rv
+
+        env['SPAWN'] = mySpawn
+
+    ndk_platform=env['ndk_platform']
+
+    if env['android_arch'] not in ['armv7','armv6','x86']:
+        env['android_arch']='armv7'
+
+    if env['android_arch']=='x86':
+        env['NDK_TARGET']=env['NDK_TARGET_X86']
+        env["x86_libtheora_opt_gcc"]=True
+
+    if env['PLATFORM'] == 'win32':
+        env.Tool('gcc')
+        env['SHLIBSUFFIX'] = '.so'
+
+
+    neon_text=""
+    if env["android_arch"]=="armv7" and env['android_neon']=='yes':
+        neon_text=" (with neon)"
+    print("Godot Android!!!!! ("+env['android_arch']+")"+neon_text)
+
+    env.Append(CPPPATH=['#platform/android'])
+
+    if env['android_arch']=='x86':
+        env.extra_suffix=".x86"+env.extra_suffix
+    elif env['android_arch']=='armv6':
+        env.extra_suffix=".armv6"+env.extra_suffix
+    elif env["android_arch"]=="armv7":
+        if env['android_neon']=='yes':
+            env.extra_suffix=".armv7.neon"+env.extra_suffix
+        else:
+            env.extra_suffix=".armv7"+env.extra_suffix
+
+    gcc_path=env["ANDROID_NDK_ROOT"]+"/toolchains/"+env["NDK_TARGET"]+"/prebuilt/";
+
+    if (sys.platform.startswith("linux")):
+        if (platform.machine().endswith('64')):
+            gcc_path=gcc_path+"/linux-x86_64/bin"
+        else:
+            gcc_path=gcc_path+"/linux-x86/bin"
+    elif (sys.platform.startswith("darwin")):
+        gcc_path=gcc_path+"/darwin-x86_64/bin"
+        env['SHLINKFLAGS'][1] = '-shared'
+        env['SHLIBSUFFIX'] = '.so'
+    elif (sys.platform.startswith('win')):
+        if (platform.machine().endswith('64')):
+            gcc_path=gcc_path+"/windows-x86_64/bin"
+        else:
+            gcc_path=gcc_path+"/windows-x86/bin"
+
+    env['ENV']['PATH'] = gcc_path+":"+env['ENV']['PATH']
+    if env['android_arch']=='x86':
+        env['CC'] = gcc_path+'/i686-linux-android-gcc'
+        env['CXX'] = gcc_path+'/i686-linux-android-g++'
+        env['AR'] = gcc_path+"/i686-linux-android-ar"
+        env['RANLIB'] = gcc_path+"/i686-linux-android-ranlib"
+        env['AS'] = gcc_path+"/i686-linux-android-as"
+    else:
+        env['CC'] = gcc_path+'/arm-linux-androideabi-gcc'
+        env['CXX'] = gcc_path+'/arm-linux-androideabi-g++'
+        env['AR'] = gcc_path+"/arm-linux-androideabi-ar"
+        env['RANLIB'] = gcc_path+"/arm-linux-androideabi-ranlib"
+        env['AS'] = gcc_path+"/arm-linux-androideabi-as"
+
+    if env['android_arch']=='x86':
+        env['ARCH'] = 'arch-x86'
+    else:
+        env['ARCH'] = 'arch-arm'
+
+    import string
+    #include path
+    gcc_include=env["ANDROID_NDK_ROOT"]+"/platforms/"+ndk_platform+"/"+env['ARCH'] +"/usr/include"
+    ld_sysroot=env["ANDROID_NDK_ROOT"]+"/platforms/"+ndk_platform+"/"+env['ARCH']
+    #glue_include=env["ANDROID_NDK_ROOT"]+"/sources/android/native_app_glue"
+    ld_path=env["ANDROID_NDK_ROOT"]+"/platforms/"+ndk_platform+"/"+env['ARCH']+"/usr/lib"
+    env.Append(CPPPATH=[gcc_include])
 #	env['CCFLAGS'] = string.split('-DNO_THREADS -MMD -MP -MF -fpic -ffunction-sections -funwind-tables -fstack-protector -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__  -Wno-psabi -march=armv5te -mtune=xscale -msoft-float  -fno-exceptions -mthumb -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED ')
 
-	env['neon_enabled']=False
-	if env['android_arch']=='x86':
-		env.Append(CCFLAGS=string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__GLIBC__  -Wno-psabi -ftree-vectorize -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED'))
-	elif env["android_arch"]=="armv6":
-		env.Append(CCFLAGS=string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__ARM_ARCH_6__ -D__GLIBC__  -Wno-psabi -march=armv6 -mfpu=vfp -mfloat-abi=softfp -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED'))
-	elif env["android_arch"]=="armv7":
-		env.Append(CCFLAGS=string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__ARM_ARCH_7__ -D__ARM_ARCH_7A__ -D__GLIBC__  -Wno-psabi -march=armv7-a -mfloat-abi=softfp -ftree-vectorize -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED'))
-		if env['android_neon']=='yes':
-			env['neon_enabled']=True
-			env.Append(CCFLAGS=['-mfpu=neon','-D__ARM_NEON__'])
-		else:
-			env.Append(CCFLAGS=['-mfpu=vfpv3-d16'])
-
-	env.Append(LDPATH=[ld_path])
-	env.Append(LIBS=['OpenSLES'])
+    env['neon_enabled']=False
+    if env['android_arch']=='x86':
+        env.Append(CCFLAGS=string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__GLIBC__  -Wno-psabi -ftree-vectorize -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED'))
+    elif env["android_arch"]=="armv6":
+        env.Append(CCFLAGS=string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__ARM_ARCH_6__ -D__GLIBC__  -Wno-psabi -march=armv6 -mfpu=vfp -mfloat-abi=softfp -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED'))
+    elif env["android_arch"]=="armv7":
+        env.Append(CCFLAGS=string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__ARM_ARCH_7__ -D__ARM_ARCH_7A__ -D__GLIBC__  -Wno-psabi -march=armv7-a -mfloat-abi=softfp -ftree-vectorize -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED'))
+        if env['android_neon']=='yes':
+            env['neon_enabled']=True
+            env.Append(CCFLAGS=['-mfpu=neon','-D__ARM_NEON__'])
+        else:
+            env.Append(CCFLAGS=['-mfpu=vfpv3-d16'])
+
+    env.Append(LDPATH=[ld_path])
+    env.Append(LIBS=['OpenSLES'])
 #	env.Append(LIBS=['c','m','stdc++','log','EGL','GLESv1_CM','GLESv2','OpenSLES','supc++','android'])
-	env.Append(LIBS=['EGL','OpenSLES','android'])
-	env.Append(LIBS=['c','m','stdc++','log','GLESv1_CM','GLESv2', 'z'])
+    env.Append(LIBS=['EGL','OpenSLES','android'])
+    env.Append(LIBS=['c','m','stdc++','log','GLESv1_CM','GLESv2', 'z'])
 
-	env["LINKFLAGS"]= string.split(" -g --sysroot="+ld_sysroot+" -Wl,--no-undefined -Wl,-z,noexecstack ")
-	env.Append(LINKFLAGS=["-Wl,-soname,libgodot_android.so"])
+    env["LINKFLAGS"]= string.split(" -g --sysroot="+ld_sysroot+" -Wl,--no-undefined -Wl,-z,noexecstack ")
+    env.Append(LINKFLAGS=["-Wl,-soname,libgodot_android.so"])
 
-	if (env["target"]=="release"):
+    if (env["target"]=="release"):
 
-		env.Append(CCFLAGS=['-O2', '-ffast-math','-fomit-frame-pointer'])
+        env.Append(CCFLAGS=['-O2', '-ffast-math','-fomit-frame-pointer'])
 
-	elif (env["target"]=="release_debug"):
+    elif (env["target"]=="release_debug"):
 
-		env.Append(CCFLAGS=['-O2', '-ffast-math','-DDEBUG_ENABLED'])
+        env.Append(CCFLAGS=['-O2', '-ffast-math','-DDEBUG_ENABLED'])
 
-	elif (env["target"]=="debug"):
+    elif (env["target"]=="debug"):
 
-		env.Append(CCFLAGS=['-D_DEBUG', '-g1', '-Wall', '-O0', '-DDEBUG_ENABLED'])
-		env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ALLOC'])
+        env.Append(CCFLAGS=['-D_DEBUG', '-g1', '-Wall', '-O0', '-DDEBUG_ENABLED'])
+        env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ALLOC'])
 
-	env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED', '-DNO_FCNTL','-DMPC_FIXED_POINT'])
+    env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED', '-DNO_FCNTL','-DMPC_FIXED_POINT'])
 #	env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED','-DMPC_FIXED_POINT'])
 
-	# TODO: Move that to opus module's config
-	if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
-		if (env["android_arch"]=="armv6" or env["android_arch"]=="armv7"):
-			env.Append(CFLAGS=["-DOPUS_ARM_OPT"])
-		env.opus_fixed_point="yes"
-
-	if (env['android_stl']=='yes'):
-		#env.Append(CCFLAGS=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/system/include"])
-		env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/include"])
-		if env['android_arch']=='x86':
-			env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include"])
-			env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86"])
-		elif env['android_arch']=='armv6':
-			env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include"])
-			env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi"])
-		elif env["android_arch"]=="armv7":
-			env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include"])
-			env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a"])
-
-		env.Append(LIBS=["gnustl_static","supc++"])
-		env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cpufeatures"])
-
-		#env.Append(CCFLAGS=["-I"+env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/stlport/stlport"])
-		#env.Append(CCFLAGS=["-I"+env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include"])
-		#env.Append(LINKFLAGS=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libstdc++.a"])
-	else:
-
-		env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/include"])
-		env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cpufeatures"])
-		if env['android_arch']=='x86':
-			env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86"])
-		elif env["android_arch"]=="armv6":
-			env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi"])
-		elif env["android_arch"]=="armv7":
-			env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a"])
-		env.Append(LIBS=['gnustl_static'])
-		env.Append(CCFLAGS=["-fno-exceptions",'-DNO_SAFE_CAST'])
-
-
-	import methods
-	env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-
-	env.use_windows_spawn_fix()
+    # TODO: Move that to opus module's config
+    if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
+        if (env["android_arch"]=="armv6" or env["android_arch"]=="armv7"):
+            env.Append(CFLAGS=["-DOPUS_ARM_OPT"])
+        env.opus_fixed_point="yes"
+
+    if (env['android_stl']=='yes'):
+        #env.Append(CCFLAGS=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/system/include"])
+        env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/include"])
+        if env['android_arch']=='x86':
+            env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include"])
+            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86"])
+        elif env['android_arch']=='armv6':
+            env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include"])
+            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi"])
+        elif env["android_arch"]=="armv7":
+            env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include"])
+            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a"])
+
+        env.Append(LIBS=["gnustl_static","supc++"])
+        env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cpufeatures"])
+
+        #env.Append(CCFLAGS=["-I"+env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/stlport/stlport"])
+        #env.Append(CCFLAGS=["-I"+env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include"])
+        #env.Append(LINKFLAGS=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libstdc++.a"])
+    else:
+
+        env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/include"])
+        env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cpufeatures"])
+        if env['android_arch']=='x86':
+            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86"])
+        elif env["android_arch"]=="armv6":
+            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi"])
+        elif env["android_arch"]=="armv7":
+            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a"])
+        env.Append(LIBS=['gnustl_static'])
+        env.Append(CCFLAGS=["-fno-exceptions",'-DNO_SAFE_CAST'])
+
+
+    import methods
+    env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+
+    env.use_windows_spawn_fix()
diff --git a/platform/bb10/SCsub b/platform/bb10/SCsub
index 84fff0828b..c19f46d579 100644
--- a/platform/bb10/SCsub
+++ b/platform/bb10/SCsub
@@ -4,19 +4,19 @@ Import('env')
 
 bb10_lib = [
 
-	'bbutil.c',
-	'os_bb10.cpp',
-	'audio_driver_bb10.cpp',
-	'godot_bb10.cpp',
-	'payment_service.cpp',
+    'bbutil.c',
+    'os_bb10.cpp',
+    'audio_driver_bb10.cpp',
+    'godot_bb10.cpp',
+    'payment_service.cpp',
 ]
 
 env_bps = env.Clone()
 if env['bb10_payment_service'] == "yes":
-	env_bps.Append(CPPFLAGS=['-DPAYMENT_SERVICE_ENABLED'])
+    env_bps.Append(CPPFLAGS=['-DPAYMENT_SERVICE_ENABLED'])
 
 if env['bb10_lgles_override'] == "yes":
-	env_bps.Append(CPPFLAGS=['-DBB10_LGLES_OVERRIDE'])
+    env_bps.Append(CPPFLAGS=['-DBB10_LGLES_OVERRIDE'])
 
 
 prog = None
diff --git a/platform/bb10/detect.py b/platform/bb10/detect.py
index 2b76aa3496..76ccbe3af6 100644
--- a/platform/bb10/detect.py
+++ b/platform/bb10/detect.py
@@ -5,85 +5,85 @@ import methods
 
 
 def is_active():
-	return True
+    return True
 
 def get_name():
-	return "BlackBerry 10"
+    return "BlackBerry 10"
 
 def can_build():
 
-	import os
-	if (not os.environ.has_key("QNX_TARGET")):
-		return False
-	return True
+    import os
+    if (not os.environ.has_key("QNX_TARGET")):
+        return False
+    return True
 
 def get_opts():
 
-	return [
-		('QNX_HOST', 'path to qnx host', os.environ.get("QNX_HOST", 0)),
-		('QNX_TARGET', 'path to qnx target', os.environ.get("QNX_TARGET", 0)),
-		('QNX_CONFIGURATION', 'path to qnx configuration', os.environ.get("QNX_CONFIGURATION", 0)),
-		('qnx_target', 'Qnx target (armle or x86', 'armle'),
-		('bb10_payment_service', 'Enable Payment Service for BlackBerry10', 'yes'),
-		('bb10_lgles_override', 'Force legacy GLES (1.1) on iOS', 'no'),
-		('bb10_exceptions', 'Use exceptions when compiling on bb10', 'no'),
-	]
+    return [
+        ('QNX_HOST', 'path to qnx host', os.environ.get("QNX_HOST", 0)),
+        ('QNX_TARGET', 'path to qnx target', os.environ.get("QNX_TARGET", 0)),
+        ('QNX_CONFIGURATION', 'path to qnx configuration', os.environ.get("QNX_CONFIGURATION", 0)),
+        ('qnx_target', 'Qnx target (armle or x86', 'armle'),
+        ('bb10_payment_service', 'Enable Payment Service for BlackBerry10', 'yes'),
+        ('bb10_lgles_override', 'Force legacy GLES (1.1) on iOS', 'no'),
+        ('bb10_exceptions', 'Use exceptions when compiling on bb10', 'no'),
+    ]
 
 def get_flags():
 
-	return [
-		('tools', 'no'),
-		('builtin_zlib', 'yes'),
-		('module_theora_enabled', 'no'),
-	]
+    return [
+        ('tools', 'no'),
+        ('builtin_zlib', 'yes'),
+        ('module_theora_enabled', 'no'),
+    ]
 
 def configure(env):
 
-	if env['PLATFORM'] == 'win32':
-		env.Tool('mingw')
-		env['SPAWN'] = methods.win32_spawn
+    if env['PLATFORM'] == 'win32':
+        env.Tool('mingw')
+        env['SPAWN'] = methods.win32_spawn
 
-	env['qnx_target_ver'] = env['qnx_target']
-	if env['qnx_target'] == "armle":
-		env['qnx_prefix'] = 'ntoarmv7'
-		env['qnx_target_ver'] = 'armle-v7'
-	else:
-		env['qnx_prefix'] = 'ntox86'
+    env['qnx_target_ver'] = env['qnx_target']
+    if env['qnx_target'] == "armle":
+        env['qnx_prefix'] = 'ntoarmv7'
+        env['qnx_target_ver'] = 'armle-v7'
+    else:
+        env['qnx_prefix'] = 'ntox86'
 
-	env['OBJSUFFIX'] = ".qnx.${qnx_target}.o"
-	env['LIBSUFFIX'] = ".qnx.${qnx_target}.a"
-	env['PROGSUFFIX'] = ".qnx.${qnx_target}"
-	print("PROGSUFFIX: "+env['PROGSUFFIX']+" target: "+env['qnx_target'])
+    env['OBJSUFFIX'] = ".qnx.${qnx_target}.o"
+    env['LIBSUFFIX'] = ".qnx.${qnx_target}.a"
+    env['PROGSUFFIX'] = ".qnx.${qnx_target}"
+    print("PROGSUFFIX: "+env['PROGSUFFIX']+" target: "+env['qnx_target'])
 
-	env.PrependENVPath('PATH', env['QNX_CONFIGURATION'] + '/bin')
-	env.PrependENVPath('PATH', env['QNX_CONFIGURATION'] + '/usr/bin')
-	env['ENV']['QNX_HOST'] = env['QNX_HOST']
-	env['ENV']['QNX_TARGET'] = env['QNX_TARGET']
-	env['ENV']['QNX_CONFIGURATION'] = env['QNX_CONFIGURATION']
+    env.PrependENVPath('PATH', env['QNX_CONFIGURATION'] + '/bin')
+    env.PrependENVPath('PATH', env['QNX_CONFIGURATION'] + '/usr/bin')
+    env['ENV']['QNX_HOST'] = env['QNX_HOST']
+    env['ENV']['QNX_TARGET'] = env['QNX_TARGET']
+    env['ENV']['QNX_CONFIGURATION'] = env['QNX_CONFIGURATION']
 
-	env['CC'] = '$qnx_prefix-gcc'
-	env['CXX'] = '$qnx_prefix-g++'
-	env['AR'] = '$qnx_prefix-ar'
-	env['RANLIB'] = '$qnx_prefix-ranlib'
+    env['CC'] = '$qnx_prefix-gcc'
+    env['CXX'] = '$qnx_prefix-g++'
+    env['AR'] = '$qnx_prefix-ar'
+    env['RANLIB'] = '$qnx_prefix-ranlib'
 
-	env.Append(CPPPATH = ['#platform/bb10'])
-	env.Append(LIBPATH = ['#platform/bb10/lib/$qnx_target', '#platform/bb10/lib/$qnx_target_ver'])
-	env.Append(CCFLAGS = string.split('-DBB10_ENABLED -DUNIX_ENABLED -DGLES2_ENABLED -DGLES1_ENABLED -D_LITTLE_ENDIAN -DNO_THREADS -DNO_FCNTL'))
-	if env['bb10_exceptions']=="yes":
-		env.Append(CCFLAGS = ['-fexceptions'])
-	else:
-		env.Append(CCFLAGS = ['-fno-exceptions'])
+    env.Append(CPPPATH = ['#platform/bb10'])
+    env.Append(LIBPATH = ['#platform/bb10/lib/$qnx_target', '#platform/bb10/lib/$qnx_target_ver'])
+    env.Append(CCFLAGS = string.split('-DBB10_ENABLED -DUNIX_ENABLED -DGLES2_ENABLED -DGLES1_ENABLED -D_LITTLE_ENDIAN -DNO_THREADS -DNO_FCNTL'))
+    if env['bb10_exceptions']=="yes":
+        env.Append(CCFLAGS = ['-fexceptions'])
+    else:
+        env.Append(CCFLAGS = ['-fno-exceptions'])
 
-	#env.Append(LINKFLAGS = string.split()
+    #env.Append(LINKFLAGS = string.split()
 
-	if (env["target"]=="release"):
+    if (env["target"]=="release"):
 
-		env.Append(CCFLAGS=['-O3','-DRELEASE_BUILD'])
+        env.Append(CCFLAGS=['-O3','-DRELEASE_BUILD'])
 
-	elif (env["target"]=="debug"):
+    elif (env["target"]=="debug"):
 
-		env.Append(CCFLAGS=['-g', '-O0','-DDEBUG_ENABLED', '-D_DEBUG'])
-		env.Append(LINKFLAGS=['-g'])
+        env.Append(CCFLAGS=['-g', '-O0','-DDEBUG_ENABLED', '-D_DEBUG'])
+        env.Append(LINKFLAGS=['-g'])
 
-	env.Append(LIBS=['bps', 'pps', 'screen', 'socket', 'EGL', 'GLESv2', 'GLESv1_CM', 'm', 'asound'])
+    env.Append(LIBS=['bps', 'pps', 'screen', 'socket', 'EGL', 'GLESv2', 'GLESv1_CM', 'm', 'asound'])
 
diff --git a/platform/haiku/SCsub b/platform/haiku/SCsub
index b5a584baa4..bac287ef62 100644
--- a/platform/haiku/SCsub
+++ b/platform/haiku/SCsub
@@ -3,25 +3,25 @@
 Import('env')
 
 common_haiku = [
-	'os_haiku.cpp',
-	'context_gl_haiku.cpp',
-	'haiku_application.cpp',
-	'haiku_direct_window.cpp',
-	'haiku_gl_view.cpp',
-	'key_mapping_haiku.cpp',
-	'audio_driver_media_kit.cpp'
+    'os_haiku.cpp',
+    'context_gl_haiku.cpp',
+    'haiku_application.cpp',
+    'haiku_direct_window.cpp',
+    'haiku_gl_view.cpp',
+    'key_mapping_haiku.cpp',
+    'audio_driver_media_kit.cpp'
 ]
 
 target = env.Program(
-	'#bin/godot',
-	['godot_haiku.cpp'] + common_haiku
+    '#bin/godot',
+    ['godot_haiku.cpp'] + common_haiku
 )
 
 command = env.Command('#bin/godot.rsrc', '#platform/haiku/godot.rdef',
-		['rc -o $TARGET $SOURCE'])
+                      ['rc -o $TARGET $SOURCE'])
 
 def addResourcesAction(target = None, source = None, env = None):
-	return env.Execute('xres -o ' + File(target)[0].path + ' bin/godot.rsrc')
+    return env.Execute('xres -o ' + File(target)[0].path + ' bin/godot.rsrc')
 
 env.AddPostAction(target, addResourcesAction)
 env.Depends(target, command)
diff --git a/platform/haiku/detect.py b/platform/haiku/detect.py
index af997a5737..aef423b404 100644
--- a/platform/haiku/detect.py
+++ b/platform/haiku/detect.py
@@ -2,60 +2,60 @@ import os
 import sys
 
 def is_active():
-	return True
+    return True
 
 def get_name():
-	return "Haiku"
+    return "Haiku"
 
 def can_build():
-	if (os.name != "posix"):
-		return False
+    if (os.name != "posix"):
+        return False
 
-	if (sys.platform == "darwin"):
-		return False
+    if (sys.platform == "darwin"):
+        return False
 
-	return True
+    return True
 
 def get_opts():
-	return [
-		('debug_release', 'Add debug symbols to release version','no')
-	]
+    return [
+        ('debug_release', 'Add debug symbols to release version','no')
+    ]
 
 def get_flags():
-	return [
-	]
+    return [
+    ]
 
 def configure(env):
-	is64 = sys.maxsize > 2**32
-
-	if (env["bits"]=="default"):
-		if (is64):
-			env["bits"]="64"
-		else:
-			env["bits"]="32"
-
-	env.Append(CPPPATH = ['#platform/haiku'])
-
-	env["CC"] = "gcc-x86"
-	env["CXX"] = "g++-x86"
-
-	if (env["target"]=="release"):
-		if (env["debug_release"]=="yes"):
-			env.Append(CCFLAGS=['-g2'])
-		else:
-			env.Append(CCFLAGS=['-O3','-ffast-math'])
-	elif (env["target"]=="release_debug"):
-		env.Append(CCFLAGS=['-O2','-ffast-math','-DDEBUG_ENABLED'])
-	elif (env["target"]=="debug"):
-		env.Append(CCFLAGS=['-g2', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
-
-	#env.Append(CCFLAGS=['-DFREETYPE_ENABLED'])
-	env.Append(CPPFLAGS = ['-DPTHREAD_NO_RENAME']) # TODO: enable when we have pthread_setname_np
-	env.Append(CPPFLAGS = ['-DOPENGL_ENABLED', '-DMEDIA_KIT_ENABLED'])
-	env.Append(CPPFLAGS = ['-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL'])
-	env.Append(LIBS = ['be', 'game', 'media', 'network', 'bnetapi', 'z', 'GL'])
-
-	import methods
-	env.Append(BUILDERS = {'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl')})
-	env.Append(BUILDERS = {'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl')})
-	env.Append(BUILDERS = {'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl')})
+    is64 = sys.maxsize > 2**32
+
+    if (env["bits"]=="default"):
+        if (is64):
+            env["bits"]="64"
+        else:
+            env["bits"]="32"
+
+    env.Append(CPPPATH = ['#platform/haiku'])
+
+    env["CC"] = "gcc-x86"
+    env["CXX"] = "g++-x86"
+
+    if (env["target"]=="release"):
+        if (env["debug_release"]=="yes"):
+            env.Append(CCFLAGS=['-g2'])
+        else:
+            env.Append(CCFLAGS=['-O3','-ffast-math'])
+    elif (env["target"]=="release_debug"):
+        env.Append(CCFLAGS=['-O2','-ffast-math','-DDEBUG_ENABLED'])
+    elif (env["target"]=="debug"):
+        env.Append(CCFLAGS=['-g2', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
+
+    #env.Append(CCFLAGS=['-DFREETYPE_ENABLED'])
+    env.Append(CPPFLAGS = ['-DPTHREAD_NO_RENAME']) # TODO: enable when we have pthread_setname_np
+    env.Append(CPPFLAGS = ['-DOPENGL_ENABLED', '-DMEDIA_KIT_ENABLED'])
+    env.Append(CPPFLAGS = ['-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL'])
+    env.Append(LIBS = ['be', 'game', 'media', 'network', 'bnetapi', 'z', 'GL'])
+
+    import methods
+    env.Append(BUILDERS = {'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl')})
+    env.Append(BUILDERS = {'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl')})
+    env.Append(BUILDERS = {'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl')})
diff --git a/platform/iphone/SCsub b/platform/iphone/SCsub
index 236630bef4..1d7797ebd3 100644
--- a/platform/iphone/SCsub
+++ b/platform/iphone/SCsub
@@ -4,19 +4,19 @@ Import('env')
 
 iphone_lib = [
 
-	'os_iphone.cpp',
-	#'rasterizer_iphone.cpp',
-	'audio_driver_iphone.cpp',
-	'sem_iphone.cpp',
-	'gl_view.mm',
-	'main.m',
-	'app_delegate.mm',
-	'view_controller.mm',
-	'game_center.mm',
-	'in_app_store.mm',
-	'icloud.mm',
-	#'Appirater.m',
-	'ios.mm',
+    'os_iphone.cpp',
+    #'rasterizer_iphone.cpp',
+    'audio_driver_iphone.cpp',
+    'sem_iphone.cpp',
+    'gl_view.mm',
+    'main.m',
+    'app_delegate.mm',
+    'view_controller.mm',
+    'game_center.mm',
+    'in_app_store.mm',
+    'icloud.mm',
+    #'Appirater.m',
+    'ios.mm',
 ]
 
 #env.Depends('#core/math/vector3.h', 'vector3_psp.h')
@@ -27,7 +27,7 @@ env_ios = env.Clone();
 
 
 if env['ios_gles22_override'] == "yes":
-	env_ios.Append(CPPFLAGS=['-DGLES2_OVERRIDE'])
+    env_ios.Append(CPPFLAGS=['-DGLES2_OVERRIDE'])
 
 
 #if env['ios_appirater'] == "yes":
diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py
index 1be63891b1..cea79d0f21 100644
--- a/platform/iphone/detect.py
+++ b/platform/iphone/detect.py
@@ -3,187 +3,187 @@ import sys
 
 
 def is_active():
-	return True
+    return True
 
 def get_name():
-	return "iOS"
+    return "iOS"
 
 def can_build():
 
-	import sys
-	import os
-	if sys.platform == 'darwin' or os.environ.has_key("OSXCROSS_IOS"):
-		return True
+    import sys
+    import os
+    if sys.platform == 'darwin' or os.environ.has_key("OSXCROSS_IOS"):
+        return True
 
-	return False
+    return False
 
 def get_opts():
 
-	return [
-		('IPHONEPLATFORM', 'name of the iphone platform', 'iPhoneOS'),
-		('IPHONEPATH', 'the path to iphone toolchain', '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain'),
-		('IPHONESDK', 'path to the iphone SDK', '/Applications/Xcode.app/Contents/Developer/Platforms/${IPHONEPLATFORM}.platform/Developer/SDKs/${IPHONEPLATFORM}.sdk/'),
-		('game_center', 'Support for game center', 'yes'),
-		('store_kit', 'Support for in-app store', 'yes'),
-		('icloud', 'Support for iCloud', 'yes'),
-		('ios_gles22_override', 'Force GLES2.0 on iOS', 'yes'),
-		('ios_appirater', 'Enable Appirater', 'no'),
-		('ios_exceptions', 'Use exceptions when compiling on playbook', 'yes'),
-		('ios_triple', 'Triple for ios toolchain', ''),
-		('ios_sim', 'Build simulator binary', 'no'),
-	]
+    return [
+        ('IPHONEPLATFORM', 'name of the iphone platform', 'iPhoneOS'),
+        ('IPHONEPATH', 'the path to iphone toolchain', '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain'),
+        ('IPHONESDK', 'path to the iphone SDK', '/Applications/Xcode.app/Contents/Developer/Platforms/${IPHONEPLATFORM}.platform/Developer/SDKs/${IPHONEPLATFORM}.sdk/'),
+        ('game_center', 'Support for game center', 'yes'),
+        ('store_kit', 'Support for in-app store', 'yes'),
+        ('icloud', 'Support for iCloud', 'yes'),
+        ('ios_gles22_override', 'Force GLES2.0 on iOS', 'yes'),
+        ('ios_appirater', 'Enable Appirater', 'no'),
+        ('ios_exceptions', 'Use exceptions when compiling on playbook', 'yes'),
+        ('ios_triple', 'Triple for ios toolchain', ''),
+        ('ios_sim', 'Build simulator binary', 'no'),
+    ]
 
 def get_flags():
 
-	return [
-		('tools', 'no'),
-		('webp', 'yes'),
-		('builtin_zlib', 'yes'),
-		('openssl','builtin'), #use builtin openssl
-	]
+    return [
+        ('tools', 'no'),
+        ('webp', 'yes'),
+        ('builtin_zlib', 'yes'),
+        ('openssl','builtin'), #use builtin openssl
+    ]
 
 
 
 def configure(env):
 
-	env.Append(CPPPATH=['#platform/iphone'])
-
-	env['ENV']['PATH'] = env['IPHONEPATH']+"/Developer/usr/bin/:"+env['ENV']['PATH']
-
-	env['CC'] = '$IPHONEPATH/usr/bin/${ios_triple}clang'
-	env['CXX'] = '$IPHONEPATH/usr/bin/${ios_triple}clang++'
-	env['AR'] = '$IPHONEPATH/usr/bin/${ios_triple}ar'
-	env['RANLIB'] = '$IPHONEPATH/usr/bin/${ios_triple}ranlib'
-
-	import string
-	if (env["ios_sim"]=="yes" or env["arch"] == "x86"): # i386, simulator
-		env["arch"]="x86"
-		env["bits"]="32"
-		env['CCFLAGS'] = string.split('-arch i386 -fobjc-abi-version=2 -fobjc-legacy-dispatch -fmessage-length=0 -fpascal-strings -fasm-blocks  -Wall -D__IPHONE_OS_VERSION_MIN_REQUIRED=40100 -isysroot $IPHONESDK -mios-simulator-version-min=4.3 -DCUSTOM_MATRIX_TRANSFORM_H=\\\"build/iphone/matrix4_iphone.h\\\" -DCUSTOM_VECTOR3_TRANSFORM_H=\\\"build/iphone/vector3_iphone.h\\\"')
-	elif (env["arch"]=="arm64"): # arm64
-		env["bits"] = "64"
-		env['CCFLAGS'] = string.split('-fno-objc-arc -arch arm64 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -Wno-trigraphs -fpascal-strings -Wmissing-prototypes -Wreturn-type -Wparentheses -Wswitch -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-shorten-64-to-32 -fvisibility=hidden -Wno-sign-conversion -MMD -MT dependencies -miphoneos-version-min=5.1.1 -isysroot $IPHONESDK')
-		env.Append(CPPFLAGS=['-DNEED_LONG_INT'])
-		env.Append(CPPFLAGS=['-DLIBYUV_DISABLE_NEON'])
-	else: # armv7
-		env["arch"] = "arm"
-		env["bits"] = "32"
-		env['CCFLAGS'] = string.split('-fno-objc-arc -arch armv7 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -Wno-trigraphs -fpascal-strings -Wmissing-prototypes -Wreturn-type -Wparentheses -Wswitch -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-shorten-64-to-32 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk -fvisibility=hidden -Wno-sign-conversion -mthumb "-DIBOutlet=__attribute__((iboutlet))" "-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))" "-DIBAction=void)__attribute__((ibaction)" -miphoneos-version-min=5.1.1 -MMD -MT dependencies -isysroot $IPHONESDK')
-
-	if (env["arch"]=="x86"):
-		env['IPHONEPLATFORM'] = 'iPhoneSimulator'
-		env.Append(LINKFLAGS=['-arch', 'i386', '-mios-simulator-version-min=4.3',
-							'-isysroot', '$IPHONESDK',
-							#'-mmacosx-version-min=10.6',
-							'-Xlinker',
-							'-objc_abi_version',
-							'-Xlinker', '2',
-							'-framework', 'AudioToolbox',
-							'-framework', 'AVFoundation',
-							'-framework', 'CoreAudio',
-							'-framework', 'CoreGraphics',
-							'-framework', 'CoreMedia',
-							'-framework', 'Foundation',
-							'-framework', 'Security',
-							'-framework', 'UIKit',
-							'-framework', 'MediaPlayer',
-							'-framework', 'OpenGLES',
-							'-framework', 'QuartzCore',
-							'-framework', 'SystemConfiguration',
-							'-F$IPHONESDK',
-							])
-	elif (env["arch"]=="arm64"):
-		env.Append(LINKFLAGS=['-arch', 'arm64', '-Wl,-dead_strip', '-miphoneos-version-min=5.1.1',
-							'-isysroot', '$IPHONESDK',
-							#'-stdlib=libc++',
-							'-framework', 'Foundation',
-							'-framework', 'UIKit',
-							'-framework', 'CoreGraphics',
-							'-framework', 'OpenGLES',
-							'-framework', 'QuartzCore',
-							'-framework', 'CoreAudio',
-							'-framework', 'AudioToolbox',
-							'-framework', 'SystemConfiguration',
-							'-framework', 'Security',
-							#'-framework', 'AdSupport',
-							'-framework', 'MediaPlayer',
-							'-framework', 'AVFoundation',
-							'-framework', 'CoreMedia',
-							])
-	else:
-		env.Append(LINKFLAGS=['-arch', 'armv7', '-Wl,-dead_strip', '-miphoneos-version-min=5.1.1',
-							'-isysroot', '$IPHONESDK',
-							'-framework', 'Foundation',
-							'-framework', 'UIKit',
-							'-framework', 'CoreGraphics',
-							'-framework', 'OpenGLES',
-							'-framework', 'QuartzCore',
-							'-framework', 'CoreAudio',
-							'-framework', 'AudioToolbox',
-							'-framework', 'SystemConfiguration',
-							'-framework', 'Security',
-							#'-framework', 'AdSupport',
-							'-framework', 'MediaPlayer',
-							'-framework', 'AVFoundation',
-							'-framework', 'CoreMedia',
-							])
-
-	if env['game_center'] == 'yes':
-		env.Append(CPPFLAGS=['-fblocks', '-DGAME_CENTER_ENABLED'])
-		env.Append(LINKFLAGS=['-framework', 'GameKit'])
-
-	if env['store_kit'] == 'yes':
-		env.Append(CPPFLAGS=['-DSTOREKIT_ENABLED'])
-		env.Append(LINKFLAGS=['-framework', 'StoreKit'])
-
-	if env['icloud'] == 'yes':
-		env.Append(CPPFLAGS=['-DICLOUD_ENABLED'])
-
-	env.Append(CPPPATH = ['$IPHONESDK/usr/include', '$IPHONESDK/System/Library/Frameworks/OpenGLES.framework/Headers', '$IPHONESDK/System/Library/Frameworks/AudioUnit.framework/Headers'])
-
-	if (env["target"]=="release"):
-
-		env.Append(CCFLAGS=['-O3', '-DNS_BLOCK_ASSERTIONS=1','-Wall', '-gdwarf-2']) # removed -ffast-math
-		env.Append(LINKFLAGS=['-O3']) #
-
-	elif env["target"] == "release_debug":
-		env.Append(CCFLAGS=['-Os', '-DNS_BLOCK_ASSERTIONS=1','-Wall','-DDEBUG_ENABLED'])
-		env.Append(LINKFLAGS=['-Os'])
-		env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ENABLED'])
-
-	elif (env["target"]=="debug"):
-
-		env.Append(CCFLAGS=['-D_DEBUG', '-DDEBUG=1', '-gdwarf-2', '-Wall', '-O0', '-DDEBUG_ENABLED'])
-		env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ENABLED'])
-
-	elif (env["target"]=="profile"):
-
-		env.Append(CCFLAGS=['-g','-pg', '-Os'])
-		env.Append(LINKFLAGS=['-pg'])
-
-	if (env["ios_sim"]=="yes"): #TODO: Check if needed?
-		env['ENV']['MACOSX_DEPLOYMENT_TARGET'] = '10.6'
-	env['ENV']['CODESIGN_ALLOCATE'] = '/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate'
-	env.Append(CPPFLAGS=['-DIPHONE_ENABLED', '-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DMPC_FIXED_POINT'])
-
-	# TODO: Move that to opus module's config
-	if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
-		env.opus_fixed_point="yes"
-		if env["arch"]=="x86":
-			pass
-		elif(env["arch"]=="arm64"):
-			env.Append(CFLAGS=["-DOPUS_ARM64_OPT"])
-		else:
-			env.Append(CFLAGS=["-DOPUS_ARM_OPT"])
-
-	if env['ios_exceptions'] == 'yes':
-		env.Append(CPPFLAGS=['-fexceptions'])
-	else:
-		env.Append(CPPFLAGS=['-fno-exceptions'])
-	#env['neon_enabled']=True
-	env['S_compiler'] = '$IPHONEPATH/Developer/usr/bin/gcc'
-
-	import methods
-	env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append(CPPPATH=['#platform/iphone'])
+
+    env['ENV']['PATH'] = env['IPHONEPATH']+"/Developer/usr/bin/:"+env['ENV']['PATH']
+
+    env['CC'] = '$IPHONEPATH/usr/bin/${ios_triple}clang'
+    env['CXX'] = '$IPHONEPATH/usr/bin/${ios_triple}clang++'
+    env['AR'] = '$IPHONEPATH/usr/bin/${ios_triple}ar'
+    env['RANLIB'] = '$IPHONEPATH/usr/bin/${ios_triple}ranlib'
+
+    import string
+    if (env["ios_sim"]=="yes" or env["arch"] == "x86"): # i386, simulator
+        env["arch"]="x86"
+        env["bits"]="32"
+        env['CCFLAGS'] = string.split('-arch i386 -fobjc-abi-version=2 -fobjc-legacy-dispatch -fmessage-length=0 -fpascal-strings -fasm-blocks  -Wall -D__IPHONE_OS_VERSION_MIN_REQUIRED=40100 -isysroot $IPHONESDK -mios-simulator-version-min=4.3 -DCUSTOM_MATRIX_TRANSFORM_H=\\\"build/iphone/matrix4_iphone.h\\\" -DCUSTOM_VECTOR3_TRANSFORM_H=\\\"build/iphone/vector3_iphone.h\\\"')
+    elif (env["arch"]=="arm64"): # arm64
+        env["bits"] = "64"
+        env['CCFLAGS'] = string.split('-fno-objc-arc -arch arm64 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -Wno-trigraphs -fpascal-strings -Wmissing-prototypes -Wreturn-type -Wparentheses -Wswitch -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-shorten-64-to-32 -fvisibility=hidden -Wno-sign-conversion -MMD -MT dependencies -miphoneos-version-min=5.1.1 -isysroot $IPHONESDK')
+        env.Append(CPPFLAGS=['-DNEED_LONG_INT'])
+        env.Append(CPPFLAGS=['-DLIBYUV_DISABLE_NEON'])
+    else: # armv7
+        env["arch"] = "arm"
+        env["bits"] = "32"
+        env['CCFLAGS'] = string.split('-fno-objc-arc -arch armv7 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -Wno-trigraphs -fpascal-strings -Wmissing-prototypes -Wreturn-type -Wparentheses -Wswitch -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-shorten-64-to-32 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk -fvisibility=hidden -Wno-sign-conversion -mthumb "-DIBOutlet=__attribute__((iboutlet))" "-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))" "-DIBAction=void)__attribute__((ibaction)" -miphoneos-version-min=5.1.1 -MMD -MT dependencies -isysroot $IPHONESDK')
+
+    if (env["arch"]=="x86"):
+        env['IPHONEPLATFORM'] = 'iPhoneSimulator'
+        env.Append(LINKFLAGS=['-arch', 'i386', '-mios-simulator-version-min=4.3',
+                              '-isysroot', '$IPHONESDK',
+                              #'-mmacosx-version-min=10.6',
+                              '-Xlinker',
+                              '-objc_abi_version',
+                              '-Xlinker', '2',
+                              '-framework', 'AudioToolbox',
+                              '-framework', 'AVFoundation',
+                              '-framework', 'CoreAudio',
+                              '-framework', 'CoreGraphics',
+                              '-framework', 'CoreMedia',
+                              '-framework', 'Foundation',
+                              '-framework', 'Security',
+                              '-framework', 'UIKit',
+                              '-framework', 'MediaPlayer',
+                              '-framework', 'OpenGLES',
+                              '-framework', 'QuartzCore',
+                              '-framework', 'SystemConfiguration',
+                              '-F$IPHONESDK',
+                              ])
+    elif (env["arch"]=="arm64"):
+        env.Append(LINKFLAGS=['-arch', 'arm64', '-Wl,-dead_strip', '-miphoneos-version-min=5.1.1',
+                                                '-isysroot', '$IPHONESDK',
+                                                #'-stdlib=libc++',
+                                                '-framework', 'Foundation',
+                                                '-framework', 'UIKit',
+                                                '-framework', 'CoreGraphics',
+                                                '-framework', 'OpenGLES',
+                                                '-framework', 'QuartzCore',
+                                                '-framework', 'CoreAudio',
+                                                '-framework', 'AudioToolbox',
+                                                '-framework', 'SystemConfiguration',
+                                                '-framework', 'Security',
+                                                #'-framework', 'AdSupport',
+                                                '-framework', 'MediaPlayer',
+                                                '-framework', 'AVFoundation',
+                                                '-framework', 'CoreMedia',
+                              ])
+    else:
+        env.Append(LINKFLAGS=['-arch', 'armv7', '-Wl,-dead_strip', '-miphoneos-version-min=5.1.1',
+                                                '-isysroot', '$IPHONESDK',
+                                                '-framework', 'Foundation',
+                                                '-framework', 'UIKit',
+                                                '-framework', 'CoreGraphics',
+                                                '-framework', 'OpenGLES',
+                                                '-framework', 'QuartzCore',
+                                                '-framework', 'CoreAudio',
+                                                '-framework', 'AudioToolbox',
+                                                '-framework', 'SystemConfiguration',
+                                                '-framework', 'Security',
+                                                #'-framework', 'AdSupport',
+                                                '-framework', 'MediaPlayer',
+                                                '-framework', 'AVFoundation',
+                                                '-framework', 'CoreMedia',
+                              ])
+
+    if env['game_center'] == 'yes':
+        env.Append(CPPFLAGS=['-fblocks', '-DGAME_CENTER_ENABLED'])
+        env.Append(LINKFLAGS=['-framework', 'GameKit'])
+
+    if env['store_kit'] == 'yes':
+        env.Append(CPPFLAGS=['-DSTOREKIT_ENABLED'])
+        env.Append(LINKFLAGS=['-framework', 'StoreKit'])
+
+    if env['icloud'] == 'yes':
+        env.Append(CPPFLAGS=['-DICLOUD_ENABLED'])
+
+    env.Append(CPPPATH = ['$IPHONESDK/usr/include', '$IPHONESDK/System/Library/Frameworks/OpenGLES.framework/Headers', '$IPHONESDK/System/Library/Frameworks/AudioUnit.framework/Headers'])
+
+    if (env["target"]=="release"):
+
+        env.Append(CCFLAGS=['-O3', '-DNS_BLOCK_ASSERTIONS=1','-Wall', '-gdwarf-2']) # removed -ffast-math
+        env.Append(LINKFLAGS=['-O3']) #
+
+    elif env["target"] == "release_debug":
+        env.Append(CCFLAGS=['-Os', '-DNS_BLOCK_ASSERTIONS=1','-Wall','-DDEBUG_ENABLED'])
+        env.Append(LINKFLAGS=['-Os'])
+        env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ENABLED'])
+
+    elif (env["target"]=="debug"):
+
+        env.Append(CCFLAGS=['-D_DEBUG', '-DDEBUG=1', '-gdwarf-2', '-Wall', '-O0', '-DDEBUG_ENABLED'])
+        env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ENABLED'])
+
+    elif (env["target"]=="profile"):
+
+        env.Append(CCFLAGS=['-g','-pg', '-Os'])
+        env.Append(LINKFLAGS=['-pg'])
+
+    if (env["ios_sim"]=="yes"): #TODO: Check if needed?
+        env['ENV']['MACOSX_DEPLOYMENT_TARGET'] = '10.6'
+    env['ENV']['CODESIGN_ALLOCATE'] = '/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate'
+    env.Append(CPPFLAGS=['-DIPHONE_ENABLED', '-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DMPC_FIXED_POINT'])
+
+    # TODO: Move that to opus module's config
+    if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
+        env.opus_fixed_point="yes"
+        if env["arch"]=="x86":
+            pass
+        elif(env["arch"]=="arm64"):
+            env.Append(CFLAGS=["-DOPUS_ARM64_OPT"])
+        else:
+            env.Append(CFLAGS=["-DOPUS_ARM_OPT"])
+
+    if env['ios_exceptions'] == 'yes':
+        env.Append(CPPFLAGS=['-fexceptions'])
+    else:
+        env.Append(CPPFLAGS=['-fno-exceptions'])
+    #env['neon_enabled']=True
+    env['S_compiler'] = '$IPHONEPATH/Developer/usr/bin/gcc'
+
+    import methods
+    env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
diff --git a/platform/javascript/SCsub b/platform/javascript/SCsub
index 59e5aa175d..07852ac206 100644
--- a/platform/javascript/SCsub
+++ b/platform/javascript/SCsub
@@ -3,20 +3,20 @@
 Import('env')
 
 javascript_files = [
-	"os_javascript.cpp",
-	"audio_driver_javascript.cpp",
-	"javascript_main.cpp",
-	"audio_server_javascript.cpp",
-	"javascript_eval.cpp"
+    "os_javascript.cpp",
+    "audio_driver_javascript.cpp",
+    "javascript_main.cpp",
+    "audio_server_javascript.cpp",
+    "javascript_eval.cpp"
 ]
 
 env_javascript = env.Clone()
 if env['target'] == "profile":
-	env_javascript.Append(CPPFLAGS=['-DPROFILER_ENABLED'])
+    env_javascript.Append(CPPFLAGS=['-DPROFILER_ENABLED'])
 
 javascript_objects=[]
 for x in javascript_files:
-	javascript_objects.append( env_javascript.Object( x ) )
+    javascript_objects.append( env_javascript.Object( x ) )
 
 env.Append(LINKFLAGS=["-s","EXPORTED_FUNCTIONS=\"['_main','_audio_server_mix_function','_main_after_fs_sync']\""])
 env.Append(LINKFLAGS=["--shell-file",'"platform/javascript/godot_shell.html"'])
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py
index b6a6a453b3..ce6149c250 100644
--- a/platform/javascript/detect.py
+++ b/platform/javascript/detect.py
@@ -3,103 +3,103 @@ import sys
 import string
 
 def is_active():
-	return True
+    return True
 
 def get_name():
-	return "JavaScript"
+    return "JavaScript"
 
 def can_build():
 
-	import os
-	if (not os.environ.has_key("EMSCRIPTEN_ROOT")):
-		return False
-	return True
+    import os
+    if (not os.environ.has_key("EMSCRIPTEN_ROOT")):
+        return False
+    return True
 
 def get_opts():
 
-	return [
-		['wasm','Compile to WebAssembly','no'],
-		['javascript_eval','Enable JavaScript eval interface','yes'],
-	]
+    return [
+        ['wasm','Compile to WebAssembly','no'],
+        ['javascript_eval','Enable JavaScript eval interface','yes'],
+    ]
 
 def get_flags():
 
-	return [
-		('tools', 'no'),
-		('builtin_zlib', 'yes'),
-		('module_etc1_enabled', 'no'),
-		('module_mpc_enabled', 'no'),
-		('module_theora_enabled', 'no'),
-	]
+    return [
+        ('tools', 'no'),
+        ('builtin_zlib', 'yes'),
+        ('module_etc1_enabled', 'no'),
+        ('module_mpc_enabled', 'no'),
+        ('module_theora_enabled', 'no'),
+    ]
 
 
 
 def configure(env):
-	env['ENV'] = os.environ;
-	env.use_windows_spawn_fix('javascript')
+    env['ENV'] = os.environ;
+    env.use_windows_spawn_fix('javascript')
 
-	env.Append(CPPPATH=['#platform/javascript'])
+    env.Append(CPPPATH=['#platform/javascript'])
 
-	em_path=os.environ["EMSCRIPTEN_ROOT"]
+    em_path=os.environ["EMSCRIPTEN_ROOT"]
 
-	env['ENV']['PATH'] = em_path+":"+env['ENV']['PATH']
-	env['CC'] = em_path+'/emcc'
-	env['CXX'] = em_path+'/emcc'
-	#env['AR'] = em_path+"/emar"
-	env['AR'] = em_path+"/emcc"
-	env['ARFLAGS'] = "-o"
+    env['ENV']['PATH'] = em_path+":"+env['ENV']['PATH']
+    env['CC'] = em_path+'/emcc'
+    env['CXX'] = em_path+'/emcc'
+    #env['AR'] = em_path+"/emar"
+    env['AR'] = em_path+"/emcc"
+    env['ARFLAGS'] = "-o"
 
 #	env['RANLIB'] = em_path+"/emranlib"
-	env['RANLIB'] = em_path + "/emcc"
-	env['OBJSUFFIX'] = '.bc'
-	env['LIBSUFFIX'] = '.bc'
-	env['CCCOM'] = "$CC -o $TARGET $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES"
-	env['CXXCOM'] = "$CC -o $TARGET $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES"
+    env['RANLIB'] = em_path + "/emcc"
+    env['OBJSUFFIX'] = '.bc'
+    env['LIBSUFFIX'] = '.bc'
+    env['CCCOM'] = "$CC -o $TARGET $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES"
+    env['CXXCOM'] = "$CC -o $TARGET $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES"
 
 #	env.Append(LIBS=['c','m','stdc++','log','GLESv1_CM','GLESv2'])
 
 #	env["LINKFLAGS"]= string.split(" -g --sysroot="+ld_sysroot+" -Wl,--no-undefined -Wl,-z,noexecstack ")
 
-	if (env["target"]=="release"):
-		env.Append(CCFLAGS=['-O2'])
-	elif (env["target"]=="release_debug"):
-		env.Append(CCFLAGS=['-O2','-DDEBUG_ENABLED'])
-	elif (env["target"]=="debug"):
-		env.Append(CCFLAGS=['-D_DEBUG', '-Wall', '-O2', '-DDEBUG_ENABLED'])
-		#env.Append(CCFLAGS=['-D_DEBUG', '-Wall', '-g4', '-DDEBUG_ENABLED'])
-		env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ALLOC'])
-
-	# TODO: Move that to opus module's config
-	if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
-		env.opus_fixed_point = "yes"
-
-	env.Append(CPPFLAGS=["-fno-exceptions",'-DNO_SAFE_CAST','-fno-rtti'])
-	env.Append(CPPFLAGS=['-DJAVASCRIPT_ENABLED', '-DUNIX_ENABLED', '-DPTHREAD_NO_RENAME', '-DNO_FCNTL','-DMPC_FIXED_POINT','-DTYPED_METHOD_BIND','-DNO_THREADS'])
-	env.Append(CPPFLAGS=['-DGLES2_ENABLED'])
-	env.Append(CPPFLAGS=['-DGLES_NO_CLIENT_ARRAYS'])
-	env.Append(CPPFLAGS=['-s','FULL_ES2=1'])
+    if (env["target"]=="release"):
+        env.Append(CCFLAGS=['-O2'])
+    elif (env["target"]=="release_debug"):
+        env.Append(CCFLAGS=['-O2','-DDEBUG_ENABLED'])
+    elif (env["target"]=="debug"):
+        env.Append(CCFLAGS=['-D_DEBUG', '-Wall', '-O2', '-DDEBUG_ENABLED'])
+        #env.Append(CCFLAGS=['-D_DEBUG', '-Wall', '-g4', '-DDEBUG_ENABLED'])
+        env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ALLOC'])
+
+    # TODO: Move that to opus module's config
+    if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
+        env.opus_fixed_point = "yes"
+
+    env.Append(CPPFLAGS=["-fno-exceptions",'-DNO_SAFE_CAST','-fno-rtti'])
+    env.Append(CPPFLAGS=['-DJAVASCRIPT_ENABLED', '-DUNIX_ENABLED', '-DPTHREAD_NO_RENAME', '-DNO_FCNTL','-DMPC_FIXED_POINT','-DTYPED_METHOD_BIND','-DNO_THREADS'])
+    env.Append(CPPFLAGS=['-DGLES2_ENABLED'])
+    env.Append(CPPFLAGS=['-DGLES_NO_CLIENT_ARRAYS'])
+    env.Append(CPPFLAGS=['-s','FULL_ES2=1'])
 #	env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED','-DMPC_FIXED_POINT'])
 
-	if env['wasm'] == 'yes':
-		env.Append(LINKFLAGS=['-s','BINARYEN=1'])
-		env.Append(LINKFLAGS=['-s','\'BINARYEN_METHOD="native-wasm"\''])
-		env["PROGSUFFIX"]+=".webassembly"
-	else:
-		env.Append(CPPFLAGS=['-s','ASM_JS=1'])
-		env.Append(LINKFLAGS=['-s','ASM_JS=1'])
+    if env['wasm'] == 'yes':
+        env.Append(LINKFLAGS=['-s','BINARYEN=1'])
+        env.Append(LINKFLAGS=['-s','\'BINARYEN_METHOD="native-wasm"\''])
+        env["PROGSUFFIX"]+=".webassembly"
+    else:
+        env.Append(CPPFLAGS=['-s','ASM_JS=1'])
+        env.Append(LINKFLAGS=['-s','ASM_JS=1'])
 
-	if env['javascript_eval'] == 'yes':
-		env.Append(CPPFLAGS=['-DJAVASCRIPT_EVAL_ENABLED'])
+    if env['javascript_eval'] == 'yes':
+        env.Append(CPPFLAGS=['-DJAVASCRIPT_EVAL_ENABLED'])
 
-	env.Append(LINKFLAGS=['-O2'])
-	#env.Append(LINKFLAGS=['-g4'])
+    env.Append(LINKFLAGS=['-O2'])
+    #env.Append(LINKFLAGS=['-g4'])
 
-	#print "CCCOM is:", env.subst('$CCCOM')
-	#print "P: ", env['p'], " Platofrm: ", env['platform']
+    #print "CCCOM is:", env.subst('$CCCOM')
+    #print "P: ", env['p'], " Platofrm: ", env['platform']
 
-	import methods
+    import methods
 
-	env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	#env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )
+    env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    #env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )
diff --git a/platform/osx/SCsub b/platform/osx/SCsub
index 217dee81eb..68484b7288 100644
--- a/platform/osx/SCsub
+++ b/platform/osx/SCsub
@@ -3,13 +3,13 @@
 Import('env')
 
 files = [
-	'os_osx.mm',
-	'godot_main_osx.mm',
-	'audio_driver_osx.cpp',
-	'sem_osx.cpp',
-#	'context_gl_osx.cpp',
-	'dir_access_osx.mm',
-	'joystick_osx.cpp',
-	]
+    'os_osx.mm',
+    'godot_main_osx.mm',
+    'audio_driver_osx.cpp',
+    'sem_osx.cpp',
+    #	'context_gl_osx.cpp',
+    'dir_access_osx.mm',
+    'joystick_osx.cpp',
+]
 
 env.Program('#bin/godot',files)
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index 4e772e37eb..358c4ef015 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -4,99 +4,99 @@ import sys
 
 
 def is_active():
-	return True
+    return True
 
 def get_name():
-	return "OSX"
+    return "OSX"
 
 def can_build():
 
-	if (sys.platform == "darwin" or os.environ.has_key("OSXCROSS_ROOT")):
-		return True
+    if (sys.platform == "darwin" or os.environ.has_key("OSXCROSS_ROOT")):
+        return True
 
 
-	return False
+    return False
 
 def get_opts():
 
-	return [
-	    ('force_64_bits','Force 64 bits binary','no'),
-	    ('osxcross_sdk','OSXCross SDK version','darwin14'),
+    return [
+        ('force_64_bits','Force 64 bits binary','no'),
+        ('osxcross_sdk','OSXCross SDK version','darwin14'),
 
-	 ]
+    ]
 
 def get_flags():
 
-	return [
-	]
+    return [
+    ]
 
 
 
 def configure(env):
 
-	env.Append(CPPPATH=['#platform/osx'])
+    env.Append(CPPPATH=['#platform/osx'])
 
-	if (env["bits"]=="default"):
-	    env["bits"]="32"
+    if (env["bits"]=="default"):
+        env["bits"]="32"
 
-	if (env["target"]=="release"):
+    if (env["target"]=="release"):
 
-		env.Append(CCFLAGS=['-O2','-ffast-math','-fomit-frame-pointer','-ftree-vectorize','-msse2'])
+        env.Append(CCFLAGS=['-O2','-ffast-math','-fomit-frame-pointer','-ftree-vectorize','-msse2'])
 
-	elif (env["target"]=="release_debug"):
+    elif (env["target"]=="release_debug"):
 
-		env.Append(CCFLAGS=['-O2','-DDEBUG_ENABLED'])
+        env.Append(CCFLAGS=['-O2','-DDEBUG_ENABLED'])
 
-	elif (env["target"]=="debug"):
+    elif (env["target"]=="debug"):
 
-		env.Append(CCFLAGS=['-g3', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
+        env.Append(CCFLAGS=['-g3', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
 
 
 
-	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'])
-		elif (env["bits"]=="32"):
-		    env.Append(CCFLAGS=['-arch', 'i386'])
-		    env.Append(LINKFLAGS=['-arch', 'i386'])
-		else:
-		    env.Append(CCFLAGS=['-arch', 'i386', '-arch', 'x86_64'])
-		    env.Append(LINKFLAGS=['-arch', 'i386', '-arch', 'x86_64'])
-	else:
-		#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"]+"-"
+    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'])
+        elif (env["bits"]=="32"):
+            env.Append(CCFLAGS=['-arch', 'i386'])
+            env.Append(LINKFLAGS=['-arch', 'i386'])
+        else:
+            env.Append(CCFLAGS=['-arch', 'i386', '-arch', 'x86_64'])
+            env.Append(LINKFLAGS=['-arch', 'i386', '-arch', 'x86_64'])
+    else:
+        #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['CC'] = basecmd+"cc"
+        env['CXX'] = basecmd+"c++"
+        env['AR'] = basecmd+"ar"
+        env['RANLIB'] = basecmd+"ranlib"
+        env['AS'] = basecmd+"as"
 
 
-	env.Append(CPPFLAGS=["-DAPPLE_STYLE_KEYS"])
-	env.Append(CPPFLAGS=['-DUNIX_ENABLED','-DGLES2_ENABLED','-DOSX_ENABLED'])
-	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(CPPFLAGS=["-DAPPLE_STYLE_KEYS"])
+    env.Append(CPPFLAGS=['-DUNIX_ENABLED','-DGLES2_ENABLED','-DOSX_ENABLED'])
+    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'])
 
-	if (env["CXX"]=="clang++"):
-		env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
-		env["CC"]="clang"
-		env["LD"]="clang++"
+    if (env["CXX"]=="clang++"):
+        env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
+        env["CC"]="clang"
+        env["LD"]="clang++"
 
-	import methods
+    import methods
 
-	env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	#env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )
+    env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    #env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )
 
-	env["x86_libtheora_opt_gcc"]=True
+    env["x86_libtheora_opt_gcc"]=True
diff --git a/platform/server/SCsub b/platform/server/SCsub
index 12758c5db0..d53a003288 100644
--- a/platform/server/SCsub
+++ b/platform/server/SCsub
@@ -4,7 +4,7 @@ Import('env')
 
 
 common_server=[\
-	"os_server.cpp",\
+    "os_server.cpp",\
 ]
 
 env.Program('#bin/godot_server',['godot_server.cpp']+common_server)
diff --git a/platform/server/detect.py b/platform/server/detect.py
index ce14100fd0..c6e9d45f93 100644
--- a/platform/server/detect.py
+++ b/platform/server/detect.py
@@ -4,73 +4,73 @@ import sys
 
 
 def is_active():
-	return True
+    return True
 
 def get_name():
-	return "Server"
+    return "Server"
 
 
 def can_build():
 
-	if (os.name!="posix"):
-		return False
+    if (os.name!="posix"):
+        return False
 
-	return True # enabled
+    return True # enabled
 
 def get_opts():
 
-	return [
-	('use_llvm','Use llvm compiler','no'),
-	('force_32_bits','Force 32 bits binary','no')
-	]
+    return [
+        ('use_llvm','Use llvm compiler','no'),
+        ('force_32_bits','Force 32 bits binary','no')
+    ]
 
 def get_flags():
 
-	return [
-	]
+    return [
+    ]
 
 
 
 def configure(env):
 
-	env.Append(CPPPATH=['#platform/server'])
-	if (env["use_llvm"]=="yes"):
-		env["CC"]="clang"
-		env["CXX"]="clang++"
-		env["LD"]="clang++"
+    env.Append(CPPPATH=['#platform/server'])
+    if (env["use_llvm"]=="yes"):
+        env["CC"]="clang"
+        env["CXX"]="clang++"
+        env["LD"]="clang++"
 
-	is64=sys.maxsize > 2**32
+    is64=sys.maxsize > 2**32
 
-	if (env["bits"]=="default"):
-		if (is64):
-			env["bits"]="64"
-		else:
-			env["bits"]="32"
+    if (env["bits"]=="default"):
+        if (is64):
+            env["bits"]="64"
+        else:
+            env["bits"]="32"
 
 
-	#if (env["tools"]=="no"):
-	#	#no tools suffix
-	#	env['OBJSUFFIX'] = ".nt"+env['OBJSUFFIX']
-	#	env['LIBSUFFIX'] = ".nt"+env['LIBSUFFIX']
+    #if (env["tools"]=="no"):
+    #	#no tools suffix
+    #	env['OBJSUFFIX'] = ".nt"+env['OBJSUFFIX']
+    #	env['LIBSUFFIX'] = ".nt"+env['LIBSUFFIX']
 
 
-	if (env["target"]=="release"):
+    if (env["target"]=="release"):
 
-		env.Append(CCFLAGS=['-O2','-ffast-math','-fomit-frame-pointer'])
+        env.Append(CCFLAGS=['-O2','-ffast-math','-fomit-frame-pointer'])
 
-	elif (env["target"]=="release_debug"):
+    elif (env["target"]=="release_debug"):
 
-		env.Append(CCFLAGS=['-O2','-ffast-math','-DDEBUG_ENABLED'])
+        env.Append(CCFLAGS=['-O2','-ffast-math','-DDEBUG_ENABLED'])
 
-	elif (env["target"]=="debug"):
+    elif (env["target"]=="debug"):
 
-		env.Append(CCFLAGS=['-g2', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
+        env.Append(CCFLAGS=['-g2', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
 
-	env.Append(CPPFLAGS=['-DSERVER_ENABLED','-DUNIX_ENABLED'])
-	env.Append(LIBS=['pthread','z']) #TODO detect linux/BSD!
+    env.Append(CPPFLAGS=['-DSERVER_ENABLED','-DUNIX_ENABLED'])
+    env.Append(LIBS=['pthread','z']) #TODO detect linux/BSD!
 
-	if (env["CXX"]=="clang++"):
-		env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
-		env["CC"]="clang"
-		env["LD"]="clang++"
+    if (env["CXX"]=="clang++"):
+        env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
+        env["CC"]="clang"
+        env["LD"]="clang++"
 
diff --git a/platform/windows/SCsub b/platform/windows/SCsub
index e53eb7af34..00568952ea 100644
--- a/platform/windows/SCsub
+++ b/platform/windows/SCsub
@@ -4,14 +4,14 @@ Import('env')
 
 
 common_win=[
-	"context_gl_win.cpp",
-	"os_windows.cpp",
-	"ctxgl_procaddr.cpp",
-	"key_mapping_win.cpp",
-	"tcp_server_winsock.cpp",
-	"packet_peer_udp_winsock.cpp",
-	"stream_peer_winsock.cpp",
-	"joystick.cpp",
+    "context_gl_win.cpp",
+    "os_windows.cpp",
+    "ctxgl_procaddr.cpp",
+    "key_mapping_win.cpp",
+    "tcp_server_winsock.cpp",
+    "packet_peer_udp_winsock.cpp",
+    "stream_peer_winsock.cpp",
+    "joystick.cpp",
 ]
 
 restarget="godot_res"+env["OBJSUFFIX"]
@@ -24,6 +24,6 @@ env.Program('#bin/godot',['godot_win.cpp']+common_win,PROGSUFFIX=env["PROGSUFFIX
 
 # Microsoft Visual Studio Project Generation
 if (env['vsproj'])=="yes":
-	env.vs_srcs = env.vs_srcs + ["platform/windows/godot_win.cpp"]
-	for x in common_win:
-		env.vs_srcs = env.vs_srcs + ["platform/windows/" + str(x)]
+    env.vs_srcs = env.vs_srcs + ["platform/windows/godot_win.cpp"]
+    for x in common_win:
+        env.vs_srcs = env.vs_srcs + ["platform/windows/" + str(x)]
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index 7ae0100762..325f2838b2 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -100,299 +100,299 @@ import sys
 import methods
 
 def is_active():
-	return True
+    return True
 
 def get_name():
-        return "Windows"
+    return "Windows"
 
 def can_build():
 
-	if (os.name=="nt"):
-		#building natively on windows!
-		if ( os.getenv("VCINSTALLDIR") ):
-			return True
-		else:
-			print("\nMSVC not detected, attempting Mingw.")
-			mingw32 = ""
-			mingw64 = ""
-			if ( os.getenv("MINGW32_PREFIX") ) :
-				mingw32 = os.getenv("MINGW32_PREFIX")
-			if ( os.getenv("MINGW64_PREFIX") ) :
-				mingw64 = os.getenv("MINGW64_PREFIX")
-
-			test = "gcc --version > NUL 2>&1"
-			if os.system(test)!= 0 and os.system(mingw32+test)!=0 and os.system(mingw64+test)!=0 :
-				print("- could not detect gcc.")
-				print("Please, make sure a path to a Mingw /bin directory is accessible into the environment PATH.\n")
-				return False
-			else:
-				print("- gcc detected.")
-
-			return True
-
-	if (os.name=="posix"):
-
-		mingw = "i586-mingw32msvc-"
-		mingw64 = "x86_64-w64-mingw32-"
-		mingw32 = "i686-w64-mingw32-"
-
-		if (os.getenv("MINGW32_PREFIX")):
-			mingw32=os.getenv("MINGW32_PREFIX")
-			mingw = mingw32
-		if (os.getenv("MINGW64_PREFIX")):
-			mingw64=os.getenv("MINGW64_PREFIX")
-
-		test = "gcc --version &>/dev/null"
-		if (os.system(mingw+test) == 0 or os.system(mingw64+test) == 0 or os.system(mingw32+test) == 0):
-			return True
-
-	return False
+    if (os.name=="nt"):
+        #building natively on windows!
+        if ( os.getenv("VCINSTALLDIR") ):
+            return True
+        else:
+            print("\nMSVC not detected, attempting Mingw.")
+            mingw32 = ""
+            mingw64 = ""
+            if ( os.getenv("MINGW32_PREFIX") ) :
+                mingw32 = os.getenv("MINGW32_PREFIX")
+            if ( os.getenv("MINGW64_PREFIX") ) :
+                mingw64 = os.getenv("MINGW64_PREFIX")
+
+            test = "gcc --version > NUL 2>&1"
+            if os.system(test)!= 0 and os.system(mingw32+test)!=0 and os.system(mingw64+test)!=0 :
+                print("- could not detect gcc.")
+                print("Please, make sure a path to a Mingw /bin directory is accessible into the environment PATH.\n")
+                return False
+            else:
+                print("- gcc detected.")
+
+            return True
+
+    if (os.name=="posix"):
+
+        mingw = "i586-mingw32msvc-"
+        mingw64 = "x86_64-w64-mingw32-"
+        mingw32 = "i686-w64-mingw32-"
+
+        if (os.getenv("MINGW32_PREFIX")):
+            mingw32=os.getenv("MINGW32_PREFIX")
+            mingw = mingw32
+        if (os.getenv("MINGW64_PREFIX")):
+            mingw64=os.getenv("MINGW64_PREFIX")
+
+        test = "gcc --version &>/dev/null"
+        if (os.system(mingw+test) == 0 or os.system(mingw64+test) == 0 or os.system(mingw32+test) == 0):
+            return True
+
+    return False
 
 def get_opts():
 
-	mingw=""
-	mingw32=""
-	mingw64=""
-	if ( os.name == "posix" ):
-		mingw = "i586-mingw32msvc-"
-		mingw32 = "i686-w64-mingw32-"
-		mingw64 = "x86_64-w64-mingw32-"
+    mingw=""
+    mingw32=""
+    mingw64=""
+    if ( os.name == "posix" ):
+        mingw = "i586-mingw32msvc-"
+        mingw32 = "i686-w64-mingw32-"
+        mingw64 = "x86_64-w64-mingw32-"
 
-		if os.system(mingw32+"gcc --version &>/dev/null") != 0 :
-			mingw32 = mingw
+        if os.system(mingw32+"gcc --version &>/dev/null") != 0 :
+            mingw32 = mingw
 
-	if (os.getenv("MINGW32_PREFIX")):
-		mingw32=os.getenv("MINGW32_PREFIX")
-		mingw = mingw32
-	if (os.getenv("MINGW64_PREFIX")):
-		mingw64=os.getenv("MINGW64_PREFIX")
+    if (os.getenv("MINGW32_PREFIX")):
+        mingw32=os.getenv("MINGW32_PREFIX")
+        mingw = mingw32
+    if (os.getenv("MINGW64_PREFIX")):
+        mingw64=os.getenv("MINGW64_PREFIX")
 
 
-	return [
-		('mingw_prefix','Mingw Prefix',mingw32),
-		('mingw_prefix_64','Mingw Prefix 64 bits',mingw64),
-	]
+    return [
+        ('mingw_prefix','Mingw Prefix',mingw32),
+        ('mingw_prefix_64','Mingw Prefix 64 bits',mingw64),
+    ]
 
 def get_flags():
 
-	return [
-		('builtin_zlib', 'yes'),
-		('openssl','builtin'), #use builtin openssl
-	]
+    return [
+        ('builtin_zlib', 'yes'),
+        ('openssl','builtin'), #use builtin openssl
+    ]
 
 def build_res_file( target, source, env ):
 
-	cmdbase = ""
-	if (env["bits"] == "32"):
-		cmdbase = env['mingw_prefix']
-	else:
-		cmdbase = env['mingw_prefix_64']
-	CPPPATH = env['CPPPATH']
-	cmdbase = cmdbase + 'windres --include-dir . '
-	import subprocess
-	for x in range(len(source)):
-		cmd = cmdbase + '-i ' + str(source[x]) + ' -o ' + str(target[x])
-		try:
-			out = subprocess.Popen(cmd,shell = True,stderr = subprocess.PIPE).communicate()
-			if len(out[1]):
-				return 1
-		except:
-			return 1
-	return 0
+    cmdbase = ""
+    if (env["bits"] == "32"):
+        cmdbase = env['mingw_prefix']
+    else:
+        cmdbase = env['mingw_prefix_64']
+    CPPPATH = env['CPPPATH']
+    cmdbase = cmdbase + 'windres --include-dir . '
+    import subprocess
+    for x in range(len(source)):
+        cmd = cmdbase + '-i ' + str(source[x]) + ' -o ' + str(target[x])
+        try:
+            out = subprocess.Popen(cmd,shell = True,stderr = subprocess.PIPE).communicate()
+            if len(out[1]):
+                return 1
+        except:
+            return 1
+    return 0
 
 def configure(env):
 
-	env.Append(CPPPATH=['#platform/windows'])
-	env['is_mingw']=False
-	if (os.name=="nt" and os.getenv("VCINSTALLDIR") ):
-		#build using visual studio
-		env['ENV']['TMP'] = os.environ['TMP']
-		env.Append(CPPPATH=['#platform/windows/include'])
-		env.Append(LIBPATH=['#platform/windows/lib'])
-
-
-		if (env["target"]=="release"):
-
-			env.Append(CCFLAGS=['/O2'])
-			env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])
-			env.Append(LINKFLAGS=['/ENTRY:mainCRTStartup'])
-
-		elif (env["target"]=="release_debug"):
-
-			env.Append(CCFLAGS=['/O2','/DDEBUG_ENABLED'])
-			env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
-		elif (env["target"]=="debug_release"):
-
-			env.Append(CCFLAGS=['/Z7','/Od'])
-			env.Append(LINKFLAGS=['/DEBUG'])
-			env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])
-			env.Append(LINKFLAGS=['/ENTRY:mainCRTStartup'])
-
-		elif (env["target"]=="debug"):
-
-			env.Append(CCFLAGS=['/Z7','/DDEBUG_ENABLED','/DDEBUG_MEMORY_ENABLED','/DD3D_DEBUG_INFO','/Od'])
-			env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
-			env.Append(LINKFLAGS=['/DEBUG'])
-
-
-		env.Append(CCFLAGS=['/MT','/Gd','/GR','/nologo'])
-		env.Append(CXXFLAGS=['/TP'])
-		env.Append(CPPFLAGS=['/DMSVC', '/GR', ])
-		env.Append(CCFLAGS=['/I'+os.getenv("WindowsSdkDir")+"/Include"])
-		env.Append(CCFLAGS=['/DWINDOWS_ENABLED'])
-		env.Append(CCFLAGS=['/DRTAUDIO_ENABLED'])
-		env.Append(CCFLAGS=['/DWIN32'])
-		env.Append(CCFLAGS=['/DTYPED_METHOD_BIND'])
-
-		env.Append(CCFLAGS=['/DGLES2_ENABLED'])
-		LIBS=['winmm','opengl32','dsound','kernel32','ole32','oleaut32','user32','gdi32', 'IPHLPAPI','Shlwapi', 'wsock32','Ws2_32', 'shell32','advapi32','dinput8','dxguid']
-		env.Append(LINKFLAGS=[p+env["LIBSUFFIX"] for p in LIBS])
-
-		env.Append(LIBPATH=[os.getenv("WindowsSdkDir")+"/Lib"])
-                if (os.getenv("DXSDK_DIR")):
-                        DIRECTX_PATH=os.getenv("DXSDK_DIR")
-                else:
-                        DIRECTX_PATH="C:/Program Files/Microsoft DirectX SDK (March 2009)"
+    env.Append(CPPPATH=['#platform/windows'])
+    env['is_mingw']=False
+    if (os.name=="nt" and os.getenv("VCINSTALLDIR") ):
+        #build using visual studio
+        env['ENV']['TMP'] = os.environ['TMP']
+        env.Append(CPPPATH=['#platform/windows/include'])
+        env.Append(LIBPATH=['#platform/windows/lib'])
+
+
+        if (env["target"]=="release"):
+
+            env.Append(CCFLAGS=['/O2'])
+            env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])
+            env.Append(LINKFLAGS=['/ENTRY:mainCRTStartup'])
+
+        elif (env["target"]=="release_debug"):
+
+            env.Append(CCFLAGS=['/O2','/DDEBUG_ENABLED'])
+            env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
+        elif (env["target"]=="debug_release"):
+
+            env.Append(CCFLAGS=['/Z7','/Od'])
+            env.Append(LINKFLAGS=['/DEBUG'])
+            env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])
+            env.Append(LINKFLAGS=['/ENTRY:mainCRTStartup'])
+
+        elif (env["target"]=="debug"):
+
+            env.Append(CCFLAGS=['/Z7','/DDEBUG_ENABLED','/DDEBUG_MEMORY_ENABLED','/DD3D_DEBUG_INFO','/Od'])
+            env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
+            env.Append(LINKFLAGS=['/DEBUG'])
+
+
+        env.Append(CCFLAGS=['/MT','/Gd','/GR','/nologo'])
+        env.Append(CXXFLAGS=['/TP'])
+        env.Append(CPPFLAGS=['/DMSVC', '/GR', ])
+        env.Append(CCFLAGS=['/I'+os.getenv("WindowsSdkDir")+"/Include"])
+        env.Append(CCFLAGS=['/DWINDOWS_ENABLED'])
+        env.Append(CCFLAGS=['/DRTAUDIO_ENABLED'])
+        env.Append(CCFLAGS=['/DWIN32'])
+        env.Append(CCFLAGS=['/DTYPED_METHOD_BIND'])
+
+        env.Append(CCFLAGS=['/DGLES2_ENABLED'])
+        LIBS=['winmm','opengl32','dsound','kernel32','ole32','oleaut32','user32','gdi32', 'IPHLPAPI','Shlwapi', 'wsock32','Ws2_32', 'shell32','advapi32','dinput8','dxguid']
+        env.Append(LINKFLAGS=[p+env["LIBSUFFIX"] for p in LIBS])
+
+        env.Append(LIBPATH=[os.getenv("WindowsSdkDir")+"/Lib"])
+        if (os.getenv("DXSDK_DIR")):
+            DIRECTX_PATH=os.getenv("DXSDK_DIR")
+        else:
+            DIRECTX_PATH="C:/Program Files/Microsoft DirectX SDK (March 2009)"
 
-                if (os.getenv("VCINSTALLDIR")):
-                        VC_PATH=os.getenv("VCINSTALLDIR")
-                else:
-                        VC_PATH=""
+        if (os.getenv("VCINSTALLDIR")):
+            VC_PATH=os.getenv("VCINSTALLDIR")
+        else:
+            VC_PATH=""
 
-		env.Append(CCFLAGS=["/I" + p for p in os.getenv("INCLUDE").split(";")])
-		env.Append(LIBPATH=[p for p in os.getenv("LIB").split(";")])
-		env.Append(CCFLAGS=["/I"+DIRECTX_PATH+"/Include"])
-		env.Append(LIBPATH=[DIRECTX_PATH+"/Lib/x86"])
-		env['ENV'] = os.environ;
+        env.Append(CCFLAGS=["/I" + p for p in os.getenv("INCLUDE").split(";")])
+        env.Append(LIBPATH=[p for p in os.getenv("LIB").split(";")])
+        env.Append(CCFLAGS=["/I"+DIRECTX_PATH+"/Include"])
+        env.Append(LIBPATH=[DIRECTX_PATH+"/Lib/x86"])
+        env['ENV'] = os.environ;
 
-		# This detection function needs the tools env (that is env['ENV'], not SCons's env), and that is why it's this far bellow in the code
-		compiler_version_str = methods.detect_visual_c_compiler_version(env['ENV'])
+        # This detection function needs the tools env (that is env['ENV'], not SCons's env), and that is why it's this far bellow in the code
+        compiler_version_str = methods.detect_visual_c_compiler_version(env['ENV'])
 
-		# Note: this detection/override code from here onward should be here instead of in SConstruct because it's platform and compiler specific (MSVC/Windows)
-		if(env["bits"] != "default"):
-                        print "Error: bits argument is disabled for MSVC"
-                        print ("Bits argument is not supported for MSVC compilation. Architecture depends on the Native/Cross Compile Tools Prompt/Developer Console (or Visual Studio settings)"
-                               +" that is being used to run SCons. As a consequence, bits argument is disabled. Run scons again without bits argument (example: scons p=windows) and SCons will attempt to detect what MSVC compiler"
-                               +" will be executed and inform you.")
-                        sys.exit()
+        # Note: this detection/override code from here onward should be here instead of in SConstruct because it's platform and compiler specific (MSVC/Windows)
+        if(env["bits"] != "default"):
+            print "Error: bits argument is disabled for MSVC"
+            print ("Bits argument is not supported for MSVC compilation. Architecture depends on the Native/Cross Compile Tools Prompt/Developer Console (or Visual Studio settings)"
+                   +" that is being used to run SCons. As a consequence, bits argument is disabled. Run scons again without bits argument (example: scons p=windows) and SCons will attempt to detect what MSVC compiler"
+                   +" will be executed and inform you.")
+            sys.exit()
 
-		# Forcing bits argument because MSVC does not have a flag to set this through SCons... it's different compilers (cl.exe's) called from the propper command prompt
-                # that decide the architecture that is build for. Scons can only detect the os.getenviron (because vsvarsall.bat sets a lot of stuff for cl.exe to work with)
-                env["bits"]="32"
-		env["x86_libtheora_opt_vc"]=True
+        # Forcing bits argument because MSVC does not have a flag to set this through SCons... it's different compilers (cl.exe's) called from the propper command prompt
+        # that decide the architecture that is build for. Scons can only detect the os.getenviron (because vsvarsall.bat sets a lot of stuff for cl.exe to work with)
+        env["bits"]="32"
+        env["x86_libtheora_opt_vc"]=True
 
-		print "Detected MSVC compiler: "+compiler_version_str
-		# If building for 64bit architecture, disable assembly optimisations for 32 bit builds (theora as of writting)... vc compiler for 64bit can not compile _asm
-		if(compiler_version_str == "amd64" or compiler_version_str == "x86_amd64"):
-                        env["bits"]="64"
-                        env["x86_libtheora_opt_vc"]=False
-                        print "Compiled program architecture will be a 64 bit executable (forcing bits=64)."
-                elif (compiler_version_str=="x86" or compiler_version_str == "amd64_x86"):
-                        print "Compiled program architecture will be a 32 bit executable. (forcing bits=32)."
-                else:
-                        print "Failed to detect MSVC compiler architecture version... Defaulting to 32bit executable settings (forcing bits=32). Compilation attempt will continue, but SCons can not detect for what architecture this build is compiled for. You should check your settings/compilation setup."
-		if env["bits"]=="64":
-			env.Append(CCFLAGS=['/D_WIN64'])
+        print "Detected MSVC compiler: "+compiler_version_str
+        # If building for 64bit architecture, disable assembly optimisations for 32 bit builds (theora as of writting)... vc compiler for 64bit can not compile _asm
+        if(compiler_version_str == "amd64" or compiler_version_str == "x86_amd64"):
+            env["bits"]="64"
+            env["x86_libtheora_opt_vc"]=False
+            print "Compiled program architecture will be a 64 bit executable (forcing bits=64)."
+        elif (compiler_version_str=="x86" or compiler_version_str == "amd64_x86"):
+            print "Compiled program architecture will be a 32 bit executable. (forcing bits=32)."
+        else:
+            print "Failed to detect MSVC compiler architecture version... Defaulting to 32bit executable settings (forcing bits=32). Compilation attempt will continue, but SCons can not detect for what architecture this build is compiled for. You should check your settings/compilation setup."
+        if env["bits"]=="64":
+            env.Append(CCFLAGS=['/D_WIN64'])
 
-		# Incremental linking fix
-		env['BUILDERS']['ProgramOriginal'] = env['BUILDERS']['Program']
-		env['BUILDERS']['Program'] = methods.precious_program
+        # Incremental linking fix
+        env['BUILDERS']['ProgramOriginal'] = env['BUILDERS']['Program']
+        env['BUILDERS']['Program'] = methods.precious_program
 
-	else:
+    else:
 
-		# Workaround for MinGW. See:
-		# http://www.scons.org/wiki/LongCmdLinesOnWin32
-		env.use_windows_spawn_fix()
+        # Workaround for MinGW. See:
+        # http://www.scons.org/wiki/LongCmdLinesOnWin32
+        env.use_windows_spawn_fix()
 
-		#build using mingw
-		if (os.name=="nt"):
-			env['ENV']['TMP'] = os.environ['TMP'] #way to go scons, you can be so stupid sometimes
-		else:
-			env["PROGSUFFIX"]=env["PROGSUFFIX"]+".exe" # for linux cross-compilation
+        #build using mingw
+        if (os.name=="nt"):
+            env['ENV']['TMP'] = os.environ['TMP'] #way to go scons, you can be so stupid sometimes
+        else:
+            env["PROGSUFFIX"]=env["PROGSUFFIX"]+".exe" # for linux cross-compilation
 
-		mingw_prefix=""
+        mingw_prefix=""
 
-		if (env["bits"]=="default"):
-			env["bits"]="32"
+        if (env["bits"]=="default"):
+            env["bits"]="32"
 
-		if (env["bits"]=="32"):
-			env.Append(LINKFLAGS=['-static'])
-			env.Append(LINKFLAGS=['-static-libgcc'])
-			env.Append(LINKFLAGS=['-static-libstdc++'])
-			mingw_prefix=env["mingw_prefix"];
-		else:
-			env.Append(LINKFLAGS=['-static'])
-			mingw_prefix=env["mingw_prefix_64"];
+        if (env["bits"]=="32"):
+            env.Append(LINKFLAGS=['-static'])
+            env.Append(LINKFLAGS=['-static-libgcc'])
+            env.Append(LINKFLAGS=['-static-libstdc++'])
+            mingw_prefix=env["mingw_prefix"];
+        else:
+            env.Append(LINKFLAGS=['-static'])
+            mingw_prefix=env["mingw_prefix_64"];
 
-		nulstr=""
+        nulstr=""
 
-		if (os.name=="posix"):
-		    nulstr=">/dev/null"
-		else:
-		    nulstr=">nul"
+        if (os.name=="posix"):
+            nulstr=">/dev/null"
+        else:
+            nulstr=">nul"
 
 
 
-		# if os.system(mingw_prefix+"gcc --version"+nulstr)!=0:
-			# #not really super consistent but..
-			# print("Can't find Windows compiler: "+mingw_prefix)
-			# sys.exit(255)
+        # if os.system(mingw_prefix+"gcc --version"+nulstr)!=0:
+            # #not really super consistent but..
+            # print("Can't find Windows compiler: "+mingw_prefix)
+            # sys.exit(255)
 
-		if (env["target"]=="release"):
+        if (env["target"]=="release"):
 
-			env.Append(CCFLAGS=['-msse2'])
+            env.Append(CCFLAGS=['-msse2'])
 
-			if (env["bits"]=="64"):
-				env.Append(CCFLAGS=['-O3'])
-			else:
-				env.Append(CCFLAGS=['-O2'])
+            if (env["bits"]=="64"):
+                env.Append(CCFLAGS=['-O3'])
+            else:
+                env.Append(CCFLAGS=['-O2'])
 
-			env.Append(LINKFLAGS=['-Wl,--subsystem,windows'])
+            env.Append(LINKFLAGS=['-Wl,--subsystem,windows'])
 
-		elif (env["target"]=="release_debug"):
+        elif (env["target"]=="release_debug"):
 
-			env.Append(CCFLAGS=['-O2','-DDEBUG_ENABLED'])
+            env.Append(CCFLAGS=['-O2','-DDEBUG_ENABLED'])
 
-		elif (env["target"]=="debug"):
+        elif (env["target"]=="debug"):
 
-			env.Append(CCFLAGS=['-g', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
+            env.Append(CCFLAGS=['-g', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
 
 
 
-		env["CC"]=mingw_prefix+"gcc"
-		env['AS']=mingw_prefix+"as"
-		env['CXX'] = mingw_prefix+"g++"
-		env['AR'] = mingw_prefix+"ar"
-		env['RANLIB'] = mingw_prefix+"ranlib"
-		env['LD'] = mingw_prefix+"g++"
-		env["x86_libtheora_opt_gcc"]=True
+        env["CC"]=mingw_prefix+"gcc"
+        env['AS']=mingw_prefix+"as"
+        env['CXX'] = mingw_prefix+"g++"
+        env['AR'] = mingw_prefix+"ar"
+        env['RANLIB'] = mingw_prefix+"ranlib"
+        env['LD'] = mingw_prefix+"g++"
+        env["x86_libtheora_opt_gcc"]=True
 
-		#env['CC'] = "winegcc"
-		#env['CXX'] = "wineg++"
+        #env['CC'] = "winegcc"
+        #env['CXX'] = "wineg++"
 
-		env.Append(CCFLAGS=['-DWINDOWS_ENABLED','-mwindows'])
-		env.Append(CPPFLAGS=['-DRTAUDIO_ENABLED'])
-		env.Append(CCFLAGS=['-DGLES2_ENABLED'])
-		env.Append(LIBS=['mingw32','opengl32', 'dsound', 'ole32', 'd3d9','winmm','gdi32','iphlpapi','shlwapi','wsock32','ws2_32','kernel32', 'oleaut32', 'dinput8', 'dxguid'])
+        env.Append(CCFLAGS=['-DWINDOWS_ENABLED','-mwindows'])
+        env.Append(CPPFLAGS=['-DRTAUDIO_ENABLED'])
+        env.Append(CCFLAGS=['-DGLES2_ENABLED'])
+        env.Append(LIBS=['mingw32','opengl32', 'dsound', 'ole32', 'd3d9','winmm','gdi32','iphlpapi','shlwapi','wsock32','ws2_32','kernel32', 'oleaut32', 'dinput8', 'dxguid'])
 
-		# if (env["bits"]=="32"):
-			# env.Append(LIBS=['gcc_s'])
-			# #--with-arch=i686
-			# env.Append(CPPFLAGS=['-march=i686'])
-			# env.Append(LINKFLAGS=['-march=i686'])
+        # if (env["bits"]=="32"):
+        # env.Append(LIBS=['gcc_s'])
+        # #--with-arch=i686
+        # env.Append(CPPFLAGS=['-march=i686'])
+        # env.Append(LINKFLAGS=['-march=i686'])
 
 
 
 
-		#'d3dx9d'
-		env.Append(CPPFLAGS=['-DMINGW_ENABLED'])
-		#env.Append(LINKFLAGS=['-g'])
+        #'d3dx9d'
+        env.Append(CPPFLAGS=['-DMINGW_ENABLED'])
+        #env.Append(LINKFLAGS=['-g'])
 
-		# resrc
-		env['is_mingw']=True
-		env.Append( BUILDERS = { 'RES' : env.Builder(action = build_res_file, suffix = '.o',src_suffix = '.rc') } )
+        # resrc
+        env['is_mingw']=True
+        env.Append( BUILDERS = { 'RES' : env.Builder(action = build_res_file, suffix = '.o',src_suffix = '.rc') } )
 
-	env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )
-	env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )
+    env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
diff --git a/platform/winrt/SCsub b/platform/winrt/SCsub
index 91a179084d..5259e7dc22 100644
--- a/platform/winrt/SCsub
+++ b/platform/winrt/SCsub
@@ -3,21 +3,21 @@
 Import('env')
 
 files = [
-	'thread_winrt.cpp',
-	'#platform/windows/tcp_server_winsock.cpp',
-	'#platform/windows/packet_peer_udp_winsock.cpp',
-	'#platform/windows/stream_peer_winsock.cpp',
-	'#platform/windows/key_mapping_win.cpp',
-	'joystick_winrt.cpp',
-	'gl_context_egl.cpp',
-	'app.cpp',
-	'os_winrt.cpp',
+    'thread_winrt.cpp',
+    '#platform/windows/tcp_server_winsock.cpp',
+    '#platform/windows/packet_peer_udp_winsock.cpp',
+    '#platform/windows/stream_peer_winsock.cpp',
+    '#platform/windows/key_mapping_win.cpp',
+    'joystick_winrt.cpp',
+    'gl_context_egl.cpp',
+    'app.cpp',
+    'os_winrt.cpp',
 ]
 
 if "build_angle" in env and env["build_angle"]:
-	cmd = env.AlwaysBuild(env.ANGLE('libANGLE.lib', None))
+    cmd = env.AlwaysBuild(env.ANGLE('libANGLE.lib', None))
 
 prog = env.Program('#bin/godot', files)
 
 if "build_angle" in env and env["build_angle"]:
-	env.Depends(prog, [cmd])
+    env.Depends(prog, [cmd])
diff --git a/platform/winrt/detect.py b/platform/winrt/detect.py
index a7bc62f685..06bae980e9 100644
--- a/platform/winrt/detect.py
+++ b/platform/winrt/detect.py
@@ -6,161 +6,161 @@ import methods
 
 
 def is_active():
-	return True
+    return True
 
 def get_name():
-		return "WinRT"
+    return "WinRT"
 
 def can_build():
-	if (os.name=="nt"):
-		#building natively on windows!
-		if (os.getenv("VSINSTALLDIR")):
+    if (os.name=="nt"):
+        #building natively on windows!
+        if (os.getenv("VSINSTALLDIR")):
 
-			if (os.getenv("ANGLE_SRC_PATH") == None):
-				return False
+            if (os.getenv("ANGLE_SRC_PATH") == None):
+                return False
 
-			return True
-	return False
+            return True
+    return False
 
 def get_opts():
-	return []
+    return []
 
 def get_flags():
 
-	return [
-	('tools', 'no'),
-	('builtin_zlib', 'yes'),
-	('openssl', 'builtin'),
-	('xaudio2', 'yes'),
-	]
+    return [
+        ('tools', 'no'),
+        ('builtin_zlib', 'yes'),
+        ('openssl', 'builtin'),
+        ('xaudio2', 'yes'),
+    ]
 
 
 def configure(env):
 
-	if(env["bits"] != "default"):
-		print "Error: bits argument is disabled for MSVC"
-		print ("Bits argument is not supported for MSVC compilation. Architecture depends on the Native/Cross Compile Tools Prompt/Developer Console (or Visual Studio settings)"
-			   +" that is being used to run SCons. As a consequence, bits argument is disabled. Run scons again without bits argument (example: scons p=winrt) and SCons will attempt to detect what MSVC compiler"
-			   +" will be executed and inform you.")
-		sys.exit()
+    if(env["bits"] != "default"):
+        print "Error: bits argument is disabled for MSVC"
+        print ("Bits argument is not supported for MSVC compilation. Architecture depends on the Native/Cross Compile Tools Prompt/Developer Console (or Visual Studio settings)"
+               +" that is being used to run SCons. As a consequence, bits argument is disabled. Run scons again without bits argument (example: scons p=winrt) and SCons will attempt to detect what MSVC compiler"
+               +" will be executed and inform you.")
+        sys.exit()
 
-	arch = ""
-	env['ENV'] = os.environ;
+    arch = ""
+    env['ENV'] = os.environ;
 
-	# ANGLE
-	angle_root = os.getenv("ANGLE_SRC_PATH")
-	env.Append(CPPPATH=[angle_root + '/include'])
-	jobs = str(env.GetOption("num_jobs"))
-	angle_build_cmd = "msbuild.exe " + angle_root + "/winrt/10/src/angle.sln /nologo /v:m /m:" + jobs + " /p:Configuration=Release /p:Platform="
+    # ANGLE
+    angle_root = os.getenv("ANGLE_SRC_PATH")
+    env.Append(CPPPATH=[angle_root + '/include'])
+    jobs = str(env.GetOption("num_jobs"))
+    angle_build_cmd = "msbuild.exe " + angle_root + "/winrt/10/src/angle.sln /nologo /v:m /m:" + jobs + " /p:Configuration=Release /p:Platform="
 
-	if os.path.isfile(str(os.getenv("ANGLE_SRC_PATH")) + "/winrt/10/src/angle.sln"):
-		env["build_angle"] = True
+    if os.path.isfile(str(os.getenv("ANGLE_SRC_PATH")) + "/winrt/10/src/angle.sln"):
+        env["build_angle"] = True
 
-	if os.getenv('Platform') == "ARM":
+    if os.getenv('Platform') == "ARM":
 
-		print "Compiled program architecture will be an ARM executable. (forcing bits=32)."
+        print "Compiled program architecture will be an ARM executable. (forcing bits=32)."
 
-		arch="arm"
-		env["bits"]="32"
-		env.Append(LINKFLAGS=['/MACHINE:ARM'])
-		env.Append(LIBPATH=[os.environ['VCINSTALLDIR'] + 'lib/store/arm'])
+        arch="arm"
+        env["bits"]="32"
+        env.Append(LINKFLAGS=['/MACHINE:ARM'])
+        env.Append(LIBPATH=[os.environ['VCINSTALLDIR'] + 'lib/store/arm'])
 
-		angle_build_cmd += "ARM"
+        angle_build_cmd += "ARM"
 
-		env.Append(LIBPATH=[angle_root + '/winrt/10/src/Release_ARM/lib'])
+        env.Append(LIBPATH=[angle_root + '/winrt/10/src/Release_ARM/lib'])
 
-	else:
+    else:
 
-		compiler_version_str = methods.detect_visual_c_compiler_version(env['ENV'])
+        compiler_version_str = methods.detect_visual_c_compiler_version(env['ENV'])
 
-		if(compiler_version_str == "amd64" or compiler_version_str == "x86_amd64"):
-			env["bits"]="64"
-			print "Compiled program architecture will be a x64 executable (forcing bits=64)."
-		elif (compiler_version_str=="x86" or compiler_version_str == "amd64_x86"):
-			env["bits"]="32"
-			print "Compiled program architecture will be a x86 executable. (forcing bits=32)."
-		else:
-			print "Failed to detect MSVC compiler architecture version... Defaulting to 32bit executable settings (forcing bits=32). Compilation attempt will continue, but SCons can not detect for what architecture this build is compiled for. You should check your settings/compilation setup."
-			env["bits"]="32"
+        if(compiler_version_str == "amd64" or compiler_version_str == "x86_amd64"):
+            env["bits"]="64"
+            print "Compiled program architecture will be a x64 executable (forcing bits=64)."
+        elif (compiler_version_str=="x86" or compiler_version_str == "amd64_x86"):
+            env["bits"]="32"
+            print "Compiled program architecture will be a x86 executable. (forcing bits=32)."
+        else:
+            print "Failed to detect MSVC compiler architecture version... Defaulting to 32bit executable settings (forcing bits=32). Compilation attempt will continue, but SCons can not detect for what architecture this build is compiled for. You should check your settings/compilation setup."
+            env["bits"]="32"
 
-		if (env["bits"] == "32"):
-			arch = "x86"
+        if (env["bits"] == "32"):
+            arch = "x86"
 
-			angle_build_cmd += "Win32"
+            angle_build_cmd += "Win32"
 
-			env.Append(CPPFLAGS=['/DPNG_ABORT=abort'])
-			env.Append(LINKFLAGS=['/MACHINE:X86'])
-			env.Append(LIBPATH=[os.environ['VCINSTALLDIR'] + 'lib/store'])
-			env.Append(LIBPATH=[angle_root + '/winrt/10/src/Release_Win32/lib'])
+            env.Append(CPPFLAGS=['/DPNG_ABORT=abort'])
+            env.Append(LINKFLAGS=['/MACHINE:X86'])
+            env.Append(LIBPATH=[os.environ['VCINSTALLDIR'] + 'lib/store'])
+            env.Append(LIBPATH=[angle_root + '/winrt/10/src/Release_Win32/lib'])
 
-		else:
-			arch = "x64"
+        else:
+            arch = "x64"
 
-			angle_build_cmd += "x64"
+            angle_build_cmd += "x64"
 
-			env.Append(LINKFLAGS=['/MACHINE:X64'])
-			env.Append(LIBPATH=[os.environ['VCINSTALLDIR'] + 'lib/store/amd64'])
-			env.Append(LIBPATH=[angle_root + '/winrt/10/src/Release_x64/lib'])
+            env.Append(LINKFLAGS=['/MACHINE:X64'])
+            env.Append(LIBPATH=[os.environ['VCINSTALLDIR'] + 'lib/store/amd64'])
+            env.Append(LIBPATH=[angle_root + '/winrt/10/src/Release_x64/lib'])
 
-	env.Append(CPPPATH=['#platform/winrt','#drivers/windows'])
-	env.Append(LINKFLAGS=['/MANIFEST:NO', '/NXCOMPAT', '/DYNAMICBASE', '/WINMD', '/APPCONTAINER', '/ERRORREPORT:PROMPT', '/NOLOGO', '/TLBID:1', '/NODEFAULTLIB:"kernel32.lib"', '/NODEFAULTLIB:"ole32.lib"'])
-	env.Append(CPPFLAGS=['/D','__WRL_NO_DEFAULT_LIB__','/D','WIN32'])
-	env.Append(CPPFLAGS=['/FU', os.environ['VCINSTALLDIR'] + 'lib/store/references/platform.winmd'])
-	env.Append(CPPFLAGS=['/AI', os.environ['VCINSTALLDIR'] + 'lib/store/references'])
+    env.Append(CPPPATH=['#platform/winrt','#drivers/windows'])
+    env.Append(LINKFLAGS=['/MANIFEST:NO', '/NXCOMPAT', '/DYNAMICBASE', '/WINMD', '/APPCONTAINER', '/ERRORREPORT:PROMPT', '/NOLOGO', '/TLBID:1', '/NODEFAULTLIB:"kernel32.lib"', '/NODEFAULTLIB:"ole32.lib"'])
+    env.Append(CPPFLAGS=['/D','__WRL_NO_DEFAULT_LIB__','/D','WIN32'])
+    env.Append(CPPFLAGS=['/FU', os.environ['VCINSTALLDIR'] + 'lib/store/references/platform.winmd'])
+    env.Append(CPPFLAGS=['/AI', os.environ['VCINSTALLDIR'] + 'lib/store/references'])
 
-	env.Append(LIBPATH=[os.environ['VCINSTALLDIR'] + 'lib/store/references'])
+    env.Append(LIBPATH=[os.environ['VCINSTALLDIR'] + 'lib/store/references'])
 
-	if (env["target"]=="release"):
+    if (env["target"]=="release"):
 
-		env.Append(CPPFLAGS=['/O2', '/GL'])
-		env.Append(CPPFLAGS=['/MD'])
-		env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS', '/LTCG'])
+        env.Append(CPPFLAGS=['/O2', '/GL'])
+        env.Append(CPPFLAGS=['/MD'])
+        env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS', '/LTCG'])
 
-	elif (env["target"]=="release_debug"):
+    elif (env["target"]=="release_debug"):
 
-		env.Append(CCFLAGS=['/O2','/Zi','/DDEBUG_ENABLED'])
-		env.Append(CPPFLAGS=['/MD'])
-		env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
+        env.Append(CCFLAGS=['/O2','/Zi','/DDEBUG_ENABLED'])
+        env.Append(CPPFLAGS=['/MD'])
+        env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
 
-	elif (env["target"]=="debug"):
+    elif (env["target"]=="debug"):
 
-		env.Append(CCFLAGS=['/Zi','/DDEBUG_ENABLED','/DDEBUG_MEMORY_ENABLED'])
-		env.Append(CPPFLAGS=['/MDd'])
-		env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
-		env.Append(LINKFLAGS=['/DEBUG'])
+        env.Append(CCFLAGS=['/Zi','/DDEBUG_ENABLED','/DDEBUG_MEMORY_ENABLED'])
+        env.Append(CPPFLAGS=['/MDd'])
+        env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
+        env.Append(LINKFLAGS=['/DEBUG'])
 
 
-	env.Append(CCFLAGS=string.split('/FS /MP /GS /wd"4453" /wd"28204" /wd"4291" /Zc:wchar_t /Gm- /fp:precise /D "_UNICODE" /D "UNICODE" /D "WINAPI_FAMILY=WINAPI_FAMILY_APP" /errorReport:prompt /WX- /Zc:forScope /Gd /EHsc /nologo'))
-	env.Append(CXXFLAGS=string.split('/ZW /FS'))
-	env.Append(CCFLAGS=['/AI', os.environ['VCINSTALLDIR']+'\\vcpackages', '/AI', os.environ['WINDOWSSDKDIR']+'\\References\\CommonConfiguration\\Neutral'])
+    env.Append(CCFLAGS=string.split('/FS /MP /GS /wd"4453" /wd"28204" /wd"4291" /Zc:wchar_t /Gm- /fp:precise /D "_UNICODE" /D "UNICODE" /D "WINAPI_FAMILY=WINAPI_FAMILY_APP" /errorReport:prompt /WX- /Zc:forScope /Gd /EHsc /nologo'))
+    env.Append(CXXFLAGS=string.split('/ZW /FS'))
+    env.Append(CCFLAGS=['/AI', os.environ['VCINSTALLDIR']+'\\vcpackages', '/AI', os.environ['WINDOWSSDKDIR']+'\\References\\CommonConfiguration\\Neutral'])
 
 
-	env["PROGSUFFIX"]="."+arch+env["PROGSUFFIX"]
-	env["OBJSUFFIX"]="."+arch+env["OBJSUFFIX"]
-	env["LIBSUFFIX"]="."+arch+env["LIBSUFFIX"]
+    env["PROGSUFFIX"]="."+arch+env["PROGSUFFIX"]
+    env["OBJSUFFIX"]="."+arch+env["OBJSUFFIX"]
+    env["LIBSUFFIX"]="."+arch+env["LIBSUFFIX"]
 
-	env.Append(CCFLAGS=['/DWINRT_ENABLED'])
-	env.Append(CCFLAGS=['/DWINDOWS_ENABLED'])
-	env.Append(CCFLAGS=['/DTYPED_METHOD_BIND'])
+    env.Append(CCFLAGS=['/DWINRT_ENABLED'])
+    env.Append(CCFLAGS=['/DWINDOWS_ENABLED'])
+    env.Append(CCFLAGS=['/DTYPED_METHOD_BIND'])
 
-	env.Append(CCFLAGS=['/DGLES2_ENABLED','/DGL_GLEXT_PROTOTYPES','/DEGL_EGLEXT_PROTOTYPES','/DANGLE_ENABLED'])
+    env.Append(CCFLAGS=['/DGLES2_ENABLED','/DGL_GLEXT_PROTOTYPES','/DEGL_EGLEXT_PROTOTYPES','/DANGLE_ENABLED'])
 
-	LIBS = [
-		'WindowsApp',
-		'mincore',
-		'libANGLE',
-		'libEGL',
-		'libGLESv2',
-		]
-	env.Append(LINKFLAGS=[p+".lib" for p in LIBS])
+    LIBS = [
+        'WindowsApp',
+        'mincore',
+        'libANGLE',
+        'libEGL',
+        'libGLESv2',
+    ]
+    env.Append(LINKFLAGS=[p+".lib" for p in LIBS])
 
-	# Incremental linking fix
-	env['BUILDERS']['ProgramOriginal'] = env['BUILDERS']['Program']
-	env['BUILDERS']['Program'] = methods.precious_program
+    # Incremental linking fix
+    env['BUILDERS']['ProgramOriginal'] = env['BUILDERS']['Program']
+    env['BUILDERS']['Program'] = methods.precious_program
 
-	env.Append( BUILDERS = { 'ANGLE' : env.Builder(action = angle_build_cmd) } )
+    env.Append( BUILDERS = { 'ANGLE' : env.Builder(action = angle_build_cmd) } )
 
-	env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )
-	env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )
+    env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
diff --git a/platform/x11/SCsub b/platform/x11/SCsub
index e20bd44f8d..93cd2ca267 100644
--- a/platform/x11/SCsub
+++ b/platform/x11/SCsub
@@ -4,10 +4,10 @@ Import('env')
 
 
 common_x11=[\
-	"context_gl_x11.cpp",\
-	"os_x11.cpp",\
-	"key_mapping_x11.cpp",\
-	"joystick_linux.cpp",\
+    "context_gl_x11.cpp",\
+    "os_x11.cpp",\
+    "key_mapping_x11.cpp",\
+    "joystick_linux.cpp",\
 ]
 
 env.Program('#bin/godot',['godot_x11.cpp']+common_x11)
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index e90af2c697..593e3fbb9d 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -5,236 +5,236 @@ import platform
 
 
 def is_active():
-	return True
+    return True
 
 def get_name():
-        return "X11"
+    return "X11"
 
 
 def can_build():
 
-	if (os.name!="posix"):
-		return False
+    if (os.name!="posix"):
+        return False
 
-	if sys.platform == "darwin":
-		return False # no x11 on mac for now
+    if sys.platform == "darwin":
+        return False # no x11 on mac for now
 
-	errorval=os.system("pkg-config --version > /dev/null")
+    errorval=os.system("pkg-config --version > /dev/null")
 
-	if (errorval):
-		print("pkg-config not found.. x11 disabled.")
-		return False
+    if (errorval):
+        print("pkg-config not found.. x11 disabled.")
+        return False
 
-	x11_error=os.system("pkg-config x11 --modversion > /dev/null ")
-	if (x11_error):
-		print("X11 not found.. x11 disabled.")
-		return False
+    x11_error=os.system("pkg-config x11 --modversion > /dev/null ")
+    if (x11_error):
+        print("X11 not found.. x11 disabled.")
+        return False
 
-        ssl_error=os.system("pkg-config openssl --modversion > /dev/null ")
-        if (ssl_error):
-                print("OpenSSL not found.. x11 disabled.")
-                return False
+    ssl_error=os.system("pkg-config openssl --modversion > /dev/null ")
+    if (ssl_error):
+        print("OpenSSL not found.. x11 disabled.")
+        return False
 
-	x11_error=os.system("pkg-config xcursor --modversion > /dev/null ")
-	if (x11_error):
-		print("xcursor not found.. x11 disabled.")
-		return False
+    x11_error=os.system("pkg-config xcursor --modversion > /dev/null ")
+    if (x11_error):
+        print("xcursor not found.. x11 disabled.")
+        return False
 
-	x11_error=os.system("pkg-config xinerama --modversion > /dev/null ")
-	if (x11_error):
-		print("xinerama not found.. x11 disabled.")
-		return False
+    x11_error=os.system("pkg-config xinerama --modversion > /dev/null ")
+    if (x11_error):
+        print("xinerama not found.. x11 disabled.")
+        return False
 
-	x11_error=os.system("pkg-config xrandr --modversion > /dev/null ")
-	if (x11_error):
-			print("xrandr not found.. x11 disabled.")
-			return False
+    x11_error=os.system("pkg-config xrandr --modversion > /dev/null ")
+    if (x11_error):
+        print("xrandr not found.. x11 disabled.")
+        return False
 
 
-	return True # X11 enabled
+    return True # X11 enabled
 
 def get_opts():
 
-	return [
-	('use_llvm','Use llvm compiler','no'),
-	('use_static_cpp','link stdc++ statically','no'),
-	('use_sanitizer','Use llvm compiler sanitize address','no'),
-	('use_leak_sanitizer','Use llvm compiler sanitize memory leaks','no'),
-	('pulseaudio','Detect & Use pulseaudio','yes'),
-	('udev','Use udev for gamepad connection callbacks','no'),
-	('debug_release', 'Add debug symbols to release version','no'),
-	]
+    return [
+        ('use_llvm','Use llvm compiler','no'),
+        ('use_static_cpp','link stdc++ statically','no'),
+        ('use_sanitizer','Use llvm compiler sanitize address','no'),
+        ('use_leak_sanitizer','Use llvm compiler sanitize memory leaks','no'),
+        ('pulseaudio','Detect & Use pulseaudio','yes'),
+        ('udev','Use udev for gamepad connection callbacks','no'),
+        ('debug_release', 'Add debug symbols to release version','no'),
+    ]
 
 def get_flags():
 
-	return [
-	("openssl", "system"),
-	('freetype', 'system'),
-	('libpng', 'system'),
-	]
+    return [
+        ("openssl", "system"),
+        ('freetype', 'system'),
+        ('libpng', 'system'),
+    ]
 
 
 
 def configure(env):
 
-	is64=sys.maxsize > 2**32
+    is64=sys.maxsize > 2**32
 
-	if (env["bits"]=="default"):
-		if (is64):
-			env["bits"]="64"
-		else:
-			env["bits"]="32"
+    if (env["bits"]=="default"):
+        if (is64):
+            env["bits"]="64"
+        else:
+            env["bits"]="32"
 
-	env.Append(CPPPATH=['#platform/x11'])
-	if (env["use_llvm"]=="yes"):
-		if 'clang++' not in env['CXX']:
-			env["CC"]="clang"
-			env["CXX"]="clang++"
-			env["LD"]="clang++"
-		env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
-		env.extra_suffix=".llvm"
+    env.Append(CPPPATH=['#platform/x11'])
+    if (env["use_llvm"]=="yes"):
+        if 'clang++' not in env['CXX']:
+            env["CC"]="clang"
+            env["CXX"]="clang++"
+            env["LD"]="clang++"
+        env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
+        env.extra_suffix=".llvm"
 
-	if (env["use_sanitizer"]=="yes"):
-		env.Append(CXXFLAGS=['-fsanitize=address','-fno-omit-frame-pointer'])
-		env.Append(LINKFLAGS=['-fsanitize=address'])
-		env.extra_suffix+="s"
+    if (env["use_sanitizer"]=="yes"):
+        env.Append(CXXFLAGS=['-fsanitize=address','-fno-omit-frame-pointer'])
+        env.Append(LINKFLAGS=['-fsanitize=address'])
+        env.extra_suffix+="s"
 
-	if (env["use_leak_sanitizer"]=="yes"):
-		env.Append(CXXFLAGS=['-fsanitize=address','-fno-omit-frame-pointer'])
-		env.Append(LINKFLAGS=['-fsanitize=address'])
-		env.extra_suffix+="s"
+    if (env["use_leak_sanitizer"]=="yes"):
+        env.Append(CXXFLAGS=['-fsanitize=address','-fno-omit-frame-pointer'])
+        env.Append(LINKFLAGS=['-fsanitize=address'])
+        env.extra_suffix+="s"
 
 
-	#if (env["tools"]=="no"):
-	#	#no tools suffix
-	#	env['OBJSUFFIX'] = ".nt"+env['OBJSUFFIX']
-	#	env['LIBSUFFIX'] = ".nt"+env['LIBSUFFIX']
+    #if (env["tools"]=="no"):
+    #	#no tools suffix
+    #	env['OBJSUFFIX'] = ".nt"+env['OBJSUFFIX']
+    #	env['LIBSUFFIX'] = ".nt"+env['LIBSUFFIX']
 
 
-	if (env["target"]=="release"):
+    if (env["target"]=="release"):
 
-		if (env["debug_release"]=="yes"):
-			env.Append(CCFLAGS=['-g2'])
-		else:
-			env.Append(CCFLAGS=['-O3','-ffast-math'])
+        if (env["debug_release"]=="yes"):
+            env.Append(CCFLAGS=['-g2'])
+        else:
+            env.Append(CCFLAGS=['-O3','-ffast-math'])
 
-	elif (env["target"]=="release_debug"):
+    elif (env["target"]=="release_debug"):
 
-		env.Append(CCFLAGS=['-O2','-ffast-math','-DDEBUG_ENABLED'])
-		if (env["debug_release"]=="yes"):
-			env.Append(CCFLAGS=['-g2'])
+        env.Append(CCFLAGS=['-O2','-ffast-math','-DDEBUG_ENABLED'])
+        if (env["debug_release"]=="yes"):
+            env.Append(CCFLAGS=['-g2'])
 
-	elif (env["target"]=="debug"):
+    elif (env["target"]=="debug"):
 
-		env.Append(CCFLAGS=['-g2', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
+        env.Append(CCFLAGS=['-g2', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
 
-	env.ParseConfig('pkg-config x11 --cflags --libs')
-	env.ParseConfig('pkg-config xinerama --cflags --libs')
-	env.ParseConfig('pkg-config xcursor --cflags --libs')
-	env.ParseConfig('pkg-config xrandr --cflags --libs')
+    env.ParseConfig('pkg-config x11 --cflags --libs')
+    env.ParseConfig('pkg-config xinerama --cflags --libs')
+    env.ParseConfig('pkg-config xcursor --cflags --libs')
+    env.ParseConfig('pkg-config xrandr --cflags --libs')
 
-	if (env["openssl"] == "system"):
-		env.ParseConfig('pkg-config openssl --cflags --libs')
+    if (env["openssl"] == "system"):
+        env.ParseConfig('pkg-config openssl --cflags --libs')
 
-	if (env["libwebp"] == "system"):
-		env.ParseConfig('pkg-config libwebp --cflags --libs')
+    if (env["libwebp"] == "system"):
+        env.ParseConfig('pkg-config libwebp --cflags --libs')
 
-	if (env["freetype"] == "system"):
-		env["libpng"] = "system"  # Freetype links against libpng
-		env.ParseConfig('pkg-config freetype2 --cflags --libs')
+    if (env["freetype"] == "system"):
+        env["libpng"] = "system"  # Freetype links against libpng
+        env.ParseConfig('pkg-config freetype2 --cflags --libs')
 
-	if (env["libpng"] == "system"):
-		env.ParseConfig('pkg-config libpng --cflags --libs')
+    if (env["libpng"] == "system"):
+        env.ParseConfig('pkg-config libpng --cflags --libs')
 
-	if (env["enet"] == "system"):
-		env.ParseConfig('pkg-config libenet --cflags --libs')
+    if (env["enet"] == "system"):
+        env.ParseConfig('pkg-config libenet --cflags --libs')
 
-	if (env["squish"] == "system" and env["tools"] == "yes"):
-		env.ParseConfig('pkg-config libsquish --cflags --libs')
+    if (env["squish"] == "system" and env["tools"] == "yes"):
+        env.ParseConfig('pkg-config libsquish --cflags --libs')
 
-	# Sound and video libraries
-	# Keep the order as it triggers chained dependencies (ogg needed by others, etc.)
+    # Sound and video libraries
+    # Keep the order as it triggers chained dependencies (ogg needed by others, etc.)
 
-	if (env["libtheora"] == "system"):
-		env["libogg"] = "system"  # Needed to link against system libtheora
-		env["libvorbis"] = "system"  # Needed to link against system libtheora
-		env.ParseConfig('pkg-config theora theoradec --cflags --libs')
+    if (env["libtheora"] == "system"):
+        env["libogg"] = "system"  # Needed to link against system libtheora
+        env["libvorbis"] = "system"  # Needed to link against system libtheora
+        env.ParseConfig('pkg-config theora theoradec --cflags --libs')
 
-	if (env["libvpx"] == "system"):
-		env.ParseConfig('pkg-config vpx --cflags --libs')
+    if (env["libvpx"] == "system"):
+        env.ParseConfig('pkg-config vpx --cflags --libs')
 
-	if (env["libvorbis"] == "system"):
-		env["libogg"] = "system"  # Needed to link against system libvorbis
-		env.ParseConfig('pkg-config vorbis vorbisfile --cflags --libs')
+    if (env["libvorbis"] == "system"):
+        env["libogg"] = "system"  # Needed to link against system libvorbis
+        env.ParseConfig('pkg-config vorbis vorbisfile --cflags --libs')
 
-	if (env["opus"] == "system"):
-		env["libogg"] = "system"  # Needed to link against system opus
-		env.ParseConfig('pkg-config opus opusfile --cflags --libs')
+    if (env["opus"] == "system"):
+        env["libogg"] = "system"  # Needed to link against system opus
+        env.ParseConfig('pkg-config opus opusfile --cflags --libs')
 
-	if (env["libogg"] == "system"):
-		env.ParseConfig('pkg-config ogg --cflags --libs')
+    if (env["libogg"] == "system"):
+        env.ParseConfig('pkg-config ogg --cflags --libs')
 
 
-	env.Append(CPPFLAGS=['-DOPENGL_ENABLED'])
+    env.Append(CPPFLAGS=['-DOPENGL_ENABLED'])
 
-	if (env["glew"] == "system"):
-		env.ParseConfig('pkg-config glew --cflags --libs')
+    if (env["glew"] == "system"):
+        env.ParseConfig('pkg-config glew --cflags --libs')
 
-	if os.system("pkg-config --exists alsa")==0:
-		print("Enabling ALSA")
-		env.Append(CPPFLAGS=["-DALSA_ENABLED"])
-		env.ParseConfig('pkg-config alsa --cflags --libs')
-	else:
-		print("ALSA libraries not found, disabling driver")
+    if os.system("pkg-config --exists alsa")==0:
+        print("Enabling ALSA")
+        env.Append(CPPFLAGS=["-DALSA_ENABLED"])
+        env.ParseConfig('pkg-config alsa --cflags --libs')
+    else:
+        print("ALSA libraries not found, disabling driver")
 
-	if (platform.system() == "Linux"):
-		env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])
-	if (env["udev"]=="yes"):
-		# pkg-config returns 0 when the lib exists...
-		found_udev = not os.system("pkg-config --exists libudev")
+    if (platform.system() == "Linux"):
+        env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])
+    if (env["udev"]=="yes"):
+        # pkg-config returns 0 when the lib exists...
+        found_udev = not os.system("pkg-config --exists libudev")
 
-		if (found_udev):
-			print("Enabling udev support")
-			env.Append(CPPFLAGS=["-DUDEV_ENABLED"])
-			env.ParseConfig('pkg-config libudev --cflags --libs')
-		else:
-			print("libudev development libraries not found, disabling udev support")
+        if (found_udev):
+            print("Enabling udev support")
+            env.Append(CPPFLAGS=["-DUDEV_ENABLED"])
+            env.ParseConfig('pkg-config libudev --cflags --libs')
+        else:
+            print("libudev development libraries not found, disabling udev support")
 
-	if (env["pulseaudio"]=="yes"):
-		if not os.system("pkg-config --exists libpulse-simple"):
-			print("Enabling PulseAudio")
-			env.Append(CPPFLAGS=["-DPULSEAUDIO_ENABLED"])
-			env.ParseConfig('pkg-config --cflags --libs libpulse-simple')
-		else:
-			print("PulseAudio development libraries not found, disabling driver")
+    if (env["pulseaudio"]=="yes"):
+        if not os.system("pkg-config --exists libpulse-simple"):
+            print("Enabling PulseAudio")
+            env.Append(CPPFLAGS=["-DPULSEAUDIO_ENABLED"])
+            env.ParseConfig('pkg-config --cflags --libs libpulse-simple')
+        else:
+            print("PulseAudio development libraries not found, disabling driver")
 
-	env.Append(CPPFLAGS=['-DX11_ENABLED','-DUNIX_ENABLED','-DGLES2_ENABLED','-DGLES_OVER_GL'])
-	env.Append(LIBS=['GL', 'pthread', 'z'])
-	if (platform.system() == "Linux"):
-		env.Append(LIBS='dl')
-	#env.Append(CPPFLAGS=['-DMPC_FIXED_POINT'])
+    env.Append(CPPFLAGS=['-DX11_ENABLED','-DUNIX_ENABLED','-DGLES2_ENABLED','-DGLES_OVER_GL'])
+    env.Append(LIBS=['GL', 'pthread', 'z'])
+    if (platform.system() == "Linux"):
+        env.Append(LIBS='dl')
+    #env.Append(CPPFLAGS=['-DMPC_FIXED_POINT'])
 
 #host compiler is default..
 
-	if (is64 and env["bits"]=="32"):
-		env.Append(CPPFLAGS=['-m32'])
-		env.Append(LINKFLAGS=['-m32','-L/usr/lib/i386-linux-gnu'])
-	elif (not is64 and env["bits"]=="64"):
-		env.Append(CPPFLAGS=['-m64'])
-		env.Append(LINKFLAGS=['-m64','-L/usr/lib/i686-linux-gnu'])
+    if (is64 and env["bits"]=="32"):
+        env.Append(CPPFLAGS=['-m32'])
+        env.Append(LINKFLAGS=['-m32','-L/usr/lib/i386-linux-gnu'])
+    elif (not is64 and env["bits"]=="64"):
+        env.Append(CPPFLAGS=['-m64'])
+        env.Append(LINKFLAGS=['-m64','-L/usr/lib/i686-linux-gnu'])
 
 
-	import methods
+    import methods
 
-	env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	#env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )
+    env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    #env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )
 
-	if (env["use_static_cpp"]=="yes"):
-		env.Append(LINKFLAGS=['-static-libstdc++'])
+    if (env["use_static_cpp"]=="yes"):
+        env.Append(LINKFLAGS=['-static-libstdc++'])
 
-	list_of_x86 = ['x86_64', 'x86', 'i386', 'i586']
-	if any(platform.machine() in s for s in list_of_x86):
-		env["x86_libtheora_opt_gcc"]=True
+    list_of_x86 = ['x86_64', 'x86', 'i386', 'i586']
+    if any(platform.machine() in s for s in list_of_x86):
+        env["x86_libtheora_opt_gcc"]=True