projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 35f830a)
Fixes to default build/distribution location.
authorlateralusX <lateralusx.github@gmail.com>
Wed, 4 May 2016 12:53:29 +0000 (14:53 +0200)
committerlateralusX <lateralusx.github@gmail.com>
Wed, 15 Jun 2016 07:40:06 +0000 (09:40 +0200)
msvc/.gitignore patch | blob | history
msvc/build-all.vcxproj patch | blob | history
msvc/build-init.vcxproj patch | blob | history
msvc/build-install.vcxproj patch | blob | history
msvc/build-package.vcxproj patch | blob | history
msvc/install.bat patch | blob | history
msvc/mono-mini-regression-aot-test.vcxproj patch | blob | history
msvc/mono-mini-regression-test.vcxproj patch | blob | history
msvc/mono.props patch | blob | history
msvc/mono.sln patch | blob | history

diff --git a/msvc/.gitignore b/msvc/.gitignore
index 52b65fe7365137238c54b50c4e79e978fe0615cc..8ed2c2f48bb944721f929b7041eeac2908503ce4 100644 (file)
--- a/msvc/.gitignore
+++ b/msvc/.gitignore
@@ -10,4 +10,6 @@ mono.VC.db
 /Win32/
 /x64/
 /include/
-/package/
\ No newline at end of file
+/package/
+/build/
+/distribution/
diff --git a/msvc/build-all.vcxproj b/msvc/build-all.vcxproj
index 9d4396482ba44998e5a1e7299179352eccb8230d..0626d25ff57f28d44091fa899bf9caa2dfb4c2a1 100644 (file)
--- a/msvc/build-all.vcxproj
+++ b/msvc/build-all.vcxproj
@@ -73,20 +73,20 @@
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
diff --git a/msvc/build-init.vcxproj b/msvc/build-init.vcxproj
index f18ebc9484c3ff5ed1b111f9352873b590205760..ee690bc78ca3e67ca0ebcfe4c8c70d57d0b6f3ac 100644 (file)
--- a/msvc/build-init.vcxproj
+++ b/msvc/build-init.vcxproj
@@ -73,20 +73,20 @@
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
diff --git a/msvc/build-install.vcxproj b/msvc/build-install.vcxproj
index 99815616db8aeea32bd09ecceec7e96b3e5b5ab7..a50201f207bcf12b2eca76b9d99112df32a45449 100644 (file)
--- a/msvc/build-install.vcxproj
+++ b/msvc/build-install.vcxproj
@@ -73,20 +73,20 @@
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
diff --git a/msvc/build-package.vcxproj b/msvc/build-package.vcxproj
index 204d678fb5d564e3e8d9b73bc79ab1e7b3ac747c..b4f6dab414204947b1fa4bc0ae30f70ad5250c04 100644 (file)
--- a/msvc/build-package.vcxproj
+++ b/msvc/build-package.vcxproj
@@ -73,20 +73,20 @@
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
diff --git a/msvc/install.bat b/msvc/install.bat
index 4b8eb890fe856195d2618fd8703a84a70782ae8e..e9344e20f89358a3cb109a30d4494692c8579163 100644 (file)
--- a/msvc/install.bat
+++ b/msvc/install.bat
@@ -43,8 +43,9 @@ IF NOT EXIST %BUILD_DIR% (
 )
 
 IF NOT EXIST %INSTALL_DIR% (
-       ECHO Error: '%INSTALL_DIR%', directory doesn't eixst.
-       GOTO ON_ERROR
+       ECHO Install directory '%INSTALL_DIR%', directory doesn't eixst, creating....
+       mkdir "%INSTALL_DIR%"
+       ECHO Install directory '%INSTALL_DIR%' created.
 )
 
 SET PACKAGE_DIR=%BUILD_DIR%\package\%PLATFORM%\%CONFIG%
diff --git a/msvc/mono-mini-regression-aot-test.vcxproj b/msvc/mono-mini-regression-aot-test.vcxproj
index 75cd76bebcb71dd149fc20560a82bfab2c946854..9dcde125998257edbffdd3e63af28231edd90d41 100644 (file)
--- a/msvc/mono-mini-regression-aot-test.vcxproj
+++ b/msvc/mono-mini-regression-aot-test.vcxproj
@@ -85,20 +85,20 @@
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>\r
diff --git a/msvc/mono-mini-regression-test.vcxproj b/msvc/mono-mini-regression-test.vcxproj
index 3f9723de5b1150efc8b881635fb94f4a59a2d79a..6ad3801af37c89c980ed4b75941a5cd7b11eeb75 100644 (file)
--- a/msvc/mono-mini-regression-test.vcxproj
+++ b/msvc/mono-mini-regression-test.vcxproj
@@ -91,20 +91,20 @@
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
     <LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>\r
