--- a/examples/TestMasterSlave/Makefile.in	Tue Sep 04 17:47:46 2007 +0200
+++ b/examples/TestMasterSlave/Makefile.in	Mon Sep 10 08:04:32 2007 +0200
@@ -32,6 +32,7 @@
 TARGET = SUB_TARGET
 CAN_DRIVER = SUB_CAN_DRIVER
 TIMERS_DRIVER = SUB_TIMERS_DRIVER
+TESTMASTERSLAVE = "TestMasterSlave"
 
 INCLUDES = -I../../include -I../../include/$(TARGET) -I../../include/$(CAN_DRIVER) -I../../include/$(TIMERS_DRIVER)
 
@@ -39,6 +40,14 @@
 
 OBJS = $(MASTER_OBJS) ../../src/libcanfestival.a ../../drivers/$(TARGET)/libcanfestival_$(TARGET).a
 
+ifeq ($(TARGET),win32)
+	TESTMASTERSLAVE = "TestMasterSlave.exe"
+endif
+
+ifeq ($(TIMERS_DRIVER),timers_win32)
+	EXE_CFLAGS =
+endif
+
 ifeq ($(TIMERS_DRIVER),timers_xeno)
 	PROGDEFINES = -DUSE_XENO
 endif
@@ -50,7 +59,7 @@
 
 
 TestMasterSlave: TestSlave.c TestMaster.c $(OBJS)
-	$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ $(OBJS) $(EXE_CFLAGS)
+	g++ $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ $(OBJS) $(EXE_CFLAGS)
 	
 TestSlave.c: TestSlave.od
 	$(MAKE) -C ../../objdictgen gnosis
@@ -65,8 +74,8 @@
 
 clean:
 	rm -f $(MASTER_OBJS)
-	rm -f TestMasterSlave
-
+	rm -f $(TESTMASTERSLAVE)
+		
 mrproper: clean
 	rm -f TestSlave.c
 	rm -f TestMaster.c