From e9226aedc42300ef8028851000e64705d0124f16 Mon Sep 17 00:00:00 2001
From: Renaud Lepage <root@cybikbase.com>
Date: Sun, 26 Jan 2014 19:10:49 -0500
Subject: [PATCH 1/2] Centralize SpecialDirs.

---
 src/ScreenOptionsExportPackage.cpp | 12 ++---------
 src/archutils/SpecialDirs.h        | 33 ++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 src/archutils/SpecialDirs.h

diff --git a/src/ScreenOptionsExportPackage.cpp b/src/ScreenOptionsExportPackage.cpp
index 777c94cd0a..976ad418f0 100644
--- a/src/ScreenOptionsExportPackage.cpp
+++ b/src/ScreenOptionsExportPackage.cpp
@@ -12,15 +12,7 @@
 #include "ScreenPrompt.h"
 #include "SongManager.h"
 #include "RageFile.h"
-
-// there should probably be a better way to handle this: -aj
-#if defined(_WINDOWS)
-	#include "archutils/Win32/SpecialDirs.h"
-#elif defined(MACOSX)
-	#include "archutils/Darwin/SpecialDirs.h"
-#elif defined(UNIX)
-	#include "archutils/Unix/SpecialDirs.h"
-#endif
+#include "archutils/SpecialDirs.h"
 
 // main page (type list)
 REGISTER_SCREEN_CLASS( ScreenOptionsExportPackage );
@@ -286,7 +278,7 @@ void ScreenOptionsExportPackageSubPage::ExportOptions( int iRow, const vector<Pl
 }
 
 /*
- * (c) 2002-2011 Chris Danford, AJ Kelly
+ * (c) 2002-2014 Chris Danford, AJ Kelly, Renaud Lepage
  * All rights reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/archutils/SpecialDirs.h b/src/archutils/SpecialDirs.h
new file mode 100644
index 0000000000..50cc99cae7
--- /dev/null
+++ b/src/archutils/SpecialDirs.h
@@ -0,0 +1,33 @@
+#if defined(ANDROID)
+#include "Android/SpecialDirs.h"
+#elif defined(_WINDOWS)
+#include "Win32/SpecialDirs.h"
+#elif defined(MACOSX)
+#include "Darwin/SpecialDirs.h"
+#elif defined(UNIX)
+#include "Unix/SpecialDirs.h"
+#endif
+/*
+ * (c) 2014-x Renaud Lepage, AJ Kelly
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons to
+ * whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+ * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
+ * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */

From 5cce28d8ab6885573bbe33e3da728f1bb9074d9b Mon Sep 17 00:00:00 2001
From: Renaud Lepage <root@cybikbase.com>
Date: Sun, 26 Jan 2014 19:41:40 -0500
Subject: [PATCH 2/2] Corrected per project spec

---
 src/archutils/SpecialDirs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/archutils/SpecialDirs.h b/src/archutils/SpecialDirs.h
index 50cc99cae7..7b71203760 100644
--- a/src/archutils/SpecialDirs.h
+++ b/src/archutils/SpecialDirs.h
@@ -8,7 +8,7 @@
 #include "Unix/SpecialDirs.h"
 #endif
 /*
- * (c) 2014-x Renaud Lepage, AJ Kelly
+ * (c) 2014 Renaud Lepage, AJ Kelly
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a