Implement new function and refactor.

[bertos.git] / app / demo / demo.mk

diff --git a/app/demo/demo.mk b/app/demo/demo.mk
old mode 100755 (executable)
new mode 100644 (file)
index 1347fce..d8d1dbc
--- a/app/demo/demo.mk
+++ b/app/demo/demo.mk
@@ -1,5 +1,5 @@
 #
-# $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.
 #
@@ -7,15 +7,9 @@
 #
 # Author: Bernardo Innocenti <bernie@develer.com>
 #
-# $Log$
-# Revision 1.2  2006/03/27 04:49:50  bernie
-# Add bouncing logo demo.
-#
-# Revision 1.1  2006/03/22 09:52:13  bernie
-# Add demo application.
-#
-#
 
+include fonts/fonts.mk
+include emul/emul.mk
 
 # Set to 1 for debug builds
 demo_DEBUG = 1
@@ -23,8 +17,8 @@ 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 \
@@ -40,10 +34,10 @@ demo_CSRC = \
        gfx/win.c \
        gfx/text.c \
        gfx/text_format.c \
+       gui/menu.c \
        fonts/helvB10.c \
        fonts/luBS14.c \
        fonts/ncenB18.c \
-       icons/artwork.c \
        icons/logo.c \
        drv/kbd.c \
        drv/timer.c \
@@ -53,31 +47,41 @@ demo_CSRC = \
        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
-
-demo_ASRC = \
-       kern/switch_x86_64.s
+       kern/monitor.c \
+       kern/proc_test.c \
+       verstag.c
 
+demo_CPPASRC = \
+       kern/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
+
+#FIXME: isn't there a way to avoid repeating the pattern rule?
+drv/timer_qt_moc.cpp: drv/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_CXXFLAGS = -Os -D_QT=4 -D'ARCH=ARCH_EMUL' -Ihw $(EMUL_CFLAGS)
+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_LDFLAGS = $(EMUL_LDFLAGS)
 
 # Debug stuff
 ifeq ($(demo_DEBUG),1)
        demo_CFLAGS += -D_DEBUG
-#      demo_PCSRC += drv/kdebug.c
+       demo_CXXFLAGS += -D_DEBUG
+       demo_CSRC += drv/kdebug.c
+else
+       demo_CFLAGS += -Os
+       demo_CXXFLAGS += -Os
 endif