X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fmktemplates%2Ftemplate.mk;h=9d7dabceed561e73373caf5c671e77e3dcc48671;hb=cbabb5e82238a5297656c219ff24710b13701d7f;hp=402df258630e12b5c96a19b14b6a22c184bbc7de;hpb=2fa239467da2f67787ed665050ced418479c3013;p=bertos.git

diff --git a/wizard/mktemplates/template.mk b/wizard/mktemplates/template.mk
index 402df258..9d7dabce 100644
--- a/wizard/mktemplates/template.mk
+++ b/wizard/mktemplates/template.mk
@@ -14,9 +14,9 @@ $constants
 # Our target application
 TRG += $pname
 
-$pname_PREFIX = $prefix
+$pname_PREFIX = "$prefix"
 
-$pname_SUFFIX = $suffix
+$pname_SUFFIX = "$suffix"
 
 $pname_$cpuflag = $cpuname
 
@@ -47,7 +47,7 @@ $pname_PCSRC = $($pname_WIZARD_PCSRC) $($pname_USER_PCSRC)
 
 # Files automatically generated by the wizard. DO NOT EDIT, USE $pname_USER_CPPASRC INSTEAD!
 $pname_WIZARD_CPPASRC = \
-	$asrc
+	$cppasrc
 	#
 
 # Files included by the user.
@@ -57,9 +57,33 @@ $pname_USER_CPPASRC = \
 # Automatically generated by the wizard. PLEASE DO NOT EDIT!
 $pname_CPPASRC = $($pname_WIZARD_CPPASRC) $($pname_USER_CPPASRC)
 
+# Files automatically generated by the wizard. DO NOT EDIT, USE $pname_USER_CXXSRC INSTEAD!
+$pname_WIZARD_CXXSRC = \
+	$cxxsrc
+	#
+
+# Files included by the user.
+$pname_USER_CXXSRC = \
+	#
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+$pname_CXXSRC = $($pname_WIZARD_CXXSRC) $($pname_USER_CXXSRC)
+
+# Files automatically generated by the wizard. DO NOT EDIT, USE $pname_USER_ASRC INSTEAD!
+$pname_WIZARD_ASRC = \
+	$asrc
+	#
+
+# Files included by the user.
+$pname_USER_ASRC = \
+	#
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+$pname_ASRC = $($pname_WIZARD_ASRC) $($pname_USER_ASRC)
+
 $pname_CFLAGS = $cflags
 $pname_LDFLAGS = $ldflags
-$pname_CPPFLAGS = $cppflags
+$pname_CPPFLAGS = -D'CPU_FREQ=($cpuclockfreqUL)' -D'ARCH=(ARCH_DEFAULT)' -D'WIZ_AUTOGEN' -I$pname/ $cppflags
 $pname_CPPAFLAGS = $cppaflags
 $pname_CXXFLAGS = $cxxflags
 $pname_ASFLAGS = $asflags