From: Curt A. <ca...@us...> - 2003-02-26 05:47:10
|
Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/gcc In directory sc8-pr-cvs1:/tmp/cvs-serv11947/src/net/sf/antcontrib/cpptasks/gcc Modified Files: AbstractLdLinker.java Log Message: Make type="plugin" equivalent to type="shared" for non Mac OS X compilers. Index: AbstractLdLinker.java =================================================================== RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** AbstractLdLinker.java 20 Feb 2003 08:06:15 -0000 1.12 --- AbstractLdLinker.java 26 Feb 2003 05:47:05 -0000 1.13 *************** *** 109,117 **** if (linkType.isPluginModule()) { args.addElement("-bundle"); ! } ! if (linkType.isSharedLibrary()) { ! args.addElement("-prebind"); ! args.addElement("-dynamiclib"); ! } } else { if (linkType.isStaticRuntime()) { --- 109,118 ---- if (linkType.isPluginModule()) { args.addElement("-bundle"); ! } else { ! if (linkType.isSharedLibrary()) { ! args.addElement("-prebind"); ! args.addElement("-dynamiclib"); ! } ! } } else { if (linkType.isStaticRuntime()) { *************** *** 120,127 **** if (linkType.isPluginModule()) { args.addElement("-shared"); ! } ! if (linkType.isSharedLibrary()) { ! args.addElement("-shared"); ! } } } --- 121,129 ---- if (linkType.isPluginModule()) { args.addElement("-shared"); ! } else { ! if (linkType.isSharedLibrary()) { ! args.addElement("-shared"); ! } ! } } } |