Merge remote-tracking branch 'origin/master' into blender2.8
This commit is contained in:
commit
b1858b4d2f
|
@ -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 */
|
||||
|
|
4
make.bat
4
make.bat
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue