Update c++/ to nxtOSEK_v212.zip (I did not check their licenses.)

[nxt-jsp/etrobo-atk.git] / nxtOSEK / c++ / src / Makefile

diff --git a/nxtOSEK/c++/src/Makefile b/nxtOSEK/c++/src/Makefile
index 8763914..ff5af3b 100644 (file)
--- a/nxtOSEK/c++/src/Makefile
+++ b/nxtOSEK/c++/src/Makefile
@@ -3,6 +3,7 @@
 ROOT = ../..
 
 ECROBOT_ROOT = $(ROOT)/ecrobot
+ECROBOT_C_ROOT = $(ROOT)/ecrobot/c
 LEJOSNXJSRC_ROOT = $(ROOT)/lejos_nxj/src/
 TOPPERS_OSEK_ROOT = $(ROOT)/toppers_osek
 CXX_ROOT = $(ROOT)/c++
@@ -18,19 +19,21 @@ TOPPERS_OSEK_INC_PATH = \
        $(TOPPERS_OSEK_ROOT)/sg \
        $(TOPPERS_OSEK_ROOT)/syslib/at91sam7s-gnu/lego_nxt
 
+TOPPERS_INC_PATH = $(TOPPERS_OSEK_INC_PATH)
+
 INC_PATH := \
        $(LEJOSNXJSRC_ROOT)/$(LEJOS_PLATFORM_SOURCES_PATH) \
        $(LEJOSNXJSRC_ROOT)/$(LEJOS_VM_SOURCES_PATH) \
        $(ECROBOT_ROOT) \
+       $(ECROBOT_C_ROOT) \
        $(CXX_ROOT)/boost \
        $(CXX_ROOT)/util
 
-C_LIB_SOURCES = errorhook.c posttaskhook.c pretaskhook.c robotinit.c robotterminate.c \
-       shutdownhook.c startuphook.c
+C_LIB_SOURCES = nxtAssert.c
 
 CC_LIB_SOURCES = AccelSensor.cc ColorSensor.cc CompassSensor.cc LightSensor.cc \
        Motor.cc sensormonitor.cc sleep.cc SonarSensor.cc SoundSensor.cc timerint.cc TouchSensor.cc PrototypeSensor.cc \
-       PSPNx.cc
+       PSPNx.cc Sprite.cc Screen.cc
 
 
 C_OPTIMISATION_FLAGS = -Os
@@ -57,7 +60,7 @@ $(TARGET): $(O_FILES)
 
 .PHONY: release
 release:
-       rm *.o
+       rm $(O_FILES)
 
 .PHONY: clean
 clean: