#
-# $Id: demo.mk 18234 2007-10-08 13:39:48Z rasky $
# Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
-# All rights reserved.
+# Copyright 2008 Bernie Innocenti <bernie@codewiz.org>
#
# Makefile fragment for DevLib demo application.
#
-# Author: Bernardo Innocenti <bernie@develer.com>
+# Version: $Id: demo.mk 18234 2007-10-08 13:39:48Z rasky $
+# Author: Bernie Innocenti <bernie@codewiz.org>
#
include bertos/fonts/fonts.mk
# FIXME: we want to use g++ for C source too
CC = g++
+CXX = g++
demo_CXXSRC = \
bertos/emul/emul.cpp \
bertos/icons/logo.c \
bertos/drv/kbd.c \
bertos/drv/timer.c \
+ bertos/drv/timer_test.c \
bertos/drv/buzzer.c \
bertos/drv/ser.c \
- bertos/drv/ser_posix.c \
+ bertos/emul/ser_posix.c \
bertos/mware/formatwr.c \
bertos/mware/hex.c \
bertos/mware/event.c \
bertos/mware/observer.c \
bertos/mware/resource.c \
bertos/mware/sprintf.c \
+ bertos/kern/idle.c \
+ bertos/kern/irq.c \
+ bertos/kern/preempt.c \
bertos/kern/proc.c \
+ bertos/kern/proc_test.c \
bertos/kern/sem.c \
bertos/kern/signal.c \
bertos/kern/monitor.c \
- bertos/kern/proc_test.c \
bertos/verstag.c
demo_CPPASRC = \
- bertos/kern/switch.S
+ bertos/emul/switch.S
# FIXME: maybe this junk should go in emul/emul.mk?
$(OBJDIR)/demo/bertos/emul/emulwin.o: bertos/emul/emulwin_moc.cpp
$(OBJDIR)/demo/bertos/drv/lcd_gfx_qt.o: bertos/drv/lcd_gfx_qt_moc.cpp
-$(OBJDIR)/demo/bertos/drv/timer.o: bertos/drv/timer_qt_moc.cpp
+$(OBJDIR)/demo/bertos/drv/timer.o: bertos/emul/timer_qt_moc.cpp
$(OBJDIR)/demo/bertos/emul/emulkbd.o: bertos/emul/emulkbd_moc.cpp
#FIXME: isn't there a way to avoid repeating the pattern rule?
-bertos/drv/timer_qt_moc.cpp: bertos/drv/timer_qt.c
+bertos/emul/timer_qt_moc.cpp: bertos/emul/timer_qt.c
$(QT_MOC) -o $@ $<
-demo_CFLAGS = -D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo $(EMUL_CFLAGS)
-demo_CXXFLAGS = -D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo $(EMUL_CFLAGS)
+demo_CFLAGS = -Iapp/demo $(EMUL_CFLAGS)
+demo_CXXFLAGS = -Iapp/demo $(EMUL_CFLAGS)
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
-