Buildsystem: Improve detect.py readability and fix issues

Tried to organize the configure(env) calls in sections, using the same order
for all platforms whenever possible.

Apart from cosmetic changes, the following issues were fixed:
- Android: cleanup linkage, remove GLESv1_CM and GLESv2
- iPhone: Remove obsolete "ios_gles22_override" option
- OSX:
  * Fix bits detection (default to 64) and remove obsolete "force_64_bits" option
    (closes #9449)
  * Make "fat" bits argument explicit
- Server: sync with X11
- Windows: clean up old DirectX 9 stuff
- X11:
  * Do not require system OpenSSL for building (closes #9443)
  * Fix typo'ed use_leak_sanitizer option
  * Fix .llvm suffix overriding custom extra_suffix

platform/osx/detect.py

@@ -1,4 +1,3 @@
-
 import os
 import sys
 
@@ -22,9 +21,7 @@ def can_build():
 def get_opts():
 
     return [
-        ('force_64_bits', 'Force 64 bits binary', 'no'),
         ('osxcross_sdk', 'OSXCross SDK version', 'darwin14'),
-
     ]
 
 
@@ -36,36 +33,37 @@ def get_flags():
 
 def configure(env):
 
-    env.Append(CPPPATH=['#platform/osx'])
-
-    if (env["bits"] == "default"):
-        env["bits"] = "32"
+	## Build type
 
     if (env["target"] == "release"):
-
-        env.Append(CCFLAGS=['-O2', '-ffast-math', '-fomit-frame-pointer', '-ftree-vectorize', '-msse2'])
+        env.Prepend(CCFLAGS=['-O2', '-ffast-math', '-fomit-frame-pointer', '-ftree-vectorize', '-msse2'])
 
     elif (env["target"] == "release_debug"):
-
-        env.Append(CCFLAGS=['-O2', '-DDEBUG_ENABLED'])
+        env.Prepend(CCFLAGS=['-O2', '-DDEBUG_ENABLED'])
 
     elif (env["target"] == "debug"):
+        env.Prepend(CCFLAGS=['-g3', '-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED'])
 
-        env.Append(CCFLAGS=['-g3', '-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED'])
+    ## Architecture
 
-    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'])
+    is64 = sys.maxsize > 2**32
+    if (env["bits"] == "default"):
+        env["bits"] = "64" if is64 else "32"
+
+    ## Compiler configuration
+
+    if (not os.environ.has_key("OSXCROSS_ROOT")): # regular native build
+        if (env["bits"] == "fat"):
+            env.Append(CCFLAGS=['-arch', 'i386', '-arch', 'x86_64'])
+            env.Append(LINKFLAGS=['-arch', 'i386', '-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
+        else: # 64-bit, default
+            env.Append(CCFLAGS=['-arch', 'x86_64'])
+            env.Append(LINKFLAGS=['-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"] + "-"
@@ -78,26 +76,22 @@ def configure(env):
         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(CPPFLAGS=["-mmacosx-version-min=10.9"])
-    env.Append(LIBS=['pthread'])
-    #env.Append(CPPFLAGS=['-F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks', '-isysroot', '/Developer/SDKs/MacOSX10.4u.sdk', '-mmacosx-version-min=10.4'])
-    #env.Append(LINKFLAGS=['-mmacosx-version-min=10.4', '-isysroot', '/Developer/SDKs/MacOSX10.4u.sdk', '-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk'])
-    env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-framework', 'OpenGL', '-framework', 'AGL', '-framework', 'AudioUnit', '-lz', '-framework', 'IOKit', '-framework', 'ForceFeedback'])
-    env.Append(LINKFLAGS=["-mmacosx-version-min=10.9"])
-
     if (env["CXX"] == "clang++"):
         env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
         env["CC"] = "clang"
         env["LD"] = "clang++"
 
-    import methods
+    ## Dependencies
 
-    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['builtin_libtheora'] != 'no'):
+        env["x86_libtheora_opt_gcc"] = True
 
-    env["x86_libtheora_opt_gcc"] = True
-    
+    ## Flags
+
+    env.Append(CPPPATH=['#platform/osx'])
+    env.Append(CPPFLAGS=['-DOSX_ENABLED', '-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DAPPLE_STYLE_KEYS'])
+    env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-framework', 'OpenGL', '-framework', 'AGL', '-framework', 'AudioUnit', '-lz', '-framework', 'IOKit', '-framework', 'ForceFeedback'])
+    env.Append(LIBS=['pthread'])
+
+    env.Append(CPPFLAGS=['-mmacosx-version-min=10.9'])
+    env.Append(LINKFLAGS=['-mmacosx-version-min=10.9'])