X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=msvc%2Flibmono.vcxproj;h=d7f4e0787414dc902e880f04a0be6cfc8fe76f30;hb=bc9d5d113ab7064fc199a2f430751643466cb477;hp=26b243f2b6a0e2389d422c943ba600962fed7d47;hpb=59d2397abc90def0d843c124e3a5c81c40b6cbd2;p=mono.git
diff --git a/msvc/libmono.vcxproj b/msvc/libmono.vcxproj
index 26b243f2b6a..d7f4e078741 100644
--- a/msvc/libmono.vcxproj
+++ b/msvc/libmono.vcxproj
@@ -36,7 +36,9 @@
+
+
true
true
@@ -55,6 +57,7 @@
true
true
+
true
@@ -63,6 +66,7 @@
true
+
@@ -79,10 +83,12 @@
true
+
+
@@ -90,15 +96,12 @@
-
-
-
@@ -109,8 +112,6 @@
-
-
true
true
@@ -123,10 +124,8 @@
true
true
-
-
@@ -155,49 +154,49 @@
DynamicLibrary
false
Unicode
- v110
+ v120
DynamicLibrary
false
Unicode
- v110
+ v120
DynamicLibrary
false
Unicode
- v110
+ v120
DynamicLibrary
false
Unicode
- v110
+ v120
DynamicLibrary
false
Unicode
- v110
+ v120
DynamicLibrary
false
Unicode
- v110
+ v120
DynamicLibrary
false
Unicode
- v110
+ v120
DynamicLibrary
false
Unicode
- v110
+ v120
@@ -237,14 +236,14 @@
monosgen-2.0
mono-2.0
monosgen-2.0
- $(Platform)\bin\
- $(Platform)\bin\
- $(Platform)\bin\
- $(Platform)\bin\
- $(Platform)\bin\
- $(Platform)\bin\
- $(Platform)\bin\
- $(Platform)\bin\
+ $(Platform)\bin\$(Configuration)\
+ $(Platform)\bin\$(Configuration)\
+ $(Platform)\bin\$(Configuration)\
+ $(Platform)\bin\$(Configuration)\
+ $(Platform)\bin\$(Configuration)\
+ $(Platform)\bin\$(Configuration)\
+ $(Platform)\bin\$(Configuration)\
+ $(Platform)\bin\$(Configuration)\
$(Platform)\obj\$(ProjectName)\$(Configuration)\
$(Platform)\obj\$(ProjectName)\$(Configuration)\
$(Platform)\obj\$(ProjectName)\$(Configuration)\
@@ -285,16 +284,26 @@
false
- libgc.lib;libmonoruntime.lib;libmonoutils.lib;eglib.lib;%(AdditionalDependencies)
+ %(AdditionalDependencies)
$(Platform)\lib;%(AdditionalLibraryDirectories)
mono.def
true
false
- $(Platform)\lib\$(TargetName).lib
+ $(Platform)\lib\$(Configuration)\$(TargetName).lib
$(TargetDir)$(TargetName).pdb
+
+ xcopy /F /Y "$(SolutionDir)..\mono\cil\opcode.def" "$(SolutionDir)include\mono\cil\"
+xcopy /F /Y "$(SolutionDir)..\mono\mini\jit.h" "$(SolutionDir)include\mono\jit\"
+xcopy /F /Y "$(SolutionDir)..\mono\metadata\*.h" "$(SolutionDir)include\mono\metadata\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-counters.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-dl-fallback.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-error.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-logger.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(SolutionDir)include\mono\utils\"
+
@@ -327,16 +336,26 @@
false
- libmonoruntimesgen.lib;libmonoutils.lib;eglib.lib;%(AdditionalDependencies)
+ %(AdditionalDependencies)
$(Platform)\lib;%(AdditionalLibraryDirectories)
monosgen.def
true
false
- $(Platform)\lib\$(TargetName).lib
+ $(Platform)\lib\$(Configuration)\$(TargetName).lib
$(TargetDir)$(TargetName).pdb
+
+ xcopy /F /Y "$(SolutionDir)..\mono\cil\opcode.def" "$(SolutionDir)include\mono\cil\"
+xcopy /F /Y "$(SolutionDir)..\mono\mini\jit.h" "$(SolutionDir)include\mono\jit\"
+xcopy /F /Y "$(SolutionDir)..\mono\metadata\*.h" "$(SolutionDir)include\mono\metadata\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-counters.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-dl-fallback.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-error.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-logger.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(SolutionDir)include\mono\utils\"
+
@@ -372,13 +391,23 @@
false
- libgc.lib;libmonoruntime.lib;libmonoutils.lib;eglib.lib;%(AdditionalDependencies)
+ %(AdditionalDependencies)
$(Platform)\lib;%(AdditionalLibraryDirectories)
mono.def
true
- $(Platform)\lib\$(TargetName).lib
+ $(Platform)\lib\$(Configuration)\$(TargetName).lib
MachineX64
+
+ xcopy /F /Y "$(SolutionDir)..\mono\cil\opcode.def" "$(SolutionDir)include\mono\cil\"
+xcopy /F /Y "$(SolutionDir)..\mono\mini\jit.h" "$(SolutionDir)include\mono\jit\"
+xcopy /F /Y "$(SolutionDir)..\mono\metadata\*.h" "$(SolutionDir)include\mono\metadata\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-counters.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-dl-fallback.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-error.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-logger.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(SolutionDir)include\mono\utils\"
+
@@ -416,11 +445,21 @@
libgc.lib;libmonoruntimesgen.lib;libmonoutils.lib;eglib.lib;%(AdditionalDependencies)
$(Platform)\lib;%(AdditionalLibraryDirectories)
- monosgen64.def
+ monosgen.def
true
- $(Platform)\lib\$(TargetName).lib
+ $(Platform)\lib\$(Configuration)\$(TargetName).lib
MachineX64
+
+ xcopy /F /Y "$(SolutionDir)..\mono\cil\opcode.def" "$(SolutionDir)include\mono\cil\"
+xcopy /F /Y "$(SolutionDir)..\mono\mini\jit.h" "$(SolutionDir)include\mono\jit\"
+xcopy /F /Y "$(SolutionDir)..\mono\metadata\*.h" "$(SolutionDir)include\mono\metadata\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-counters.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-dl-fallback.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-error.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-logger.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(SolutionDir)include\mono\utils\"
+
@@ -438,7 +477,8 @@
true
- .\Release/libmono.pch
+
+
CompileAsC
@@ -449,15 +489,25 @@
false
- libgc.lib;libmonoruntime.lib;libmonoutils.lib;eglib.lib;%(AdditionalDependencies)
+ %(AdditionalDependencies)
$(Platform)\lib;%(AdditionalLibraryDirectories)
mono.def
false
- $(Platform)\lib\$(TargetName).lib
+ $(Platform)\lib\$(Configuration)\$(TargetName).lib
true
+
+ xcopy /F /Y "$(SolutionDir)..\mono\cil\opcode.def" "$(SolutionDir)include\mono\cil\"
+xcopy /F /Y "$(SolutionDir)..\mono\mini\jit.h" "$(SolutionDir)include\mono\jit\"
+xcopy /F /Y "$(SolutionDir)..\mono\metadata\*.h" "$(SolutionDir)include\mono\metadata\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-counters.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-dl-fallback.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-error.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-logger.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(SolutionDir)include\mono\utils\"
+
@@ -475,7 +525,8 @@
true
- .\Release/libmono.pch
+
+
CompileAsC
@@ -486,16 +537,26 @@
false
- libgc.lib;libmonoruntimesgen.lib;libmonoutils.lib;eglib.lib;%(AdditionalDependencies)
+ %(AdditionalDependencies)
$(Platform)\lib;%(AdditionalLibraryDirectories)
monosgen.def
false
- $(Platform)\lib\$(TargetName).lib
+ $(Platform)\lib\$(Configuration)\$(TargetName).lib
true
$(TargetDir)$(TargetName).pdb
+
+ xcopy /F /Y "$(SolutionDir)..\mono\cil\opcode.def" "$(SolutionDir)include\mono\cil\"
+xcopy /F /Y "$(SolutionDir)..\mono\mini\jit.h" "$(SolutionDir)include\mono\jit\"
+xcopy /F /Y "$(SolutionDir)..\mono\metadata\*.h" "$(SolutionDir)include\mono\metadata\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-counters.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-dl-fallback.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-error.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-logger.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(SolutionDir)include\mono\utils\"
+
@@ -516,7 +577,8 @@
true
- .\Release/libmono.pch
+
+
CompileAsC
@@ -527,13 +589,23 @@
false
- libgc.lib;libmonoruntime.lib;libmonoutils.lib;eglib.lib;%(AdditionalDependencies)
+ %(AdditionalDependencies)
$(Platform)\lib;%(AdditionalLibraryDirectories)
mono.def
- $(Platform)\lib\$(TargetName).lib
+ $(Platform)\lib\$(Configuration)\$(TargetName).lib
MachineX64
true
+
+ xcopy /F /Y "$(SolutionDir)..\mono\cil\opcode.def" "$(SolutionDir)include\mono\cil\"
+xcopy /F /Y "$(SolutionDir)..\mono\mini\jit.h" "$(SolutionDir)include\mono\jit\"
+xcopy /F /Y "$(SolutionDir)..\mono\metadata\*.h" "$(SolutionDir)include\mono\metadata\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-counters.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-dl-fallback.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-error.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-logger.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(SolutionDir)include\mono\utils\"
+
@@ -554,7 +626,8 @@
true
- .\Release/libmono.pch
+
+
CompileAsC
@@ -565,13 +638,23 @@
false
- libgc.lib;libmonoruntimesgen.lib;libmonoutils.lib;eglib.lib;%(AdditionalDependencies)
+ %(AdditionalDependencies)
$(Platform)\lib;%(AdditionalLibraryDirectories)
- monosgen64.def
- $(Platform)\lib\$(TargetName).lib
+ monosgen.def
+ $(Platform)\lib\$(Configuration)\$(TargetName).lib
MachineX64
true
+
+ xcopy /F /Y "$(SolutionDir)..\mono\cil\opcode.def" "$(SolutionDir)include\mono\cil\"
+xcopy /F /Y "$(SolutionDir)..\mono\mini\jit.h" "$(SolutionDir)include\mono\jit\"
+xcopy /F /Y "$(SolutionDir)..\mono\metadata\*.h" "$(SolutionDir)include\mono\metadata\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-counters.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-dl-fallback.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-error.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-logger.h" "$(SolutionDir)include\mono\utils\"
+xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(SolutionDir)include\mono\utils\"
+
@@ -590,15 +673,35 @@
{158073ed-99ae-4196-9edc-ddb2344f8466}
- false
-
-
- {b7098dfa-31e6-4006-8a15-1c9a4e925149}
- false
+ false
+ true
+ false
+ true
+ false
{eb56000b-c80b-4e8b-908d-d84d31b517d3}
- false
+ true
+ false
+ false
+ true
+ false
+
+
+ {c36612bd-22d3-4b95-85e2-7fdc4fc5d739}
+ false
+ true
+ false
+ true
+ false
+
+
+ {8fc2b0c8-51ad-49df-851f-5d01a77a75e4}
+ false
+ true
+ false
+ true
+ false