From 082aea775c60bbccb3883e2a2e8009281d92c20a Mon Sep 17 00:00:00 2001 From: batt Date: Fri, 17 Apr 2009 14:20:08 +0000 Subject: [PATCH] Supply a default ARCH. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2542 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cfg/cfg_arch.h | 6 +++--- bertos/verstag.h | 9 ++------- wizard/mktemplates/template.mk | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/bertos/cfg/cfg_arch.h b/bertos/cfg/cfg_arch.h index ea85566d..4b196a41 100644 --- a/bertos/cfg/cfg_arch.h +++ b/bertos/cfg/cfg_arch.h @@ -31,7 +31,7 @@ * * --> * - * \brief Set system configuration + * \brief Set system configuration. * * \version $Id$ * @@ -43,8 +43,8 @@ #ifndef CFG_ARCH_CONFIG_H #define CFG_ARCH_CONFIG_H -#define ARCH_FOO (1<<0) ///< FOO architecture -#define ARCH_BAR (1<<1) ///< BAR architecture +#define ARCH_DEFAULT (1<<0) ///< Default architecture + #define ARCH_EMUL (1<<2) ///< EMUL architecture #define ARCH_QT (1<<3) ///< QT architecture #define ARCH_UNITTEST (1<<4) ///< UNITTEST architecture diff --git a/bertos/verstag.h b/bertos/verstag.h index ec9bc930..057a6318 100644 --- a/bertos/verstag.h +++ b/bertos/verstag.h @@ -49,15 +49,10 @@ #define APP_NAME "Appname" #define APP_DESCRIPTION "Long application name description" #define APP_AUTHOR "Develer" -#define APP_COPYRIGHT "Copyright 2006 Develer (http://www.develer.com/)" +#define APP_COPYRIGHT "Copyright 2009 Develer (http://www.develer.com/)" -#if ARCH & ARCH_FOO - #define VERS_MAJOR 0 - #define VERS_MINOR 1 - #define VERS_REV 0 - #define VERS_LETTER "" -#elif ARCH & ARCH_BAR +#if ARCH & ARCH_DEFAULT #define VERS_MAJOR 0 #define VERS_MINOR 1 #define VERS_REV 0 diff --git a/wizard/mktemplates/template.mk b/wizard/mktemplates/template.mk index 45e75eb8..a411a815 100644 --- a/wizard/mktemplates/template.mk +++ b/wizard/mktemplates/template.mk @@ -83,7 +83,7 @@ $pname_ASRC = $($pname_WIZARD_ASRC) $($pname_USER_ASRC) $pname_CFLAGS = $cflags $pname_LDFLAGS = $ldflags -$pname_CPPFLAGS = -D'CPU_FREQ=($cpuclockfreqUL)' $cppflags -I$pname/ +$pname_CPPFLAGS = -D'CPU_FREQ=($cpuclockfreqUL)' -D'ARCH=(ARCH_DEFAULT)' $cppflags -I$pname/ $pname_CPPAFLAGS = $cppaflags $pname_CXXFLAGS = $cxxflags $pname_ASFLAGS = $asflags -- 2.25.1