Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug

build/android-build.py

@@ -16,11 +16,18 @@ def get_num_of_cpu():
 	''' The build process can be accelerated by running multiple concurrent job processes using the -j-option.
 	'''
 	try:
-		from numpy.distutils import cpuinfo
+		platform = sys.platform
-		return cpuinfo.cpu._getNCPUs()
+		if platform == 'win32':
+			if 'NUMBER_OF_PROCESSORS' in os.environ:
+				return int(os.environ['NUMBER_OF_PROCESSORS'])
+			else:
+				return 1
+		else:
+			from numpy.distutils import cpuinfo
+			return cpuinfo.cpu._getNCPUs()
 	except Exception:
 		print "Can't know cpuinfo, use default 1 cpu"
-        return 1
+		return 1
 
 def check_environment_variables():
     ''' Checking the environment NDK_ROOT, which will be used for building

cocos/network/proj.win32/libNetwork.vcxproj

@@ -80,7 +80,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;..\Include;$(EngineRoot)cocos;$(EngineRoot)external\websockets\include\win32;$(EngineRoot)external\curl\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

template/multi-platform-cpp/proj.android/build_native.py

@@ -12,11 +12,18 @@ def get_num_of_cpu():
 	''' The build process can be accelerated by running multiple concurrent job processes using the -j-option.
 	'''
 	try:
-		from numpy.distutils import cpuinfo
+		platform = sys.platform
-		return cpuinfo.cpu._getNCPUs()
+		if platform == 'win32':
+			if 'NUMBER_OF_PROCESSORS' in os.environ:
+				return int(os.environ['NUMBER_OF_PROCESSORS'])
+			else:
+				return 1
+		else:
+			from numpy.distutils import cpuinfo
+			return cpuinfo.cpu._getNCPUs()
 	except Exception:
 		print "Can't know cpuinfo, use default 1 cpu"
-        return 1
+		return 1
 
 def check_environment_variables_sdk():
     ''' Checking the environment ANDROID_SDK_ROOT, which will be used for building

template/multi-platform-js/proj.android/build_native.py

@@ -12,11 +12,18 @@ def get_num_of_cpu():
 	''' The build process can be accelerated by running multiple concurrent job processes using the -j-option.
 	'''
 	try:
-		from numpy.distutils import cpuinfo
+		platform = sys.platform
-		return cpuinfo.cpu._getNCPUs()
+		if platform == 'win32':
+			if 'NUMBER_OF_PROCESSORS' in os.environ:
+				return int(os.environ['NUMBER_OF_PROCESSORS'])
+			else:
+				return 1
+		else:
+			from numpy.distutils import cpuinfo
+			return cpuinfo.cpu._getNCPUs()
 	except Exception:
 		print "Can't know cpuinfo, use default 1 cpu"
-        return 1
+		return 1
 		
 def check_environment_variables_sdk():
     ''' Checking the environment ANDROID_SDK_ROOT, which will be used for building

template/multi-platform-lua/proj.android/build_native.py

@@ -12,11 +12,18 @@ def get_num_of_cpu():
 	''' The build process can be accelerated by running multiple concurrent job processes using the -j-option.
 	'''
 	try:
-		from numpy.distutils import cpuinfo
+		platform = sys.platform
-		return cpuinfo.cpu._getNCPUs()
+		if platform == 'win32':
+			if 'NUMBER_OF_PROCESSORS' in os.environ:
+				return int(os.environ['NUMBER_OF_PROCESSORS'])
+			else:
+				return 1
+		else:
+			from numpy.distutils import cpuinfo
+			return cpuinfo.cpu._getNCPUs()
 	except Exception:
 		print "Can't know cpuinfo, use default 1 cpu"
-        return 1
+		return 1
 		
 def check_environment_variables_sdk():
     ''' Checking the environment ANDROID_SDK_ROOT, which will be used for building