2007-08-14 Jonathan Chambers <[email protected]>

	* libmono.vcproj, mono.vcproj, genmdesc.vcproj, monobug.vcproj: 
	Use MONO_DEPENDENCIES_PREFIX env var to locate dependencies. No longer
	need VSDependencies.zip.
	
	* winsetup.bat, runmdesc.bat, runburg.bat: No longer
	need VSDependencies.zip. Use MONO_DEPENDENCIES_PREFIX to
	setup PATH.
	
	* mono.def: Remove missing functions.
	
	Contributed under MIT/X11 license.


svn path=/trunk/mono/; revision=85846

msvc/ChangeLog

@@ -1,3 +1,17 @@
+2007-08-14  Jonathan Chambers <[email protected]>
+
+	* libmono.vcproj, mono.vcproj, genmdesc.vcproj, monobug.vcproj: 
+	Use MONO_DEPENDENCIES_PREFIX env var to locate dependencies. No longer
+	need VSDependencies.zip.
+	
+	* winsetup.bat, runmdesc.bat, runburg.bat: No longer
+	need VSDependencies.zip. Use MONO_DEPENDENCIES_PREFIX to
+	setup PATH.
+	
+	* mono.def: Remove missing functions.
+	
+	Contributed under MIT/X11 license.
+
 2007-08-14  Jonathan Chambers <[email protected]>
 
 	* libmono.vcproj: Enable intrinsic functions.

msvc/genmdesc.vcproj

@@ -47,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
+				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
 				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -76,7 +76,7 @@
 				OutputFile="$(OutDir)/genmdesc.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\VSDependancies\lib"
+				AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -138,7 +138,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
+				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
 				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -167,7 +167,7 @@
 				OutputFile="$(OutDir)/genmdesc.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\VSDependancies\lib"
+				AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="17"
@@ -229,7 +229,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
+				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -256,7 +256,7 @@
 				OutputFile="$(OutDir)/genmdesc.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\VSDependancies\lib"
+				AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib"
 				ProgramDatabaseFile=".\Release/genmdesc.pdb"
 				SubSystem="1"
 				TargetMachine="1"
@@ -319,7 +319,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
+				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -346,7 +346,7 @@
 				OutputFile="$(OutDir)/genmdesc.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\VSDependancies\lib"
+				AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib"
 				ProgramDatabaseFile=".\Release/genmdesc.pdb"
 				SubSystem="1"
 				TargetMachine="17"

msvc/libmono.vcproj

@@ -28,6 +28,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="echo #define FULL_VERSION &quot;Visual Studio built mono&quot; &gt; ..\mono\mini\version.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -47,7 +48,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
+				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;__i386__;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -71,7 +72,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="libgc.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib Psapi.lib winmm.lib"
 				OutputFile="$(OutDir)\mono.dll"
-				AdditionalLibraryDirectories="..\VSDependancies\lib;&quot;.\lib\libgc\$(PlatformName)\$(ConfigurationName)&quot;"
+				AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib;&quot;.\lib\libgc\$(PlatformName)\$(ConfigurationName)&quot;"
 				ModuleDefinitionFile="mono.def"
 			/>
 			<Tool
@@ -110,6 +111,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="echo #define FULL_VERSION &quot;Visual Studio built mono&quot; &gt; ..\mono\mini\version.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -130,7 +132,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
+				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -154,7 +156,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="libgc.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib Psapi.lib winmm.lib"
 				OutputFile="$(OutDir)\mono.dll"
-				AdditionalLibraryDirectories="..\VSDependancies\lib;&quot;.\lib\libgc\$(PlatformName)\$(ConfigurationName)&quot;"
+				AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib;&quot;.\lib\libgc\$(PlatformName)\$(ConfigurationName)&quot;"
 				ModuleDefinitionFile="mono.def"
 				TargetMachine="17"
 			/>
@@ -194,6 +196,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="echo #define FULL_VERSION &quot;Visual Studio built mono&quot; &gt; ..\mono\mini\version.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -213,7 +216,7 @@
 				Optimization="0"
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
+				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;__i386__;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -240,7 +243,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="libgc.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib Psapi.lib winmm.lib"
 				OutputFile="$(OutDir)\mono.dll"
-				AdditionalLibraryDirectories="..\VSDependancies\lib;&quot;.\lib\libgc\$(PlatformName)\$(ConfigurationName)&quot;"
+				AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib;&quot;.\lib\libgc\$(PlatformName)\$(ConfigurationName)&quot;"
 				ModuleDefinitionFile="mono.def"
 				GenerateDebugInformation="true"
 			/>
@@ -280,6 +283,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="echo #define FULL_VERSION &quot;Visual Studio built mono&quot; &gt; ..\mono\mini\version.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -300,7 +304,7 @@
 				Optimization="0"
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
+				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
 				PreprocessorDefinitions="WIN64;_WIN64;_DEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE;__x86_64__"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -327,7 +331,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="libgc.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib Psapi.lib winmm.lib"
 				OutputFile="$(OutDir)\mono.dll"
-				AdditionalLibraryDirectories="..\VSDependancies\lib;&quot;.\lib\libgc\$(PlatformName)\$(ConfigurationName)&quot;"
+				AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib;&quot;.\lib\libgc\$(PlatformName)\$(ConfigurationName)&quot;"
 				ModuleDefinitionFile="mono.def"
 				GenerateDebugInformation="true"
 				TargetMachine="17"
