Make the simplix robot compile in Linux.

This will proberbly break the Windows build.


git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@485 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: e876bd5996dddf1525a9e45b3f568b3afe505580
Former-commit-id: c6224565e7c225cf9329693b063cbaa207c994b6

src/drivers/simplix/Makefile

@@ -14,42 +14,7 @@
 #
 ##############################################################################
 
-ROBOT       = simplix
-MODULE      = ${ROBOT}.so
-MODULEDIR   = drivers/${ROBOT}
-SOURCES     = ../unitmain.cpp \
-		../unitcarparam.cpp \
-		../unitcharacteristic.cpp \
-		../unitclothoid.cpp \
-		../unitcollision.cpp \
-		../unitcommon.cpp \
-		../unitcommondata.cpp \
-		../unitcubic.cpp \
-		../unitcubicspline.cpp \
-		../unitdriver.cpp \
-		../unitfixcarparam.cpp \
-		../unitlane.cpp \
-		../unitlanepoint.cpp \
-		../unitlinalg.cpp \
-		../unitlinreg.cpp \
-		../unitopponent.cpp \
-		../unitparabel.cpp \
-		../unitparam.cpp \
-		../unitpidctrl.cpp \
-		../unitpit.cpp \
-		../unitpitparam.cpp \
-		../unitsection.cpp \
-		../unitstrategy.cpp \
-		../unitsysfoo.cpp \
-		../unitteammanager.cpp \
-		../unittmpcarparam.cpp \
-		../unittrack.cpp \
-		../unitvec2d.cpp \
-		../unitvec3d.cpp
-SHIPDIR     = drivers/${ROBOT}
-SHIP        = ${ROBOT}.xml default.xml logo.rgb readme.txt
-
-SUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
+SUBDIRS = src $(shell find * -maxdepth 0 -type d -print | grep -v .svn | grep -v src)
 SHIPSUBDIRS = $(SUBDIRS)
 PKGSUBDIRS	= $(SUBDIRS)
 

src/drivers/simplix/simplix_36GP/Makefile

@@ -17,35 +17,35 @@
 ROBOT       = simplix_36GP
 MODULE      = ${ROBOT}.so
 MODULEDIR   = drivers/${ROBOT}
-SOURCES     = ../unitmain.cpp \
-		../unitcarparam.cpp \
-		../unitcharacteristic.cpp \
-		../unitclothoid.cpp \
-		../unitcollision.cpp \
-		../unitcommon.cpp \
-		../unitcommondata.cpp \
-		../unitcubic.cpp \
-		../unitcubicspline.cpp \
-		../unitdriver.cpp \
-		../unitfixcarparam.cpp \
-		../unitlane.cpp \
-		../unitlanepoint.cpp \
-		../unitlinalg.cpp \
-		../unitlinreg.cpp \
-		../unitopponent.cpp \
-		../unitparabel.cpp \
-		../unitparam.cpp \
-		../unitpidctrl.cpp \
-		../unitpit.cpp \
-		../unitpitparam.cpp \
-		../unitsection.cpp \
-		../unitstrategy.cpp \
-		../unitsysfoo.cpp \
-		../unitteammanager.cpp \
-		../unittmpcarparam.cpp \
-		../unittrack.cpp \
-		../unitvec2d.cpp \
-		../unitvec3d.cpp
+SOURCES     = ../src/unitmain.cpp \
+		../src/unitcarparam.cpp \
+		../src/unitcharacteristic.cpp \
+		../src/unitclothoid.cpp \
+		../src/unitcollision.cpp \
+		../src/unitcommon.cpp \
+		../src/unitcommondata.cpp \
+		../src/unitcubic.cpp \
+		../src/unitcubicspline.cpp \
+		../src/unitdriver.cpp \
+		../src/unitfixcarparam.cpp \
+		../src/unitlane.cpp \
+		../src/unitlanepoint.cpp \
+		../src/unitlinalg.cpp \
+		../src/unitlinreg.cpp \
+		../src/unitopponent.cpp \
+		../src/unitparabel.cpp \
+		../src/unitparam.cpp \
+		../src/unitpidctrl.cpp \
+		../src/unitpit.cpp \
+		../src/unitpitparam.cpp \
+		../src/unitsection.cpp \
+		../src/unitstrategy.cpp \
+		../src/unitsysfoo.cpp \
+		../src/unitteammanager.cpp \
+		../src/unittmpcarparam.cpp \
+		../src/unittrack.cpp \
+		../src/unitvec2d.cpp \
+		../src/unitvec3d.cpp
 SHIPDIR     = drivers/${ROBOT}
 SHIP        = ${ROBOT}.xml default.xml logo.rgb 
 SHIPSUBDIRS = 0 1 2 3 4 5 6 7 8 9 tracks 36GP-alfa12c 36GP-alfatipo 36GP-autounion 36GP-bugatti 36GP-maserati 36GP-maserati6C34 36GP-mercedes