diff --git a/msvc/mono.props b/msvc/mono.props
index 0101a1066e5774cd6f6c7a26c34c28caa2ea6cde..1c450324927e28e151858cdbddf2644548c025e1 100644 (file)
--- a/msvc/mono.props
+++ b/msvc/mono.props
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <!-- Change this to custom build tree location to enable out of source tree builds, example c:/mono-build/ -->
+    <MONO_BUILD_DIR_PREFIX>$(MSBuildProjectDirectory)/./build/</MONO_BUILD_DIR_PREFIX>
+    <!-- Change this to custom distribution tree location to enable out of source tree distribution, example c:/mono-dist/ -->
+    <MONO_INSTALL_DIR_PREFIX>$(MSBuildProjectDirectory)/./distribution/</MONO_INSTALL_DIR_PREFIX>
+    <!-- When true, sgen GC will be used. When false, bohem GC will be used. -->
+    <MONO_USE_SGEN>true</MONO_USE_SGEN>
+    <!-- When true, build targets will get a suffix based on used GC. Makes it possible to have builds using different GC's in same build folders, sharing common targets. -->
+    <MONO_USE_TARGET_SUFFIX>true</MONO_USE_TARGET_SUFFIX>
+  </PropertyGroup>
   <ItemGroup>
     <BuildMacro Include="MONO_BUILD_DIR_PREFIX">
       <Value>$(MONO_BUILD_DIR_PREFIX)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>
     <BuildMacro Include="MONO_INSTALL_DIR_PREFIX">
       <Value>$(MONO_INSTALL_DIR_PREFIX)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>
     <BuildMacro Include="MONO_USE_SGEN">
       <Value>$(MONO_USE_SGEN)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>
     <BuildMacro Include="MONO_USE_TARGET_SUFFIX">
       <Value>$(MONO_USE_TARGET_SUFFIX)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>
   </ItemGroup>
-  <PropertyGroup Label="UserMacros">
-    <MONO_BUILD_DIR_PREFIX>c:/mono-build/</MONO_BUILD_DIR_PREFIX>
-    <MONO_INSTALL_DIR_PREFIX>c:/mono-dist/</MONO_INSTALL_DIR_PREFIX>
-    <MONO_USE_SGEN>true</MONO_USE_SGEN>
-    <MONO_USE_TARGET_SUFFIX>true</MONO_USE_TARGET_SUFFIX>
-  </PropertyGroup>
   <PropertyGroup Label="MonoDirectories">
     <top_srcdir>$(MSBuildProjectDirectory)/..</top_srcdir>
     <MONO_DIR>$(top_srcdir)</MONO_DIR>
@@ -46,7 +46,7 @@
   </PropertyGroup>
   <PropertyGroup Label="MonoBOEHM" Condition="$(MONO_USE_SGEN)==false">
     <BOEHM_DEFINES>HAVE_BOEHM_GC</BOEHM_DEFINES>
-    <GC_DEFINES>$(HAVE_BOEHM_GC)</GC_DEFINES>
+    <GC_DEFINES>$(BOEHM_DEFINES)</GC_DEFINES>
     <GC_LIB>libgc.lib</GC_LIB>
     <MONO_DEF>mono.def</MONO_DEF>
     <MONO_TARGET_SUFFIX Condition="'$(MONO_USE_TARGET_SUFFIX)'=='true'">-boehm</MONO_TARGET_SUFFIX>
diff --git a/msvc/mono.sln b/msvc/mono.sln
index 7d389919488228200e249e0b514c43a87085c9f7..408a8b7953166556d8333ee29425e862957f554c 100644 (file)
--- a/msvc/mono.sln
+++ b/msvc/mono.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14\r
 VisualStudioVersion = 14.0.25123.0\r
 MinimumVisualStudioVersion = 10.0.40219.1\r
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Embedded Samples", "Embedded Samples", "{5FE09AA5-C3C9-45EA-A323-36A11B653CEC}"\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EmbeddedSamples", "EmbeddedSamples", "{5FE09AA5-C3C9-45EA-A323-36A11B653CEC}"\r
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{EE2CC761-9652-44AC-9204-7EB31194CAA6}"\r
 EndProject\r
@@ -384,9 +384,9 @@ Global
                {A0068765-334B-414C-8E21-8376CD2EC9F6} = {ECA11C76-E192-4F67-A8FA-28B637D9716F}\r
        EndGlobalSection\r
        GlobalSection(ExtensibilityGlobals) = postSolution\r
-               AMDCaPersistentConfig = Debug|Win32\r
-               AMDCaPersistentStartup = mono\r
                AMDCaProjectFile = C:\Users\Owner\Development\monogit\mono\msvc\CodeAnalyst\mono.caw\r
+               AMDCaPersistentStartup = mono\r
+               AMDCaPersistentConfig = Debug|Win32\r
        EndGlobalSection\r
        GlobalSection(DPCodeReviewSolutionGUID) = preSolution\r
                DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}\r
my mono mirror. check out Moved to http://github.com/mono/mono