X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fdemo%2Fdemo.mk;h=20eb2b4eda1d19d3febcdd85b3c475861551382b;hb=87302355709b6d5ac0592024b84207ba86baa82e;hp=14d5ca2da6c79800bb5d8f54e95d1a9320859919;hpb=c49c99e64ee64ad490b2aea2d6c6d8f9f6d225db;p=bertos.git

diff --git a/app/demo/demo.mk b/app/demo/demo.mk
old mode 100755
new mode 100644
index 14d5ca2d..20eb2b4e
--- a/app/demo/demo.mk
+++ b/app/demo/demo.mk
@@ -1,18 +1,15 @@
 #
-# $Id$
+# $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.
 #
 # Makefile fragment for DevLib demo application.
 #
-# Author: Bernardo Innocenti <bernie@develer.com>
-#
-# $Log$
-# Revision 1.1  2006/03/22 09:52:13  bernie
-# Add demo application.
-#
+# Author: Bernie Innocenti <bernie@codewiz.org>
 #
 
+include bertos/fonts/fonts.mk
+include bertos/emul/emul.mk
 
 # Set to 1 for debug builds
 demo_DEBUG = 1
@@ -20,59 +17,68 @@ demo_DEBUG = 1
 # Our target application
 TRG += demo
 
+# FIXME: we want to use g++ for C source too
 CC = g++
-CXX = 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 \
-	fonts/helvB10.c \
-	fonts/luBS14.c \
-	fonts/ncenB18.c \
-	icons/artwork.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/menu.c \
-	mware/observer.c \
-	mware/resource.c \
-	mware/sprintf.c \
-	kern/proc.c \
-	kern/sem.c \
-	kern/signal.c \
-	kern/monitor.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/coop.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_ASRC = \
-	kern/switch_x86_64.s
+demo_CPPASRC = \
+	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/emul/timer_qt_moc.cpp
+$(OBJDIR)/demo/bertos/emul/emulkbd.o: bertos/emul/emulkbd_moc.cpp
 
-$(OBJDIR)/demo/emul/emulwin.o: emul/emulwin_moc.cpp 
-$(OBJDIR)/demo/drv/lcd_gfx_qt.o: drv/lcd_gfx_qt_moc.cpp
+#FIXME: isn't there a way to avoid repeating the pattern rule?
+bertos/emul/timer_qt_moc.cpp: bertos/emul/timer_qt.c
+	$(QT_MOC) -o $@ $<
 
-EMUL_CFLAGS = -I/usr/local/kde4/include/Qt -I/usr/local/kde4/include -DQT_CLEAN_NAMESPACE -DQT3_SUPPORT
-EMUL_LDFLAGS = -L /usr/local/kde4/lib64 -lQtGui -lQtCore
-demo_CFLAGS = -Os -D_QT=4 -D'ARCH=ARCH_EMUL' -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_PCSRC += drv/kdebug.c
-#endif
-
+ifeq ($(demo_DEBUG),0)
+	demo_CFLAGS += -Os
+	demo_CXXFLAGS += -Os
+endif