src/drivers/simplix/simplix_trb1a/Makefile

@@ -17,35 +17,35 @@
 ROBOT       = simplix_trb1a
 MODULE      = ${ROBOT}.so
 MODULEDIR   = drivers/${ROBOT}
-SOURCES     = ../unitmain.cpp \
-		../unitcarparam.cpp \
-		../unitcharacteristic.cpp \
-		../unitclothoid.cpp \
-		../unitcollision.cpp \
-		../unitcommon.cpp \
-		../unitcommondata.cpp \
-		../unitcubic.cpp \
-		../unitcubicspline.cpp \
-		../unitdriver.cpp \
-		../unitfixcarparam.cpp \
-		../unitlane.cpp \
-		../unitlanepoint.cpp \
-		../unitlinalg.cpp \
-		../unitlinreg.cpp \
-		../unitopponent.cpp \
-		../unitparabel.cpp \
-		../unitparam.cpp \
-		../unitpidctrl.cpp \
-		../unitpit.cpp \
-		../unitpitparam.cpp \
-		../unitsection.cpp \
-		../unitstrategy.cpp \
-		../unitsysfoo.cpp \
-		../unitteammanager.cpp \
-		../unittmpcarparam.cpp \
-		../unittrack.cpp \
-		../unitvec2d.cpp \
-		../unitvec3d.cpp
+SOURCES     = ../src/unitmain.cpp \
+		../src/unitcarparam.cpp \
+		../src/unitcharacteristic.cpp \
+		../src/unitclothoid.cpp \
+		../src/unitcollision.cpp \
+		../src/unitcommon.cpp \
+		../src/unitcommondata.cpp \
+		../src/unitcubic.cpp \
+		../src/unitcubicspline.cpp \
+		../src/unitdriver.cpp \
+		../src/unitfixcarparam.cpp \
+		../src/unitlane.cpp \
+		../src/unitlanepoint.cpp \
+		../src/unitlinalg.cpp \
+		../src/unitlinreg.cpp \
+		../src/unitopponent.cpp \
+		../src/unitparabel.cpp \
+		../src/unitparam.cpp \
+		../src/unitpidctrl.cpp \
+		../src/unitpit.cpp \
+		../src/unitpitparam.cpp \
+		../src/unitsection.cpp \
+		../src/unitstrategy.cpp \
+		../src/unitsysfoo.cpp \
+		../src/unitteammanager.cpp \
+		../src/unittmpcarparam.cpp \
+		../src/unittrack.cpp \
+		../src/unitvec2d.cpp \
+		../src/unitvec3d.cpp
 SHIPDIR     = drivers/${ROBOT}
 SHIP        = ${ROBOT}.xml default.xml logo.rgb readme.txt
 SHIPSUBDIRS = 0 1 2 3 4 5 6 7 8 9 car1-trb1 car2-trb1 car3-trb1 car4-trb1 car5-trb1 tracks

src/drivers/simplix/simplix_trb1b/Makefile

@@ -17,35 +17,35 @@
 ROBOT       = simplix_trb1b
 MODULE      = ${ROBOT}.so
 MODULEDIR   = drivers/${ROBOT}
