ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pcsx2: Used correct path for cheats/cheats_ws (thanks avih) 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5824 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2014-01-24 17:41:23 +00:00
parent 72f7b70f7b
commit 6214fd0456
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -148,7 +148,10 @@ endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins")
#-------------------------------------------------------------------------------
# Install some files to ease package creation
if(PACKAGE_MODE)
INSTALL(FILES "${PROJECT_SOURCE_DIR}/bin/GameIndex.dbf" DESTINATION "${GAMEINDEX_DIR}")
INSTALL(FILES "${PROJECT_SOURCE_DIR}/bin/GameIndex.dbf" DESTINATION "${GAMEINDEX_DIR}")
INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/bin/cheats" DESTINATION "${GAMEINDEX_DIR}")
INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/bin/cheats_ws" DESTINATION "${GAMEINDEX_DIR}")
INSTALL(FILES "${PROJECT_SOURCE_DIR}/linux_various/pcsx2.desktop" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
INSTALL(FILES "${PROJECT_SOURCE_DIR}/linux_various/pcsx2.xpm" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pixmaps")
INSTALL(FILES "${PROJECT_SOURCE_DIR}/bin/docs/PCSX2_FAQ.pdf" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/pcsx2")

20
pcsx2/gui/AppConfig.cpp
View File

@ -159,12 +159,28 @@ namespace PathDefs
wxDirName GetBios()
{
return GetDocuments() + wxDirName( L"bios" );
// Each linux distributions have his rules for path so we give them the possibility to
// change it with compilation flags. -- Gregory
#ifndef PLUGIN_DIR_COMPILATION
return AppRoot() + wxDirName( L"bios" );
#else
#define xPLUGIN_DIR_str(s) PLUGIN_DIR_str(s)
#define PLUGIN_DIR_str(s) #s
return wxDirName( xPLUGIN_DIR_str(PLUGIN_DIR_COMPILATION) );
#endif
}
wxDirName GetCheats()
{
return GetDocuments() + wxDirName( L"cheats" );
// Each linux distributions have his rules for path so we give them the possibility to
// change it with compilation flags. -- Gregory
#ifndef PLUGIN_DIR_COMPILATION
return AppRoot() + wxDirName( L"cheats" );
#else
#define xPLUGIN_DIR_str(s) PLUGIN_DIR_str(s)
#define PLUGIN_DIR_str(s) #s
return wxDirName( xPLUGIN_DIR_str(PLUGIN_DIR_COMPILATION) );
#endif
}
wxDirName GetCheatsWS()