2010-06-15 13:07:29 +00:00
|
|
|
Debian policy.
|
2011-02-12 16:06:28 +00:00
|
|
|
This patch updates default plugin path, game db path.
|
|
|
|
It also updates shaders data path.
|
|
|
|
Index: pcsx2.snapshot-4292/pcsx2/gui/AppConfig.cpp
|
2010-06-15 13:07:29 +00:00
|
|
|
===================================================================
|
2011-02-12 16:06:28 +00:00
|
|
|
--- pcsx2.snapshot-4292.orig/pcsx2/gui/AppConfig.cpp
|
|
|
|
+++ pcsx2.snapshot-4292/pcsx2/gui/AppConfig.cpp
|
|
|
|
@@ -164,7 +164,8 @@
|
2010-06-15 13:07:29 +00:00
|
|
|
|
|
|
|
wxDirName GetPlugins()
|
|
|
|
{
|
|
|
|
- return AppRoot() + Base::Plugins();
|
|
|
|
+ // return AppRoot() + Base::Plugins();
|
|
|
|
+ return wxDirName( L"/usr/lib/games/pcsx2" ) + Base::Plugins();
|
|
|
|
}
|
|
|
|
|
2011-02-12 16:06:28 +00:00
|
|
|
wxDirName GetThemes()
|
|
|
|
Index: pcsx2.snapshot-4292/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
|
2010-06-15 13:07:29 +00:00
|
|
|
===================================================================
|
2011-02-12 16:06:28 +00:00
|
|
|
--- pcsx2.snapshot-4292.orig/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
|
|
|
|
+++ pcsx2.snapshot-4292/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
|
2011-01-09 17:20:40 +00:00
|
|
|
@@ -291,18 +291,23 @@
|
|
|
|
|
|
|
|
__forceinline bool LoadShadersFromDat()
|
|
|
|
{
|
2010-06-15 13:07:29 +00:00
|
|
|
- FILE* fres = fopen("ps2hw.dat", "rb");
|
|
|
|
|
2011-01-09 17:20:40 +00:00
|
|
|
+ // First try an absolute location for linux distribution
|
|
|
|
+ FILE* fres = fopen("/usr/share/games/pcsx2/shaders/ps2hw.dat", "rb");
|
2010-06-15 13:07:29 +00:00
|
|
|
if (fres == NULL)
|
2011-01-09 17:20:40 +00:00
|
|
|
- {
|
2010-06-15 13:07:29 +00:00
|
|
|
- fres = fopen("plugins/ps2hw.dat", "rb");
|
2011-01-09 17:20:40 +00:00
|
|
|
+ {
|
|
|
|
+ fres = fopen("ps2hw.dat", "rb");
|
|
|
|
+ if (fres == NULL)
|
|
|
|
+ {
|
|
|
|
+ fres = fopen("plugins/ps2hw.dat", "rb");
|
|
|
|
|
2010-06-15 13:07:29 +00:00
|
|
|
- if (fres == NULL)
|
|
|
|
- {
|
|
|
|
- ZZLog::Error_Log("Cannot find ps2hw.dat in working directory. Exiting.");
|
|
|
|
- return false;
|
|
|
|
- }
|
2011-01-09 17:20:40 +00:00
|
|
|
- }
|
|
|
|
+ if (fres == NULL)
|
|
|
|
+ {
|
|
|
|
+ ZZLog::Error_Log("Cannot find ps2hw.dat in working directory. Exiting.");
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
2010-06-15 13:07:29 +00:00
|
|
|
|
|
|
|
fseek(fres, 0, SEEK_END);
|
2011-01-09 17:20:40 +00:00
|
|
|
|
2011-02-12 16:06:28 +00:00
|
|
|
Index: pcsx2.snapshot-4292/pcsx2/gui/AppGameDatabase.h
|
2010-06-15 13:07:29 +00:00
|
|
|
===================================================================
|
2011-02-12 16:06:28 +00:00
|
|
|
--- pcsx2.snapshot-4292.orig/pcsx2/gui/AppGameDatabase.h
|
|
|
|
+++ pcsx2.snapshot-4292/pcsx2/gui/AppGameDatabase.h
|
2010-06-30 11:18:25 +00:00
|
|
|
@@ -51,8 +51,8 @@
|
|
|
|
Console.WriteLn( "(GameDB) Unloading..." );
|
|
|
|
}
|
|
|
|
|
|
|
|
- AppGameDatabase& LoadFromFile(const wxString& file = L"GameIndex.dbf", const wxString& key = L"Serial" );
|
|
|
|
- void SaveToFile(const wxString& file = L"GameIndex.dbf");
|
|
|
|
+ AppGameDatabase& LoadFromFile(const wxString& file = L"/var/games/pcsx2/GameIndex.dbf", const wxString& key = L"Serial" );
|
|
|
|
+ void SaveToFile(const wxString& file = L"/var/games/pcsx2/GameIndex.dbf");
|
|
|
|
};
|
|
|
|
|
|
|
|
static wxString compatToStringWX(int compat) {
|