Эх сурвалжийг харах

Attempt to fix XamlFactory errors on CI with masm

Josh Engebretson 9 жил өмнө
parent
commit
66432f383a

+ 2 - 1
Build/Scripts/Windows/CompileAtomicEditorPhase1.bat

@@ -1,3 +1,4 @@
 call "%VS140COMNTOOLS%..\..\VC\bin\amd64\vcvars64.bat"
 call "%VS140COMNTOOLS%..\..\VC\bin\amd64\vcvars64.bat"
 cmake ..\\..\\..\\ -DATOMIC_DEV_BUILD=0 -G "Visual Studio 14 2015 Win64"
 cmake ..\\..\\..\\ -DATOMIC_DEV_BUILD=0 -G "Visual Studio 14 2015 Win64"
-msbuild /m Atomic.sln /t:AtomicNETNative /p:Configuration=%1 /p:Platform=x64
+:: Note, we're building LibCpuId as it uses masm as getting XamlFactory load errors if delayed
+msbuild /m Atomic.sln /t:LibCpuId /t:AtomicNETNative /p:Configuration=%1 /p:Platform=x64