Merge commit '64977e5aa21c6de22fd435ff96ce8eddcb57af40' into scgamex-v3

* commit '64977e5aa21c6de22fd435ff96ce8eddcb57af40':
  Support python 2 and 3 (cocos2d#20698)
  Update CCPlatformConfig.h (cocos2d#20693)

Author: stevetranby

cocos/platform/CCPlatformConfig.h

@@ -58,7 +58,7 @@ THE SOFTWARE.
 #define CC_TARGET_PLATFORM             CC_PLATFORM_UNKNOWN
 
 // Apple: Mac and iOS
-#if defined(__APPLE__) && !defined(ANDROID) // exclude android for binding generator.
+#if defined(__APPLE__) && !defined(__ANDROID__) // exclude android for binding generator.
     #include <TargetConditionals.h>
     #if TARGET_OS_IPHONE // TARGET_OS_IPHONE includes TARGET_OS_IOS TARGET_OS_TV and TARGET_OS_WATCH. see TargetConditionals.h
         #undef  CC_TARGET_PLATFORM
@@ -72,7 +72,7 @@ THE SOFTWARE.
 #endif
 
 // android
-#if defined(ANDROID)
+#if defined(__ANDROID__)
     #undef  CC_TARGET_PLATFORM
     #define CC_TARGET_PLATFORM         CC_PLATFORM_ANDROID
 #endif

download-deps.py

@@ -107,7 +107,10 @@ def __init__(self, workpath, config_path, version_path, remote_version_key=None)
             print("==> version file doesn't exist")
 
     def get_input_value(self, prompt):
-        ret = raw_input(prompt)
+        if sys.version_info[0] > 2:
+            ret = input(prompt)
+        else:
+            ret = raw_input(prompt)
         ret.rstrip(" \t")
         return ret
 
@@ -336,22 +339,9 @@ def run(self, workpath, folder_for_extracting, remove_downloaded, force_update,
             print("==> Download (%s) finish!" % self._filename)
 
 
-def _check_python_version():
-    major_ver = sys.version_info[0]
-    if major_ver > 2:
-        print ("The python version is %d.%d. But python 2.x is required. (Version 2.7 is well tested)\n"
-               "Download it here: https://www.python.org/" % (major_ver, sys.version_info[1]))
-        return False
-
-    return True
-
-
 def main():
     workpath = os.path.dirname(os.path.realpath(__file__))
 
-    if not _check_python_version():
-        exit()
-
     parser = OptionParser()
     parser.add_option('-r', '--remove-download',
                       action="store", type="string", dest='remove_downloaded', default=None,