From: Adam M. <ada...@us...> - 2002-01-09 06:37:31
|
Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/devstudio In directory usw-pr-cvs1:/tmp/cvs-serv27731/net/sf/antcontrib/cpptasks/devstudio Modified Files: DevStudioLinker.java Log Message: - <libset> can now contain nested <fileset> elements. - A linker can specify whether it can handle static and/or shared libs for input. Specifically: - devstudio link does not handle .dll files, only .lib - static linkers do not handle libraries. Need to check if this is true. Index: DevStudioLinker.java =================================================================== RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DevStudioLinker.java 2002/01/08 12:23:15 1.3 --- DevStudioLinker.java 2002/01/09 06:37:28 1.4 *************** *** 90,94 **** } cmdline.addElement("/NOLOGO"); - cmdline.addElement("/MACHINE:IX86"); if ( _type == LinkType.DYNAMIC_LIBRARY ) { cmdline.addElement("/DLL"); --- 90,93 ---- *************** *** 98,101 **** --- 97,118 ---- /** + * Returns true if this linker can use static libraries. + */ + protected boolean usesStaticLibs() + { + // Can't pass static libs to 'lib' + return (_type != LinkType.STATIC_LIBRARY); + } + + /** + * Returns true if this linker can use shared libraries. + */ + protected boolean usesSharedLibs() + { + // Need to pass a .lib, rather than a .dll to 'link' + return false; + } + + /** * Adds debug/no-debug flags to the command. */ *************** *** 115,119 **** /** ! * Adds a library. This implementation does nothing. */ protected void addLibrary(String libBaseName, Vector cmdline) --- 132,136 ---- /** ! * Adds a library. */ protected void addLibrary(String libBaseName, Vector cmdline) |