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

Fix Linux compilation. (Possibly Windows as well...) 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3267 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-06-22 10:58:34 +00:00
parent a5208c4227
commit d1818a3400
5 changed files with 616 additions and 613 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/include/Utilities/HashMap.h
View File

@ -5,6 +5,8 @@
#include <google/dense_hash_map> #include <google/dense_hash_map>
#include <google/sparsehash/densehashtable.h> #include <google/sparsehash/densehashtable.h>
#include <wx/string.h>
namespace HashTools { namespace HashTools {
#define HashFriend(Key,T) friend class HashMap<Key,T> #define HashFriend(Key,T) friend class HashMap<Key,T>
@ -658,7 +660,7 @@ public:
virtual ~pxDictionary() {} virtual ~pxDictionary() {}
pxDictionary( int initialCapacity=33, const wxString& emptyKey = L"@@-EMPTY-@@", const wxString& deletedKey = L"@@-DELETED-@@" ) pxDictionary( int initialCapacity=33, const wxString& emptyKey = L"@@-EMPTY-@@", const wxString& deletedKey = L"@@-DELETED-@@" )
: HashMap<wxString, T>( emptyKey, deletedKey, initialCapacity) : HashTools::HashMap<wxString, T>( emptyKey, deletedKey, initialCapacity)
{ {
} }
}; };

5
pcsx2/Linux/pcsx2.cbp
View File

@ -204,8 +204,6 @@
<Unit filename="../Config.h" /> <Unit filename="../Config.h" />
<Unit filename="../Counters.cpp" /> <Unit filename="../Counters.cpp" />
<Unit filename="../Counters.h" /> <Unit filename="../Counters.h" />
<Unit filename="../GameDatabase.cpp" />
<Unit filename="../GameDatabase.h" />
<Unit filename="../DebugTools/Debug.h" /> <Unit filename="../DebugTools/Debug.h" />
<Unit filename="../DebugTools/DisASM.h" /> <Unit filename="../DebugTools/DisASM.h" />
<Unit filename="../DebugTools/DisR3000A.cpp" /> <Unit filename="../DebugTools/DisR3000A.cpp" />
@ -228,6 +226,8 @@
<Unit filename="../GS.cpp" /> <Unit filename="../GS.cpp" />
<Unit filename="../GS.h" /> <Unit filename="../GS.h" />
<Unit filename="../GSState.cpp" /> <Unit filename="../GSState.cpp" />
<Unit filename="../GameDatabase.cpp" />
<Unit filename="../GameDatabase.h" />
<Unit filename="../Gif.cpp" /> <Unit filename="../Gif.cpp" />
<Unit filename="../Gif.h" /> <Unit filename="../Gif.h" />
<Unit filename="../Hardware.h" /> <Unit filename="../Hardware.h" />
@ -347,6 +347,7 @@
<Unit filename="../gui/AdvancedDialog.cpp" /> <Unit filename="../gui/AdvancedDialog.cpp" />
<Unit filename="../gui/AdvancedDialog.h" /> <Unit filename="../gui/AdvancedDialog.h" />
<Unit filename="../gui/App.h" /> <Unit filename="../gui/App.h" />
<Unit filename="../gui/AppAccelerators.h" />
<Unit filename="../gui/AppAssert.cpp" /> <Unit filename="../gui/AppAssert.cpp" />
<Unit filename="../gui/AppConfig.cpp" /> <Unit filename="../gui/AppConfig.cpp" />
<Unit filename="../gui/AppConfig.h" /> <Unit filename="../gui/AppConfig.h" />

2
pcsx2/System.cpp
View File

@ -15,7 +15,7 @@
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "Common.h" #include "Common.h"
#include "HostGui.h" #include "IopCommon.h"
#include "System/PageFaultSource.h" #include "System/PageFaultSource.h"
#include "Utilities/EventSource.inl" #include "Utilities/EventSource.inl"

1
pcsx2/gui/AppRes.cpp
View File

@ -19,6 +19,7 @@
#include <wx/zipstrm.h> #include <wx/zipstrm.h>
#include <wx/wfstream.h> #include <wx/wfstream.h>
#include <wx/imaglist.h>
#include "Resources/EmbeddedImage.h" #include "Resources/EmbeddedImage.h"
#include "Resources/BackgroundLogo.h" #include "Resources/BackgroundLogo.h"

1
pcsx2/windows/Win32.h
View File

@ -18,7 +18,6 @@
#include "Utilities/RedtapeWindows.h" // our "safe" include of windows (sets version and undefs uselessness) #include "Utilities/RedtapeWindows.h" // our "safe" include of windows (sets version and undefs uselessness)
#include "System.h" #include "System.h"
#include "HostGui.h"
#include "resource.h" #include "resource.h"
#define COMPILEDATE __DATE__ #define COMPILEDATE __DATE__