Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/devstudio
In directory usw-pr-cvs1:/tmp/cvs-serv10878
Modified Files:
DevStudioCCompiler.java
Log Message:
Patches to /MT, /ML and /MD logic
Index: DevStudioCCompiler.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DevStudioCCompiler.java 18 Apr 2002 08:41:06 -0000 1.10
--- DevStudioCCompiler.java 24 Apr 2002 19:04:03 -0000 1.11
***************
*** 129,140 ****
private static String[] mflags = new String[] {
//
! // first eight are single-threaded
! // static runtime exe, static runtime debug exe,
! // dynamic runtime exe, dynamic runtime debug exe
! // and same for dlls
! "/ML", "/MLd", null, null, "/ML", "/MLd", null, null,
! //
! // same sequence for multi-threaded
! null, null, "/MT", "/MTd", null, null, "/MD", "/MDd" };
public void addImpliedArgs(Vector args,
--- 129,137 ----
private static String[] mflags = new String[] {
//
! // first four are single-threaded
! // (runtime=static,debug=false), (..,debug=true),
! // (runtime=dynamic,debug=true), (..,debug=false), (not supported)
! // next four are multi-threaded, same sequence
! "/ML", "/MLd", null, null, "/MT", "/MTd", "/MD", "/MDd" };
public void addImpliedArgs(Vector args,
***************
*** 151,157 ****
int mindex = 0;
if(multithreaded) {
- mindex += 8;
- }
- if(!staticLink) {
mindex += 4;
}
--- 148,151 ----
***************
*** 171,175 ****
if(mflag == null) {
throw new BuildException(
! "Unsupported combination of multithread, runtime and link");
}
args.addElement(mflag);
--- 165,169 ----
if(mflag == null) {
throw new BuildException(
! "multithread='false' and runtime='dynamic' not supported");
}
args.addElement(mflag);
|