projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IRQ_ENABLED(): Prevent name clash with variable defined within macro
[bertos.git]
/
app
/
demo
/
demo.mk
diff --git
a/app/demo/demo.mk
b/app/demo/demo.mk
index f9dbd8186fa932ac4530f562879b629300d0abb5..a836d007f682d4663565286c92e66509a57481ba 100644
(file)
--- a/
app/demo/demo.mk
+++ b/
app/demo/demo.mk
@@
-5,7
+5,7
@@
#
# Makefile fragment for DevLib demo application.
#
#
# Makefile fragment for DevLib demo application.
#
-# Author: Bern
ardo Innocenti <bernie@develer.com
>
+# Author: Bern
ie Innocenti <bernie@codewiz.org
>
#
include bertos/fonts/fonts.mk
#
include bertos/fonts/fonts.mk
@@
-76,11
+76,7
@@
demo_CXXFLAGS = -D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo $(EMUL_CFLAGS)
demo_LDFLAGS = $(EMUL_LDFLAGS)
# Debug stuff
demo_LDFLAGS = $(EMUL_LDFLAGS)
# Debug stuff
-ifeq ($(demo_DEBUG),1)
- demo_CFLAGS += -D_DEBUG
- demo_CXXFLAGS += -D_DEBUG
- demo_CSRC += bertos/drv/kdebug.c
-else
+ifeq ($(demo_DEBUG),0)
demo_CFLAGS += -Os
demo_CXXFLAGS += -Os
endif
demo_CFLAGS += -Os
demo_CXXFLAGS += -Os
endif