From: Patrick McIlroy <itgpmc@gmail.com>
Date: Fri, 29 Feb 2008 04:54:14 +0000 (+0000)
Subject: GameState.cpp: GetSerialNumber() was already declared
X-Git-Url: http://cameron1729.xyz/?a=commitdiff_plain;h=98231d74fa249163dfc60908a5700aa1277e3a79;p=openitg.git

GameState.cpp: GetSerialNumber() was already declared

MiscITG.cpp: "/Stats" does not exist in the VFS.  In fact, it doesn't exist anywhere...

Makefile.am: there is no need for account for LibUSB because ./configure will not return successfully if it is not there anyway

git-svn-id: https://openitg.svn.sourceforge.net/svnroot/openitg@77 83fadc84-e282-4d84-a09a-c4228d6ae7e5
---

diff --git a/src/ScreenArcadeDiagnostics.cpp b/src/ScreenArcadeDiagnostics.cpp
index a8ef0f7b..3ccef6d3 100644
--- a/src/ScreenArcadeDiagnostics.cpp
+++ b/src/ScreenArcadeDiagnostics.cpp
@@ -14,6 +14,12 @@
 #include "ActorUtil.h"
 #include "ActorFrame.h" // We need this to call PlayCommand,Refresh and update the uptime.
 
+#ifdef ITG_ARCADE
+#include "io/USBDevice.h"
+#else
+#include "io/USBDevice_Libusb.h"
+#endif
+
 REGISTER_SCREEN_CLASS( ScreenArcadeDiagnostics );
 
 ScreenArcadeDiagnostics::ScreenArcadeDiagnostics( CString sClassName ) : ScreenWithMenuElements( sClassName )
@@ -32,11 +38,8 @@ void ScreenArcadeDiagnostics::Init()
 	m_Title.SetName( "Title" );
 
 	// You can use some #define'd macros in ActorUtil.h for these. -- Vyhd
-	SET_XY( m_USBInfo );
-	COMMAND( m_USBInfo, "On" );
-
-	SET_XY( m_Title );
-	COMMAND( m_Title, "On" );
+	SET_XY_AND_ON_COMMAND( m_USBInfo );
+	SET_XY_AND_ON_COMMAND( m_Title );
 	
 	this->AddChild( &m_USBInfo );
 	this->AddChild( &m_Title );
diff --git a/src/ScreenArcadeDiagnostics.h b/src/ScreenArcadeDiagnostics.h
index 5b60c41d..defbb3c5 100644
--- a/src/ScreenArcadeDiagnostics.h
+++ b/src/ScreenArcadeDiagnostics.h
@@ -3,7 +3,6 @@
 #ifndef SCREEN_ARCADE_DIAGNOSTICS_H
 #define SCREEN_ARCADE_DIAGNOSTICS_H
 
-#include "io/USBDevice.h"
 #include "ScreenWithMenuElements.h"
 #include "BitmapText.h"