From 07547074fc809d1068944a6e6175c763621a46df Mon Sep 17 00:00:00 2001
From: torcs-ng <torcs-ng@30fe4595-0a0c-4342-8851-515496e4dcbd>
Date: Sun, 9 Aug 2015 16:59:15 +0000
Subject: [PATCH] - fix build USR on Windows

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

Former-commit-id: 31b73f927dc1ef34b86ae608bf60577347768600
Former-commit-id: 013b449d0703fcc421408b11873e46b59553870c
---
 src/drivers/usr/CMakeLists.txt   | 13 +------------
 src/drivers/usr/src/pit.cpp      |  2 +-
 src/drivers/usr/src/raceline.h   |  2 +-
 src/drivers/usr/src/strategy.cpp |  2 +-
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/drivers/usr/CMakeLists.txt b/src/drivers/usr/CMakeLists.txt
index 0aac35719..04fb251c2 100644
--- a/src/drivers/usr/CMakeLists.txt
+++ b/src/drivers/usr/CMakeLists.txt
@@ -5,18 +5,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
 SET(ROBOT_NAME "usr")
 
 # Official-only USR interface.
-SET(ROBOT_INTERFACE LEGACY WELCOME
-                    usr_trb1
-                    usr_sc
-                    usr_ls1
-                    usr_ls2
-                    usr_mpa1
-                    usr_mpa11
-                    usr_mpa12
-                    usr_36GP
-                    usr_rs
-                    usr_lp1
-                    )
+SET(ROBOT_INTERFACE LEGACY WELCOME)
 
 SET(ROBOT_SOURCES
   src/usr.cpp
diff --git a/src/drivers/usr/src/pit.cpp b/src/drivers/usr/src/pit.cpp
index 3ba9f3a0d..35206f8c2 100644
--- a/src/drivers/usr/src/pit.cpp
+++ b/src/drivers/usr/src/pit.cpp
@@ -19,7 +19,7 @@
 
 
 #include "pit.h"
-#include "xmldefs.h"
+#include "globaldefs.h"
 
 const float Pit::SPEED_LIMIT_MARGIN = 0.5;		// [m/s] savety margin to avoid pit speeding.
 
diff --git a/src/drivers/usr/src/raceline.h b/src/drivers/usr/src/raceline.h
index a8c334bd1..33c3caa23 100644
--- a/src/drivers/usr/src/raceline.h
+++ b/src/drivers/usr/src/raceline.h
@@ -22,7 +22,7 @@
 
 #include "linalg.h"
 #include "mod.h"
-#include "xmldefs.h"
+#include "globaldefs.h"
 
 enum { LINE_MID=0, LINE_RL };
 enum { mode_normal=1, mode_correcting, mode_avoiding, mode_pitting };
diff --git a/src/drivers/usr/src/strategy.cpp b/src/drivers/usr/src/strategy.cpp
index 3cd855558..8ed866d39 100644
--- a/src/drivers/usr/src/strategy.cpp
+++ b/src/drivers/usr/src/strategy.cpp
@@ -23,7 +23,7 @@
 
 
 #include "strategy.h"
-#include "xmldefs.h"
+#include "globaldefs.h"
 
 const float SimpleStrategy::MAX_FUEL_PER_METER = 0.0008f;	// [kg/m] fuel consumtion.