From: duplo <duplo@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Fri, 10 Apr 2009 15:34:43 +0000 (+0000)
Subject: Add other compilation flags
X-Git-Tag: 2.1.0~197
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=2fa239467da2f67787ed665050ced418479c3013;p=bertos.git

Add other compilation flags

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

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 5478cf15..2c84468a 100644
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -89,6 +89,11 @@ 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["$cppflags"] = " ".join(project_info.info("CPU_INFOS")["CPP_FLAGS"])
+    mk_data["$cppaflags"] = " ".join(project_info.info("CPU_INFOS")["CPPA_FLAGS"])
+    mk_data["$cxxflags"] = " ".join(project_info.info("CPU_INFOS")["CXX_FLAGS"])
+    mk_data["$asflags"] = " ".join(project_info.info("CPU_INFOS")["AS_FLAGS"])
+    mk_data["$arflags"] = " ".join(project_info.info("CPU_INFOS")["AR_FLAGS"])
     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]
diff --git a/wizard/const.py b/wizard/const.py
index 716f0b51..8fd71619 100644
--- a/wizard/const.py
+++ b/wizard/const.py
@@ -23,6 +23,10 @@ CPU_DEF = {
     "C_FLAGS": [],
     "CPPA_FLAGS" : [],
     "CPP_FLAGS" : [],
+    "CPPA_FLAGS": [],
+    "CXX_FLAGS": [],
+    "AS_FLAGS": [],
+    "AR_FLAGS": [],
     "LD_FLAGS" : [],
     "CPPA_SRC" : [],
     "SUPPORTED_DRV" : [],
diff --git a/wizard/mktemplates/template.mk b/wizard/mktemplates/template.mk
index b42dd097..402df258 100644
--- a/wizard/mktemplates/template.mk
+++ b/wizard/mktemplates/template.mk
@@ -59,3 +59,8 @@ $pname_CPPASRC = $($pname_WIZARD_CPPASRC) $($pname_USER_CPPASRC)
 
 $pname_CFLAGS = $cflags
 $pname_LDFLAGS = $ldflags
+$pname_CPPFLAGS = $cppflags
+$pname_CPPAFLAGS = $cppaflags
+$pname_CXXFLAGS = $cxxflags
+$pname_ASFLAGS = $asflags
+$pname_ARFLAGS = $arflags