From e9226aedc42300ef8028851000e64705d0124f16 Mon Sep 17 00:00:00 2001 From: Renaud Lepage Date: Sun, 26 Jan 2014 19:10:49 -0500 Subject: [PATCH] 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