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

Fix up Linux after the latest commits. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4066 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-12-02 10:41:20 +00:00
parent 9bcff9f3d5
commit f1c05a7f65
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/CMakeLists.txt
View File

@ -274,7 +274,6 @@ set(pcsx2DebugToolsHeaders
# gui sources # gui sources
set(pcsx2GuiSources set(pcsx2GuiSources
gui/AdvancedDialog.cpp
gui/AppAssert.cpp gui/AppAssert.cpp
gui/AppConfig.cpp gui/AppConfig.cpp
gui/AppCorePlugins.cpp gui/AppCorePlugins.cpp
@ -338,7 +337,6 @@ set(pcsx2GuiSources
# gui headers # gui headers
set(pcsx2GuiHeaders set(pcsx2GuiHeaders
gui/AdvancedDialog.h
gui/App.h gui/App.h
gui/ApplyState.h gui/ApplyState.h
gui/AppAccelerators.h gui/AppAccelerators.h

2
pcsx2/Linux/pcsx2.cbp
View File

@ -395,8 +395,6 @@
<Unit filename="../ZipTools/ThreadedZipTools.h" /> <Unit filename="../ZipTools/ThreadedZipTools.h" />
<Unit filename="../ZipTools/thread_gzip.cpp" /> <Unit filename="../ZipTools/thread_gzip.cpp" />
<Unit filename="../ZipTools/thread_lzma.cpp" /> <Unit filename="../ZipTools/thread_lzma.cpp" />
<Unit filename="../gui/AdvancedDialog.cpp" />
<Unit filename="../gui/AdvancedDialog.h" />
<Unit filename="../gui/App.h" /> <Unit filename="../gui/App.h" />
<Unit filename="../gui/AppAccelerators.h" /> <Unit filename="../gui/AppAccelerators.h" />
<Unit filename="../gui/AppAssert.cpp" /> <Unit filename="../gui/AppAssert.cpp" />

2
pcsx2/gui/AppMain.cpp
View File

@ -361,7 +361,7 @@ public:
// variable do not exist // variable do not exist
user_local_dir = (wxDirName)Path::Combine( GetUserConfigDir() , wxDirName( L".config/pcsx2" )); user_local_dir = (wxDirName)Path::Combine( GetUserConfigDir() , wxDirName( L".config/pcsx2" ));
} }
return user_local_dir; return user_local_dir.ToString();
} }
#endif #endif
}; };