Index: WindowsPlatform.java =================================================================== RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/platforms/WindowsPlatform.java,v retrieving revision 1.1 diff -u -r1.1 WindowsPlatform.java --- WindowsPlatform.java 11 May 2004 04:50:13 -0000 1.1 +++ WindowsPlatform.java 21 May 2004 02:31:16 -0000 @@ -215,7 +215,7 @@ final boolean isDebug, final LinkType linkType) throws IOException { - writer.write("#include \"windows.h\"\n"); + //writer.write("#include \"windows.h\"\n"); writer.write("VS_VERSION_INFO VERSIONINFO\n"); StringBuffer buf = new StringBuffer("FILEVERSION "); @@ -225,20 +225,20 @@ buf.append("\n"); writer.write(buf.toString()); buf.setLength(0); - buf.append("FILEFLAGSMASK VS_FF_DEBUG"); + buf.append("FILEFLAGSMASK 0x1L /* VS_FF_DEBUG */"); Boolean patched = versionInfo.getPatched(); Boolean prerelease = versionInfo.getPrerelease(); if (patched != null) { - buf.append(" | VS_FF_PATCHED"); + buf.append(" | 0x4L /* VS_FF_PATCHED */"); } if (prerelease != null) { - buf.append(" | VS_FF_PRERELEASE"); + buf.append(" | 0x2L /* VS_FF_PRERELEASE */"); } if (versionInfo.getPrivatebuild() != null) { - buf.append(" | VS_FF_PRIVATEBUILD"); + buf.append(" | 0x8L /* VS_FF_PRIVATEBUILD */"); } if (versionInfo.getSpecialbuild() != null) { - buf.append(" | VS_FF_SPECIALBUILD"); + buf.append(" | 0x20L /* VS_FF_SPECIALBUILD */"); } buf.append('\n'); writer.write(buf.toString()); @@ -246,19 +246,19 @@ buf.append("FILEFLAGS "); if (isDebug) { - buf.append("VS_FF_DEBUG | "); + buf.append("0x1L /* VS_FF_DEBUG */ | "); } if (Boolean.TRUE.equals(patched)) { - buf.append("VS_FF_PATCHED | "); + buf.append("0x4L /* VS_FF_PATCHED */ | "); } if (Boolean.TRUE.equals(prerelease)) { - buf.append("VS_FF_PRERELEASE | "); + buf.append("0x2L /* VS_FF_PRERELEASE */ | "); } if (Boolean.TRUE.equals(versionInfo.getPrivatebuild())) { - buf.append("VS_FF_PRIVATEBUILD | "); + buf.append("0x8L /* VS_FF_PRIVATEBUILD */ | "); } if (Boolean.TRUE.equals(versionInfo.getSpecialbuild())) { - buf.append("VS_FF_SPECIALBUILD | "); + buf.append("0x20L /* VS_FF_SPECIALBUILD */ | "); } if (buf.length() > 10) { buf.setLength(buf.length() - 3); @@ -269,16 +269,16 @@ writer.write(buf.toString()); buf.setLength(0); - writer.write("FILEOS VOS_NT_WINDOWS32\nFILETYPE "); + writer.write("FILEOS 0x40004 /* VOS_NT_WINDOWS32 */\nFILETYPE "); if (linkType.isExecutable()) { - writer.write("VFT_APP\n"); + writer.write("0x1L /* VFT_APP */\n"); } else { if (linkType.isSharedLibrary()) { - writer.write("VFT_DLL\n"); + writer.write("0x2L /* VFT_DLL */\n"); } else if (linkType.isStaticLibrary()) { - writer.write("VFT_STATIC_LIB\n"); + writer.write("0x7L /* VFT_STATIC_LIB */\n"); } else { - writer.write("VFT_UNKNOWN\n"); + writer.write("0x0L /* VFT_UNKNOWN */\n"); } } writer.write("FILESUBTYPE 0x0L\n");