X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fdemo%2Fdemo.mk;h=eab6c3cb5e48d3c5b4f3ec1fa29180141ec55db3;hb=956ae12f312e9f1691d2615708fcdf3328f62c26;hp=d8d1dbcf2c5d8af2176fe5204ada2b5bac1e4bc4;hpb=0128433e7c12a6eb7489334ca8d4a5d56e4ed8eb;p=bertos.git

diff --git a/app/demo/demo.mk b/app/demo/demo.mk
index d8d1dbcf..eab6c3cb 100644
--- a/app/demo/demo.mk
+++ b/app/demo/demo.mk
@@ -5,11 +5,11 @@
 #
 # Makefile fragment for DevLib demo application.
 #
-# Author: Bernardo Innocenti <bernie@develer.com>
+# Author: Bernie Innocenti <bernie@codewiz.org>
 #
 
-include fonts/fonts.mk
-include emul/emul.mk
+include bertos/fonts/fonts.mk
+include bertos/emul/emul.mk
 
 # Set to 1 for debug builds
 demo_DEBUG = 1
@@ -21,67 +21,63 @@ TRG += demo
 CC = g++
 
 demo_CXXSRC = \
-	emul/emul.cpp \
-	emul/emulwin.cpp \
-	emul/emulkbd.cpp \
-	drv/lcd_gfx_qt.cpp
+	bertos/emul/emul.cpp \
+	bertos/emul/emulwin.cpp \
+	bertos/emul/emulkbd.cpp \
+	bertos/drv/lcd_gfx_qt.cpp
 
 demo_CSRC = \
 	app/demo/demo.c \
-	os/hptime.c \
-	gfx/bitmap.c \
-	gfx/line.c \
-	gfx/win.c \
-	gfx/text.c \
-	gfx/text_format.c \
-	gui/menu.c \
-	fonts/helvB10.c \
-	fonts/luBS14.c \
-	fonts/ncenB18.c \
-	icons/logo.c \
-	drv/kbd.c \
-	drv/timer.c \
-	drv/buzzer.c \
-	drv/ser.c \
-	drv/ser_posix.c \
-	mware/formatwr.c \
-	mware/hex.c \
-	mware/event.c \
-	mware/observer.c \
-	mware/resource.c \
-	mware/sprintf.c \
-	kern/proc.c \
-	kern/sem.c \
-	kern/signal.c \
-	kern/monitor.c \
-	kern/proc_test.c \
-	verstag.c
+	bertos/os/hptime.c \
+	bertos/gfx/bitmap.c \
+	bertos/gfx/line.c \
+	bertos/gfx/win.c \
+	bertos/gfx/text.c \
+	bertos/gfx/text_format.c \
+	bertos/gui/menu.c \
+	bertos/fonts/helvB10.c \
+	bertos/fonts/luBS14.c \
+	bertos/fonts/ncenB18.c \
+	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/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/proc.c \
+	bertos/kern/proc_test.c \
+	bertos/kern/sem.c \
+	bertos/kern/signal.c \
+	bertos/kern/monitor.c \
+	bertos/verstag.c
 
 demo_CPPASRC = \
-	kern/switch.S
+	bertos/emul/switch.S
 
 # FIXME: maybe this junk should go in emul/emul.mk?
-$(OBJDIR)/demo/emul/emulwin.o: emul/emulwin_moc.cpp 
-$(OBJDIR)/demo/drv/lcd_gfx_qt.o: drv/lcd_gfx_qt_moc.cpp
-$(OBJDIR)/demo/drv/timer.o: drv/timer_qt_moc.cpp
-$(OBJDIR)/demo/emul/emulkbd.o: emul/emulkbd_moc.cpp
+$(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/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?
-drv/timer_qt_moc.cpp: 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 -Ihw $(EMUL_CFLAGS)
-demo_CXXFLAGS = -D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo -Ihw $(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 += drv/kdebug.c
-else
+ifeq ($(demo_DEBUG),0)
 	demo_CFLAGS += -Os
 	demo_CXXFLAGS += -Os
 endif
-