@@ -593,6 +597,14 @@
 				RelativePath="..\mono\utils\mono-internal-hash.h"
 				>
 			</File>
+			<File
+				RelativePath="..\mono\utils\mono-io-portability.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\utils\mono-io-portability.h"
+				>
+			</File>
 			<File
 				RelativePath="..\mono\utils\mono-logger.c"
 				>
@@ -2609,6 +2621,14 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\mono\metadata\security-core-clr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\metadata\security-core-clr.h"
+				>
+			</File>
 			<File
 				RelativePath="..\mono\metadata\security-manager.c"
 				>

msvc/mono.def

@@ -156,22 +156,16 @@ mono_debug_add_method
 mono_debug_cleanup
 mono_debug_close_mono_symbol_file
 mono_debug_find_method
-mono_debug_free_method_jit_info
 mono_debug_free_source_location
 mono_debug_init
-mono_debug_init_1
-mono_debug_init_2
-mono_debug_init_2_memory
 mono_debug_lookup_method
 mono_debug_lookup_source_location
 mono_debug_open_mono_symbols
 mono_debug_print_stack_frame
 mono_debug_print_vars
-mono_debug_read_method
 mono_debug_symfile_lookup_location
 mono_debug_symfile_lookup_method
 mono_debug_using_mono_debugger
-mono_debugger_add_symbol_file
 mono_debugger_breakpoint_callback
 mono_debugger_check_runtime_version
 mono_debugger_cleanup
@@ -181,13 +175,10 @@ mono_debugger_initialize
 mono_debugger_insert_breakpoint
 mono_debugger_insert_breakpoint_full
 mono_debugger_lock
-mono_debugger_lookup_assembly
-mono_debugger_lookup_type
 mono_debugger_method_has_breakpoint
 mono_debugger_remove_breakpoint
 mono_debugger_run_finally
 mono_debugger_runtime_invoke
-mono_debugger_start_add_type
 mono_debugger_throw_exception
 mono_debugger_unhandled_exception
 mono_debugger_unlock

msvc/mono.vcproj

@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
+				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -67,7 +67,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib mono.lib Psapi.lib winmm.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="../VSDependancies/lib;bin/libmono/$(PlatformName)/$(ConfigurationName)"
+				AdditionalLibraryDirectories="&quot;$(MONO_DEPENDENCIES_PREFIX)/lib&quot;;&quot;bin/libmono/$(PlatformName)/$(ConfigurationName)&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -123,7 +123,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
+				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -147,7 +147,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib mono.lib Psapi.lib winmm.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="../VSDependancies/lib;bin/libmono/$(PlatformName)/$(ConfigurationName)"
+				AdditionalLibraryDirectories="&quot;$(MONO_DEPENDENCIES_PREFIX)/lib&quot;;&quot;bin/libmono/$(PlatformName)/$(ConfigurationName)&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="17"
@@ -202,7 +202,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
+				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="true"
@@ -223,7 +223,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib mono.lib Psapi.lib winmm.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="../VSDependancies/lib;bin/libmono/$(PlatformName)/$(ConfigurationName)"
+				AdditionalLibraryDirectories="&quot;$(MONO_DEPENDENCIES_PREFIX)/lib&quot;;&quot;bin/libmono/$(PlatformName)/$(ConfigurationName)&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -281,7 +281,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
+				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="true"
@@ -302,7 +302,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib mono.lib Psapi.lib winmm.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="../VSDependancies/lib;bin/libmono/$(PlatformName)/$(ConfigurationName)"
+				AdditionalLibraryDirectories="&quot;$(MONO_DEPENDENCIES_PREFIX)/lib&quot;;&quot;bin/libmono/$(PlatformName)/$(ConfigurationName)&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"

msvc/monoburg.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\"
+				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -70,7 +70,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\VSDependancies\lib"
+				AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -128,7 +128,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\"
+				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -154,7 +154,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\VSDependancies\lib"
+				AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="17"
@@ -211,7 +211,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\"
+				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="true"
@@ -234,7 +234,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\VSDependancies\lib"
+				AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -294,7 +294,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\"
+				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="true"
@@ -317,7 +317,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\VSDependancies\lib"
+				AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"

msvc/runburg.bat

@@ -2,7 +2,7 @@
 rem This runs Monoburg on the various x86 files when called on Visual Studio
 echo Running Monoburg on the inssel.brg files...
 cd ..\mono\mini
-set PATH=%PATH%;..\..\VSDependancies\lib
+set PATH=%PATH%;%MONO_DEPENDENCIES_PREFIX%\bin
 
 if "%2" == "Win32" goto x86
 if "%2" == "x64" goto x64

msvc/runmdesc.bat

@@ -2,7 +2,7 @@
 rem This runs genmdesc on the x86 files when called on Visual Studio
 echo Running genmdesc
 cd ..\mono\mini
-set PATH=%PATH%;..\..\VSDependancies\lib
+set PATH=%PATH%;%MONO_DEPENDENCIES_PREFIX%\bin
 if "%2" == "Win32" goto x86
 if "%2" == "x64" goto x64
 goto error

msvc/winsetup.bat

@@ -1,6 +1,5 @@
 @echo off
 cd ..
-if not exist VSDependancies\lib goto error
 copy winconfig.h config.h
 goto end
 :error