X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=msvc%2Fmono.props;h=c67bad9f407c63166e4a540fa443655d00508800;hb=52418d713f478a9f23cdb1a76575d58bea225009;hp=fb0a15dd8667cebf40e5e4dd92785f84c7d216a9;hpb=c60a49439ae36a3ea134e6d3f9e4e62062d8ac9c;p=mono.git
diff --git a/msvc/mono.props b/msvc/mono.props
index fb0a15dd866..c67bad9f407 100644
--- a/msvc/mono.props
+++ b/msvc/mono.props
@@ -11,13 +11,18 @@
true
true
+
+ false
+
+ false
- $(MSBuildProjectDirectory)/..
+ ..
+ $(MSBuildProjectDirectory)/$(MonoSourceLocation)
$(top_srcdir)
$(MONO_DIR)/mono
- $(MONO_DIR)/eglib;$(MONO_DIR)/eglib/include;$(MONO_DIR)/eglib/test
- $(MONO_DIR)/eglib/src
+ $(MONO_DIR)/mono/eglib
+ $(MONO_DIR)/mono/eglib
$(MONO_DIR)/libgc/include
$(MONO_DIR)/libgc/src
$(MONO_INCLUDE_DIR)/jit
@@ -25,11 +30,18 @@
$(MONO_LIBGC_INCLUDE_DIR)
$(MONO_EGLIB_SOURCE_DIR)
+
+ MultiThreadedDebug
+ MultiThreaded
+
+
+ MultiThreadedDebugDLL
+ MultiThreadedDLL
+
HAVE_SGEN_GC;HAVE_MOVING_COLLECTOR;HAVE_WRITE_BARRIERS
$(SGEN_DEFINES)
libgcmonosgen.lib
- monosgen.def
-sgen
$(MONO_BUILD_DIR_PREFIX)sgen/
@@ -37,10 +49,20 @@
HAVE_BOEHM_GC
$(BOEHM_DEFINES)
libgc.lib
- mono.def
-boehm
$(MONO_BUILD_DIR_PREFIX)boehm/
+
+ libmonoutils.lib;libmonoruntime$(MONO_TARGET_SUFFIX).lib;libmini$(MONO_TARGET_SUFFIX).lib;$(GC_LIB)
+ libmono-static$(MONO_TARGET_SUFFIX).lib
+ mono-2.0$(MONO_TARGET_SUFFIX).lib
+
+
+ $(MONO_STATIC_LIBMONO_LIB)
+
+
+ eglib.lib;$(MONO_DYNAMIC_LIBMONO_LIB)
+
$(ProgramFiles)/Intel/VTune Amplifier XE 2013/include
@@ -60,6 +82,12 @@
$(MONO_USE_SEPARATE_BUILD_DIR)
+
+ $(MONO_USE_STATIC_C_RUNTIME)
+
+
+ $(MONO_USE_STATIC_LIBMONO)
+
@@ -67,10 +95,14 @@
MONO_DLL_IMPORT
__default_codegen__;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;GC_NOT_DLL;WIN32_THREADS;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;_UNICODE;UNICODE;FD_SETSIZE=1024;%(PreprocessorDefinitions);
4273;4005
+ $(MONO_C_RUNTIME)
Mswsock.lib;ws2_32.lib;ole32.lib;oleaut32.lib;psapi.lib;version.lib;advapi32.lib;winmm.lib;kernel32.lib;%(AdditionalDependencies)
$(MONO_BUILD_DIR_PREFIX)$(Platform)/lib/$(Configuration)
+
+ $(MONO_BUILD_DIR_PREFIX)$(Platform)/lib/$(Configuration)
+
\ No newline at end of file