larryi 01/12/03 17:43:52
Modified: jk/jkant/java/org/apache/jk/ant/compilers MsvcLinker.java
MsvcCompiler.java
Log:
Add win32.debug and win32.release properies. Updates to compiler
and linker flags generated.
Revision Changes Path
1.4 +5 -1
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcLinker.java
Index: MsvcLinker.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcLinker.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MsvcLinker.java 2001/11/16 22:23:22 1.3
+++ MsvcLinker.java 2001/12/04 01:43:52 1.4
@@ -84,6 +84,10 @@
so.setExtension(".dll");
so.duplicateTo( this );
project.setProperty("win32", "true");
+ if (optG)
+ project.setProperty("win32.debug", "true");
+ else
+ project.setProperty("win32.release", "true");
}
public void execute() throws BuildException {
@@ -142,7 +146,7 @@
// add debug information in if requested
if (optG)
{
- //XXX: todo
+ linkOptPw.print("/debug ");
}
// def file
linkOptPw.println("/def:link.def");
1.4 +8 -2
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcCompiler.java
Index: MsvcCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcCompiler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MsvcCompiler.java 2001/11/16 22:23:22 1.3
+++ MsvcCompiler.java 2001/12/04 01:43:52 1.4
@@ -89,6 +89,10 @@
so.setExtension(".dll");
so.duplicateTo( this );
project.setProperty("win32", "true");
+ if (optG)
+ project.setProperty("win32.debug", "true");
+ else
+ project.setProperty("win32.release", "true");
}
/** Compile using msvc
@@ -132,14 +136,16 @@
String localCflags=cflags;
File ccOpt = new File(buildDir, "cc.opt");
if( localCflags==null ) {
- localCflags=new String("-nologo -MT -W3 -GX -O2 -c");
+ localCflags=new String("-nologo -W3 -GX -O2 -c");
if( extra_cflags!=null ) {
localCflags+=" " + extra_cflags;
}
}
if (optG)
- localCflags += " -g";
+ localCflags += " -MTd -Zi";
+ else
+ localCflags += " -MT";
// create a cc.opt file
PrintWriter ccpw = null;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