-SOURCES     = ../unitmain.cpp \
-		../unitcarparam.cpp \
-		../unitcharacteristic.cpp \
-		../unitclothoid.cpp \
-		../unitcollision.cpp \
-		../unitcommon.cpp \
-		../unitcommondata.cpp \
-		../unitcubic.cpp \
-		../unitcubicspline.cpp \
-		../unitdriver.cpp \
-		../unitfixcarparam.cpp \
-		../unitlane.cpp \
-		../unitlanepoint.cpp \
-		../unitlinalg.cpp \
-		../unitlinreg.cpp \
-		../unitopponent.cpp \
-		../unitparabel.cpp \
-		../unitparam.cpp \
-		../unitpidctrl.cpp \
-		../unitpit.cpp \
-		../unitpitparam.cpp \
-		../unitsection.cpp \
-		../unitstrategy.cpp \
-		../unitsysfoo.cpp \
-		../unitteammanager.cpp \
-		../unittmpcarparam.cpp \
-		../unittrack.cpp \
-		../unitvec2d.cpp \
-		../unitvec3d.cpp
+SOURCES     = ../src/unitmain.cpp \
+		../src/unitcarparam.cpp \
+		../src/unitcharacteristic.cpp \
+		../src/unitclothoid.cpp \
+		../src/unitcollision.cpp \
+		../src/unitcommon.cpp \
+		../src/unitcommondata.cpp \
+		../src/unitcubic.cpp \
+		../src/unitcubicspline.cpp \
+		../src/unitdriver.cpp \
+		../src/unitfixcarparam.cpp \
+		../src/unitlane.cpp \
+		../src/unitlanepoint.cpp \
+		../src/unitlinalg.cpp \
+		../src/unitlinreg.cpp \
+		../src/unitopponent.cpp \
+		../src/unitparabel.cpp \
+		../src/unitparam.cpp \
+		../src/unitpidctrl.cpp \
+		../src/unitpit.cpp \
+		../src/unitpitparam.cpp \
+		../src/unitsection.cpp \
+		../src/unitstrategy.cpp \
+		../src/unitsysfoo.cpp \
+		../src/unitteammanager.cpp \
+		../src/unittmpcarparam.cpp \
+		../src/unittrack.cpp \
+		../src/unitvec2d.cpp \
+		../src/unitvec3d.cpp
 SHIPDIR     = drivers/${ROBOT}
 SHIP        = ${ROBOT}.xml default.xml logo.rgb readme.txt
 SHIPSUBDIRS = 0 1 2 3 car6-trb1 car7-trb1 tracks

src/drivers/simplix/src/Makefile

@@ -0,0 +1,58 @@
+##############################################################################
+#
+#    file                 : Makefile
+#    created              : 22 Nov 2008
+#    last changed         : 16 Dez 2008
+#    copyright            : (C) 2008 Wolf-Dieter Beelitz
+#
+##############################################################################
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+##############################################################################
+
+ROBOT       = simplix
+MODULE      = ${ROBOT}.so
+MODULEDIR   = drivers/${ROBOT}
+SOURCES     = unitmain.cpp \
+	      unitcarparam.cpp \
+	      unitcharacteristic.cpp \
+	      unitclothoid.cpp \
+	      unitcollision.cpp \
+	      unitcommon.cpp \
+	      unitcommondata.cpp \
+	      unitcubic.cpp \
+	      unitcubicspline.cpp \
+	      unitdriver.cpp \
+	      unitfixcarparam.cpp \
+	      unitlane.cpp \
+	      unitlanepoint.cpp \
+	      unitlinalg.cpp \
+	      unitlinreg.cpp \
+	      unitopponent.cpp \
+	      unitparabel.cpp \
+	      unitparam.cpp \
+	      unitpidctrl.cpp \
+	      unitpit.cpp \
+	      unitpitparam.cpp \
+	      unitsection.cpp \
+	      unitstrategy.cpp \
+	      unitsysfoo.cpp \
+	      unitteammanager.cpp \
+	      unittmpcarparam.cpp \
+	      unittrack.cpp \
+	      unitvec2d.cpp \
+	      unitvec3d.cpp
+SHIPDIR     = drivers/${ROBOT}
+SHIP        = ${ROBOT}.xml
+SHIPSUBDIRS = 
+
+PKGSUBDIRS  = ${SHIPSUBDIRS}
+
+src-robots-simplix_PKGFILES = $(shell find * -maxdepth 0 -type f -print)
+src-robots-simplix_PKGDIR   = ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+
+include ${MAKE_DEFAULT}