summaryrefslogtreecommitdiff
path: root/src/main/java/org
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/Linker.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/Linker.java b/src/main/java/org/apache/maven/plugin/nar/Linker.java
index 2bfc6aa..385bdf2 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Linker.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Linker.java
@@ -288,6 +288,15 @@ public class Linker
linker.addConfiguredLinkerArg( arg );
}
}
+
+ // FIXME, this should be done in CPPTasks at some point, and may not be necessary, but was for VS 2010 beta 2
+ if ( os.equals( OS.WINDOWS )
+ && getName( null, null ).equals( "msvc" ) && !getVersion().startsWith( "6." ) ) {
+ LinkerArgument arg = new LinkerArgument();
+ arg.setValue( "/MANIFEST" );
+ linker.addConfiguredLinkerArg( arg );
+ }
+
// Add options to linker
if ( options != null )