projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
48cf619
)
[mkbundle] Correct some linking options for Windows
author
Alexis Christoforides
<alexis@thenull.net>
Thu, 17 Dec 2015 18:43:57 +0000
(13:43 -0500)
committer
Alexis Christoforides
<alexis@thenull.net>
Thu, 17 Dec 2015 18:45:20 +0000
(13:45 -0500)
mcs/tools/mkbundle/mkbundle.cs
patch
|
blob
|
history
diff --git
a/mcs/tools/mkbundle/mkbundle.cs
b/mcs/tools/mkbundle/mkbundle.cs
index e24b924e761fb78c394160fe22f9543f75117c1d..116ffd44cdc57bc408ef1c636a1ae17e6283bfeb 100755
(executable)
--- a/
mcs/tools/mkbundle/mkbundle.cs
+++ b/
mcs/tools/mkbundle/mkbundle.cs
@@
-493,15
+493,12
@@
void mono_register_config_for_assembly (const char* assembly_name, cons
foreach (string include in includes)
compilerArgs.Add(String.Format ("/I {0}", quote (include)));
foreach (string include in includes)
compilerArgs.Add(String.Format ("/I {0}", quote (include)));
- if (static_link) {
- compilerArgs.Add("/MT");
- monoFile = LocateFile (monoPath + @"\lib\mono-2.0.lib");
- }
- else {
- compilerArgs.Add("/MD");
- monoFile = LocateFile (monoPath + @"\lib\mono-2.0.dll");
- }
+ if (static_link)
+ monoFile = LocateFile (monoPath + @"\lib\monosgen-2.0.lib");
+ else
+ monoFile = LocateFile (monoPath + @"\lib\monosgen-2.0dll");
+ compilerArgs.Add("/MD");
compilerArgs.Add(temp_c);
compilerArgs.Add(temp_o);
compilerArgs.Add("/link");
compilerArgs.Add(temp_c);
compilerArgs.Add(temp_o);
compilerArgs.Add("/link");