</targetfiles>\r
\r
<sequential>\r
- <!-- <echo>re-generate dll</echo> -->\r
- <cc userdefine="on">\r
- <command type="LIB">\r
- <argument value="${LIB_FLAGS}"/>\r
- <FileList dir="" files="${OBJECTS}"/>\r
- <LIB.ARG/>\r
- <!-- <argument value="/OUT:${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}Local.lib"/> -->\r
- <OutputFile value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}Local.lib"/>\r
- </command>\r
- </cc>\r
- \r
<cc userdefine="on">\r
<command type="LINK">\r
<argument value="${LINK_FLAGS}"/>\r
- <!-- <argument value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}Local.lib"/> -->\r
- <!--<argument value="${LIBS}"/>-->\r
- <libSet libs="${LIBS} ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}Local.lib"/>\r
+ <libset libs="${LIBS}"/>\r
<LINK.ARG/>\r
- <!-- <argument value="/ENTRY:_ModuleEntryPoint"/> -->\r
<EntryPoint value="_ModuleEntryPoint"/>\r
- <!-- <argument value="/MAP:${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.map"/> -->\r
<map value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.map"/>\r
- <!-- <argument value="/PDB:${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.pdb"/> -->\r
<pdb value="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.pdb"/>\r
- <!-- <argument value="/OUT:${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.dll"/> -->\r
<OutputFile value="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.dll"/>\r
+ <FileList dir="" files="${OBJECTS}"/>\r
</command>\r
</cc>\r
</sequential>\r
Set <code>LIBS</code> for further build usage. \r
**/\r
public void execute() throws BuildException {\r
- \r
- String[] libraries = GlobalData.getModuleLibrary(getProject().getProperty("BASE_NAME"));\r
+ String basename = getProject().getProperty("BASE_NAME");\r
+ String arch = getProject().getProperty("ARCH");\r
+ arch = arch.toUpperCase();\r
+ String[] libraries = GlobalData.getModuleLibrary(basename, arch);\r
String str = "";\r
for (int i = 0; i < libraries.length; i ++){\r
- str += " " + GlobalData.getLibrary(libraries[i]);\r
+ str += " " + GlobalData.getLibrary(libraries[i], arch);\r
}\r
getProject().setProperty("LIBS", str);\r
\r
// Update flags like CC_FLAGS, LIB_FLAGS etc.\r
//\r
flagsSetup();\r
- GlobalData.addLibrary(baseName, getProject().getProperty("BIN_DIR") + File.separatorChar + baseName + ".lib");\r
- GlobalData.addModuleLibrary(baseName, libraries);\r
+ GlobalData.addLibrary(baseName, arch, getProject().getProperty("BIN_DIR") + File.separatorChar + baseName + ".lib");\r
+ GlobalData.addModuleLibrary(baseName, arch, libraries);\r
//\r
// If ComponentType is USER_DEFINED,\r
// then call the exist BaseName_build.xml directly.\r
@param moduleName the base name of the module\r
@return the libraries which the module depends on\r
**/\r
- public synchronized static String[] getModuleLibrary(String moduleName) {\r
- Set<String> set = moduleLibraryMap.get(moduleName);\r
+ public synchronized static String[] getModuleLibrary(String moduleName, String arch) {\r
+ Set<String> set = moduleLibraryMap.get(moduleName + "-" + arch);\r
return set.toArray(new String[set.size()]);\r
}\r
\r
@param moduleName the base name of the module\r
@param libraryList the libraries which the module depends on\r
**/\r
- public synchronized static void addModuleLibrary(String moduleName, Set<String> libraryList) {\r
- moduleLibraryMap.put(moduleName, libraryList);\r
+ public synchronized static void addModuleLibrary(String moduleName, String arch, Set<String> libraryList) {\r
+ moduleLibraryMap.put(moduleName + "-" + arch, libraryList);\r
}\r
\r
/**\r
@param library the base name of the library\r
@return the library absolute file name\r
**/\r
- public synchronized static String getLibrary(String library) {\r
- return libraries.get(library);\r
+ public synchronized static String getLibrary(String library, String arch) {\r
+ return libraries.get(library + "-" + arch);\r
}\r
\r
/**\r
@param library the base name of the library\r
@param resultPath the library absolute file name\r
**/\r
- public synchronized static void addLibrary(String library, String resultPath) {\r
- libraries.put(library, resultPath);\r
+ public synchronized static void addLibrary(String library, String arch, String resultPath) {\r
+ libraries.put(library + "-" + arch, resultPath);\r
}\r
\r
/**\r