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

The following files need to be unversioned out: Makefile, Makefile.in, src/config.h, src/config.h.in, src/Makefile, src/Makefile.in, src/openitg, and src/GtkModule.so.  These are generated files (from ./configure or make) that are machine-dependant and should not be part of the SVN tree.  Run ./auto.sh and then ./configure to regenerate them.  This way, the files will not be changed every time you do an SVN update.  --infamouspat

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

diff --git a/src/PrefsManager.cpp b/src/PrefsManager.cpp
index 4d0297a..36bdb22 100755 (executable)
--- a/src/PrefsManager.cpp
+++ b/src/PrefsManager.cpp
@@ -12,15 +12,12 @@
 #include "Preference.h"
 #include "RageLog.h"
 
-#ifdef ITG_ARCADE
-#define INI_FOLDER     CString("Stats/")
-#else
-#define INI_FOLDER     CString("Data/")
-#endif
+// these locations are always relative regardless of the architecture, 
+//   so keep them in the Data/ folder --infamouspat
 
-#define DEFAULTS_INI_PATH      INI_FOLDER + CString("Defaults.ini")    // these can be overridden
-#define STEPMANIA_INI_PATH     INI_FOLDER + CString("StepMania.ini")   // overlay on Defaults.ini, contains the user's choices
-#define STATIC_INI_PATH                INI_FOLDER + CString("Static.ini")      // overlay on the 2 above, can't be overridden
+#define DEFAULTS_INI_PATH      "Data/Defaults.ini"     // these can be overridden
+#define STEPMANIA_INI_PATH     "Data/StepMania.ini"    // overlay on Defaults.ini, contains the user's choices
+#define STATIC_INI_PATH                "Data/Static.ini"       // overlay on the 2 above, can't be overridden
 
 PrefsManager*  PREFSMAN = NULL;        // global and accessable from anywhere in our program