X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fmktemplates%2Ftemplate_wiz.mk;h=8edc07c59854d452d340a3990fe6261b45a80a68;hb=441c294a809638c22c77ae37c8e7bb57cf57f126;hp=88bd3f71d4663e63503cc23fb65b65795ff9942d;hpb=019ad4b6e3fca2cbe5e739c94385aadd8dd16bfa;p=bertos.git

diff --git a/wizard/mktemplates/template_wiz.mk b/wizard/mktemplates/template_wiz.mk
index 88bd3f71..8edc07c5 100644
--- a/wizard/mktemplates/template_wiz.mk
+++ b/wizard/mktemplates/template_wiz.mk
@@ -18,8 +18,6 @@ $pname_PREFIX = "$prefix"
 
 $pname_SUFFIX = "$suffix"
 
-$pname_$cpuflag = $cpuname
-
 # Files automatically generated by the wizard. DO NOT EDIT, USE $pname_USER_CSRC INSTEAD!
 $pname_WIZARD_CSRC = \
 	$csrc
@@ -45,19 +43,29 @@ $pname_WIZARD_ASRC = \
 	$asrc
 	#
 
-$pname_CPPFLAGS = -D'CPU_FREQ=($cpuclockfreqUL)' -D'ARCH=(ARCH_DEFAULT)' -D'WIZ_AUTOGEN' -I$pname/ $($pname_CPU_CPPFLAGS)
+$pname_CPPFLAGS = -D'CPU_FREQ=($cpuclockfreqUL)' -D'ARCH=(ARCH_DEFAULT)' -D'WIZ_AUTOGEN' -I$pname/ $($pname_CPU_CPPFLAGS) $($pname_USER_CPPFLAGS)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+$pname_LDFLAGS = $($pname_CPU_LDFLAGS) $($pname_WIZARD_LDFLAGS) $($pname_USER_LDFLAGS)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+$pname_CPPAFLAGS = $($pname_CPU_CPPAFLAGS) $($pname_WIZARD_CPPAFLAGS) $($pname_USER_CPPAFLAGS)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+$pname_CSRC = $($pname_CPU_CSRC) $($pname_WIZARD_CSRC) $($pname_USER_CSRC)
 
 # Automatically generated by the wizard. PLEASE DO NOT EDIT!
-$pname_CSRC = $($pname_WIZARD_CSRC) $($pname_USER_CSRC)
+$pname_PCSRC = $($pname_CPU_PCSRC) $($pname_WIZARD_PCSRC) $($pname_USER_PCSRC)
 
 # Automatically generated by the wizard. PLEASE DO NOT EDIT!
-$pname_PCSRC = $($pname_WIZARD_PCSRC) $($pname_USER_PCSRC)
+$pname_CPPASRC = $($pname_CPU_CPPASRC) $($pname_WIZARD_CPPASRC) $($pname_USER_CPPASRC)
 
 # Automatically generated by the wizard. PLEASE DO NOT EDIT!
-$pname_CPPASRC = $($pname_WIZARD_CPPASRC) $($pname_USER_CPPASRC)
+$pname_CXXSRC = $($pname_CPU_CXXSRC) $($pname_WIZARD_CXXSRC) $($pname_USER_CXXSRC)
 
 # Automatically generated by the wizard. PLEASE DO NOT EDIT!
-$pname_CXXSRC = $($pname_WIZARD_CXXSRC) $($pname_USER_CXXSRC)
+$pname_ASRC = $($pname_CPU_ASRC) $($pname_WIZARD_ASRC) $($pname_USER_ASRC)
 
+# CPU specific flags and options, defined in the CPU definition files.
 # Automatically generated by the wizard. PLEASE DO NOT EDIT!
-$pname_ASRC = $($pname_WIZARD_ASRC) $($pname_USER_ASRC)
+$cpuparameters