From: duplo <duplo@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Thu, 26 Mar 2009 10:28:47 +0000 (+0000)
Subject: Add CPPASRC to the mk file
X-Git-Tag: 2.1.0~245
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=2cb518f1b99af32c5edecfeb058e27d62f344435;p=bertos.git

Add CPPASRC to the mk file

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2437 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index ceb82c71..1c8caaa7 100644
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -89,7 +89,7 @@ def mkGenerator(project_info, makefile):
     mk_data["$cpuname"] = project_info.info("CPU_INFOS")["CORE_CPU"]
     mk_data["$cflags"] = " ".join(project_info.info("CPU_INFOS")["C_FLAGS"])
     mk_data["$ldflags"] = " ".join(project_info.info("CPU_INFOS")["LD_FLAGS"])
-    mk_data["$csrc"], mk_data["$pcsrc"], mk_data["$constants"] = csrcGenerator(project_info)
+    mk_data["$csrc"], mk_data["$pcsrc"], mk_data["$asrc"], mk_data["$constants"] = csrcGenerator(project_info)
     mk_data["$prefix"] = project_info.info("TOOLCHAIN")["path"].split("gcc")[0]
     mk_data["$suffix"] = project_info.info("TOOLCHAIN")["path"].split("gcc")[1]
     mk_data["$cross"] = project_info.info("TOOLCHAIN")["path"].split("gcc")[0]
@@ -119,6 +119,8 @@ def csrcGenerator(project_info):
     csrc = []
     ## file to be included in PCSRC variable
     pcsrc = []
+    ## files to be included in CPPASRC variable
+    asrc = []
     ## constants to be included at the beginning of the makefile
     constants = {}
     for module, information in modules.items():
@@ -144,10 +146,13 @@ def csrcGenerator(project_info):
                     pcsrc.append(file)
             for file in dependency_files:
                 csrc.append(file)
+            for file in asm_files:
+                asrc.append(file)
     csrc = " \\\n\t".join(csrc) + " \\"
     pcsrc = " \\\n\t".join(pcsrc) + " \\"
+    asrc = " \\\n\t".join(asrc) + " \\"
     constants = "\n".join([os.path.basename(project_info.info("PROJECT_PATH")) + "_" + key + " = " + str(value) for key, value in constants.items()])
-    return csrc, pcsrc, constants
+    return csrc, pcsrc, asrc, constants
     
 def findModuleFiles(module, project_info):
     ## Find the files related to the selected module
diff --git a/wizard/mktemplates/template.mk b/wizard/mktemplates/template.mk
index 4c3b886c..8c2f31b8 100644
--- a/wizard/mktemplates/template.mk
+++ b/wizard/mktemplates/template.mk
@@ -31,6 +31,9 @@ $pname_PCSRC += \
 	$pcsrc
 	#
 
+$pname_CPPASRC += \
+	$asrc
+	#
 
 $pname_CFLAGS = $cflags
 $pname_LDFLAGS = $ldflags