Merge pull request #3 from cybik/centralize

Centralize SpecialDirs.
This commit is contained in:
Colby Klein
2014-01-26 16:49:03 -08:00
2 changed files with 35 additions and 10 deletions
+2 -10
View File
@@ -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
+33
View File
@@ -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 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.
*/