diff options
| -rw-r--r-- | intern/cycles/util/util_types.h | 1 | ||||
| -rw-r--r-- | make.bat | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h index aacf7c1bd8e..feab7996aee 100644 --- a/intern/cycles/util/util_types.h +++ b/intern/cycles/util/util_types.h @@ -94,6 +94,7 @@ CCL_NAMESPACE_BEGIN #ifndef __KERNEL_OPENCL__ typedef unsigned char uchar; typedef unsigned int uint; +typedef unsigned short ushort; #endif /* Fixed Bits Types */ @@ -257,7 +257,7 @@ echo msbuild ^ %BUILD_DIR%\Blender.sln ^ /target:build ^ /property:Configuration=%BUILD_TYPE% ^ - /maxcpucount ^ + /maxcpucount:2 ^ /verbosity:minimal ^ /p:platform=%MSBUILD_PLATFORM% ^ /flp:Summary;Verbosity=minimal;LogFile=%BUILD_DIR%\Build.log >> %BUILD_DIR%\rebuild.cmd @@ -273,7 +273,7 @@ msbuild ^ %BUILD_DIR%\Blender.sln ^ /target:build ^ /property:Configuration=%BUILD_TYPE% ^ - /maxcpucount ^ + /maxcpucount:2 ^ /verbosity:minimal ^ /p:platform=%MSBUILD_PLATFORM% ^ /flp:Summary;Verbosity=minimal;LogFile=%BUILD_DIR%\Build.log |