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

Quick Linux compilation fixes. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2676 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-03-06 00:49:35 +00:00
parent 73fb883840
commit b840fb9d7c
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcsx2/CMakeLists.txt
View File

@ -299,6 +299,7 @@ set(pcsx2GuiSources
gui/Dialogs/AboutBoxDialog.cpp
gui/Dialogs/AppConfigDialog.cpp
gui/Dialogs/AssertionDialog.cpp
gui/Panels/BaseApplicableConfigPanel.cpp
gui/Dialogs/BaseConfigurationDialog.cpp
gui/Dialogs/BaseConfigurationDialog.inl
gui/Dialogs/BiosSelectorDialog.cpp
@ -318,6 +319,8 @@ set(pcsx2GuiSources
gui/MainFrame.cpp
gui/MainMenuClicks.cpp
gui/MemoryCardFile.cpp
gui/Panels/MemoryCardListPanel.cpp
gui/Panels/MemoryCardListView.h
gui/MessageBoxes.cpp
gui/MSWstuff.cpp
gui/Panels/AudioPanel.cpp

3
pcsx2/Linux/pcsx2.cbp
View File

@ -392,6 +392,7 @@
<Unit filename="../gui/MemoryCardFile.cpp" />
<Unit filename="../gui/MessageBoxes.cpp" />
<Unit filename="../gui/Panels/AudioPanel.cpp" />
<Unit filename="../gui/Panels/BaseApplicableConfigPanel.cpp" />
<Unit filename="../gui/Panels/BaseConfigPanel.h" />
<Unit filename="../gui/Panels/BiosSelectorPanel.cpp" />
<Unit filename="../gui/Panels/ConfigurationPanels.h" />
@ -401,6 +402,8 @@
<Unit filename="../gui/Panels/GameFixesPanel.cpp" />
<Unit filename="../gui/Panels/LogOptionsPanels.cpp" />
<Unit filename="../gui/Panels/LogOptionsPanels.h" />
<Unit filename="../gui/Panels/MemoryCardListPanel.cpp" />
<Unit filename="../gui/Panels/MemoryCardListView.h" />
<Unit filename="../gui/Panels/MemoryCardsPanel.cpp" />
<Unit filename="../gui/Panels/MiscPanelStuff.cpp" />
<Unit filename="../gui/Panels/PathsPanel.cpp" />

2
pcsx2/Vif_Transfer.cpp
View File

@ -44,7 +44,7 @@ _vifT bool analyzeIbit(u32* &data, int iBit) {
// Interprets packet
_vifT void vifTransferLoop(u32* &data) {
u32& tSize = vifX.tag.size;
//u32& tSize = vifX.tag.size;
u32& pSize = vifX.vifpacketsize;
int iBit = vifX.cmd >> 7;

6
pcsx2/gui/Panels/DirPickerPanel.cpp
View File

@ -209,7 +209,11 @@ void Panels::DirPickerPanel::Apply()
wxDirName Panels::DirPickerPanel::GetPath() const
{
return wxDirName( m_pickerCtrl ? m_pickerCtrl->GetPath() : wxEmptyString );
// The (x) ? y : z construct doesn't like y and z to be different types in gcc.
if (m_pickerCtrl)
return wxDirName(m_pickerCtrl->GetPath());
else
return wxDirName(wxEmptyString);
}
void Panels::DirPickerPanel::SetPath( const wxString& newPath )