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

Linux compilation fixes. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4199 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2011-01-11 09:39:42 +00:00
parent df6f1b03f7
commit 249f5594d3
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/CMakeLists.txt
View File

@ -280,6 +280,7 @@ set(pcsx2GuiSources
gui/AppCoreThread.cpp gui/AppCoreThread.cpp
gui/AppEventSources.cpp gui/AppEventSources.cpp
gui/AppGameDatabase.cpp gui/AppGameDatabase.cpp
gui/AppUserMode.cpp
gui/AppInit.cpp gui/AppInit.cpp
gui/AppMain.cpp gui/AppMain.cpp
gui/AppRes.cpp gui/AppRes.cpp
@ -291,6 +292,7 @@ set(pcsx2GuiSources
gui/Dialogs/AssertionDialog.cpp gui/Dialogs/AssertionDialog.cpp
gui/Panels/BaseApplicableConfigPanel.cpp gui/Panels/BaseApplicableConfigPanel.cpp
gui/Panels/MemoryCardListView.cpp gui/Panels/MemoryCardListView.cpp
gui/Panels/ThemeSelectorPanel.cpp
gui/Dialogs/BaseConfigurationDialog.cpp gui/Dialogs/BaseConfigurationDialog.cpp
gui/Dialogs/BiosSelectorDialog.cpp gui/Dialogs/BiosSelectorDialog.cpp
gui/Dialogs/ConfirmationDialogs.cpp gui/Dialogs/ConfirmationDialogs.cpp

2
pcsx2/Linux/pcsx2.cbp
View File

@ -417,6 +417,7 @@
<Unit filename="../gui/AppMain.cpp" /> <Unit filename="../gui/AppMain.cpp" />
<Unit filename="../gui/AppRes.cpp" /> <Unit filename="../gui/AppRes.cpp" />
<Unit filename="../gui/AppSaveStates.h" /> <Unit filename="../gui/AppSaveStates.h" />
<Unit filename="../gui/AppUserMode.cpp" />
<Unit filename="../gui/ApplyState.h" /> <Unit filename="../gui/ApplyState.h" />
<Unit filename="../gui/ConsoleLogger.cpp" /> <Unit filename="../gui/ConsoleLogger.cpp" />
<Unit filename="../gui/ConsoleLogger.h" /> <Unit filename="../gui/ConsoleLogger.h" />
@ -481,6 +482,7 @@
<Unit filename="../gui/Panels/PathsPanel.cpp" /> <Unit filename="../gui/Panels/PathsPanel.cpp" />
<Unit filename="../gui/Panels/PluginSelectorPanel.cpp" /> <Unit filename="../gui/Panels/PluginSelectorPanel.cpp" />
<Unit filename="../gui/Panels/SpeedhacksPanel.cpp" /> <Unit filename="../gui/Panels/SpeedhacksPanel.cpp" />
<Unit filename="../gui/Panels/ThemeSelectorPanel.cpp" />
<Unit filename="../gui/Panels/VideoPanel.cpp" /> <Unit filename="../gui/Panels/VideoPanel.cpp" />
<Unit filename="../gui/RecentIsoList.cpp" /> <Unit filename="../gui/RecentIsoList.cpp" />
<Unit filename="../gui/RecentIsoList.h" /> <Unit filename="../gui/RecentIsoList.h" />

5
pcsx2/gui/AppUserMode.cpp
View File

@ -20,7 +20,10 @@
#include "Dialogs/ModalPopups.h" #include "Dialogs/ModalPopups.h"
#include <wx/stdpaths.h> #include <wx/stdpaths.h>
#ifdef __WXMSW__
#include "wx/msw/regconf.h" #include "wx/msw/regconf.h"
#endif
DocsModeType DocsFolderMode = DocsFolder_User; DocsModeType DocsFolderMode = DocsFolder_User;
bool UseDefaultSettingsFolder = true; bool UseDefaultSettingsFolder = true;
@ -291,7 +294,7 @@ void Pcsx2App::ReadUserModeSettings()
wxFileName usermodefile( GetAppName() + L"-reg.ini" ); wxFileName usermodefile( GetAppName() + L"-reg.ini" );
usermodefile.SetPath( usrlocaldir.ToString() ); usermodefile.SetPath( usrlocaldir.ToString() );
conf_install = OpenFileConfig( usermodefile.GetFullPath() ) conf_install = OpenFileConfig( usermodefile.GetFullPath() );
#endif #endif
conf_install->SetRecordDefaults(false); conf_install->SetRecordDefaults(false);