Browse Source

Use Release CoreCLR runtime

JoshEngebretson 10 years ago
parent
commit
e65ac08da0
2 changed files with 28 additions and 29 deletions
  1. 26 26
      Script/AtomicNET/AtomicNET/build.cmd
  2. 2 3
      Source/ToolCore/ToolEnvironment.cpp

+ 26 - 26
Script/AtomicNET/AtomicNET/build.cmd

@@ -1,44 +1,44 @@
 
 
 csc /out:../../../Artifacts/AtomicNET/TPA/AtomicNETBootstrap.dll /nostdlib+ /noconfig /t:library ^
 csc /out:../../../Artifacts/AtomicNET/TPA/AtomicNETBootstrap.dll /nostdlib+ /noconfig /t:library ^
-/lib:../../../Submodules/CoreCLR/Windows/Debug/x64/;../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/ ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Collections.Concurrent.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Runtime.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Linq.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Collections.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/x64/mscorlib.dll ^
+/lib:../../../Submodules/CoreCLR/Windows/Release/x64/;../../../Submodules/CoreCLR/Windows/Release/x64/ ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.Collections.Concurrent.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.Runtime.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.Linq.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.Collections.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/mscorlib.ni.dll ^
 AtomicNETBootstrap/*.cs
 AtomicNETBootstrap/*.cs
 
 
 csc /out:../../../Artifacts/AtomicNET/AtomicNETEngine.dll /nostdlib+ /noconfig /t:library /w:0 ^
 csc /out:../../../Artifacts/AtomicNET/AtomicNETEngine.dll /nostdlib+ /noconfig /t:library /w:0 ^
-/lib:../../../Submodules/CoreCLR/Windows/Debug/x64/;../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/ ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Runtime.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.IO.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.IO.FileSystem.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Linq.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/x64/mscorlib.dll ^
+/lib:../../../Submodules/CoreCLR/Windows/Release/x64/;../../../Submodules/CoreCLR/Windows/Release/x64/ ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.Runtime.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.IO.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.IO.FileSystem.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.Linq.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/mscorlib.ni.dll ^
 ../../../Build/Source/Generated/WINDOWS/CSharp/Packages/Atomic/Managed/*.cs ^
 ../../../Build/Source/Generated/WINDOWS/CSharp/Packages/Atomic/Managed/*.cs ^
 ../../../Build/Source/Generated/WINDOWS/CSharp/Packages/AtomicNET/Managed/*.cs ^
 ../../../Build/Source/Generated/WINDOWS/CSharp/Packages/AtomicNET/Managed/*.cs ^
 ../../../Build/Source/Generated/WINDOWS/CSharp/Packages/AtomicPlayer/Managed/*.cs ^
 ../../../Build/Source/Generated/WINDOWS/CSharp/Packages/AtomicPlayer/Managed/*.cs ^
 AtomicNETEngine/*.cs
 AtomicNETEngine/*.cs
 
 
 csc /unsafe /out:../../../Artifacts/AtomicNET/AtomicNETTools.dll /nostdlib+ /noconfig /t:library /w:0 ^
 csc /unsafe /out:../../../Artifacts/AtomicNET/AtomicNETTools.dll /nostdlib+ /noconfig /t:library /w:0 ^
-/lib:../../../Submodules/CoreCLR/Windows/Debug/x64/;../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/ ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Runtime.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.IO.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Linq.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Reflection.Primitives.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Reflection.Metadata.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Collections.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Collections.Immutable.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/x64/mscorlib.dll ^
+/lib:../../../Submodules/CoreCLR/Windows/Release/x64/;../../../Submodules/CoreCLR/Windows/Release/x64/ ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.Runtime.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.IO.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.Linq.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.Reflection.Primitives.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.Reflection.Metadata.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.Collections.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.Collections.Immutable.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/mscorlib.ni.dll ^
 /r:../../../Artifacts/AtomicNET/AtomicNETEngine.dll ^
 /r:../../../Artifacts/AtomicNET/AtomicNETEngine.dll ^
 AtomicNETTools/*.cs
 AtomicNETTools/*.cs
 
 
 csc /out:C:/Dev/atomic/AtomicExamples/AtomicNET/Basic3D/Resources/Assemblies/AtomicNETTest.dll ^
 csc /out:C:/Dev/atomic/AtomicExamples/AtomicNET/Basic3D/Resources/Assemblies/AtomicNETTest.dll ^
 /debug+ /nostdlib+ /noconfig /t:library /w:0 ^
 /debug+ /nostdlib+ /noconfig /t:library /w:0 ^
-/lib:../../../Submodules/CoreCLR/Windows/Debug/x64/;../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/ ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Runtime.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.IO.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.IO.FileSystem.dll ^
-/r:../../../Submodules/CoreCLR/Windows/Debug/x64/mscorlib.dll ^
+/lib:../../../Submodules/CoreCLR/Windows/Release/x64/;../../../Submodules/CoreCLR/Windows/Release/x64/ ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.Runtime.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.IO.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/System.IO.FileSystem.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Release/x64/mscorlib.ni.dll ^
 /r:../../../Artifacts/AtomicNET/AtomicNETEngine.dll ^
 /r:../../../Artifacts/AtomicNET/AtomicNETEngine.dll ^
 ../AtomicNETTest/MyClass.cs
 ../AtomicNETTest/MyClass.cs

+ 2 - 3
Source/ToolCore/ToolEnvironment.cpp

@@ -90,9 +90,8 @@ bool ToolEnvironment::InitFromJSON(bool atomicTool)
         netAssemblyLoadPaths_ = GetNativePath(ToString("%s/Artifacts/AtomicNET/", ATOMIC_ROOT_SOURCE_DIR));
         netAssemblyLoadPaths_ = GetNativePath(ToString("%s/Artifacts/AtomicNET/", ATOMIC_ROOT_SOURCE_DIR));
 
 
 #ifdef ATOMIC_PLATFORM_WINDOWS
 #ifdef ATOMIC_PLATFORM_WINDOWS
-        netCoreCLRAbsPath_ = GetNativePath(ToString("%s/Submodules/CoreCLR/Windows/Debug/x64/", ATOMIC_ROOT_SOURCE_DIR));
-        netTPAPaths_ = ToString("%s/Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/", ATOMIC_ROOT_SOURCE_DIR);
-        netTPAPaths_ += ToString(";%s/Artifacts/AtomicNET/TPA/", ATOMIC_ROOT_SOURCE_DIR);
+        netCoreCLRAbsPath_ = GetNativePath(ToString("%s/Submodules/CoreCLR/Windows/Release/x64/", ATOMIC_ROOT_SOURCE_DIR));
+        netTPAPaths_ = ToString("%s/Artifacts/AtomicNET/TPA/", ATOMIC_ROOT_SOURCE_DIR);
 #else
 #else
         String  coreCLRAbsPath = GetNativePath(ToString("%s/Submodules/CoreCLR/OSX/Debug/x64/", ATOMIC_ROOT_SOURCE_DIR);
         String  coreCLRAbsPath = GetNativePath(ToString("%s/Submodules/CoreCLR/OSX/Debug/x64/", ATOMIC_ROOT_SOURCE_DIR);
 #endif
 #endif