From 5cc918b9ddbad619de81aa1cd22f6494c99f3bba Mon Sep 17 00:00:00 2001 From: arcum42 Date: Fri, 28 May 2010 12:15:21 +0000 Subject: [PATCH] The usual Linux things. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3096 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/CMakeLists.txt | 1 - pcsx2/IopBios.cpp | 4 ++++ pcsx2/Linux/pcsx2.cbp | 1 - pcsx2/gui/Dialogs/AboutBoxDialog.cpp | 2 +- plugins/spu2-x/src/Linux/SPU2-X.cbp | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 29e9c57741..5f71716497 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -146,7 +146,6 @@ set(pcsx2Sources Patch.cpp Patch_Memory.cpp Pcsx2Config.cpp - pcsx2hostfs.cpp PluginManager.cpp PrecompiledHeader.cpp R3000A.cpp diff --git a/pcsx2/IopBios.cpp b/pcsx2/IopBios.cpp index eb390c17c4..c4691646b3 100644 --- a/pcsx2/IopBios.cpp +++ b/pcsx2/IopBios.cpp @@ -21,6 +21,10 @@ #include #include +#ifndef O_BINARY +#define O_BINARY 0 +#endif + namespace R3000A { #define v0 (psxRegs.GPR.n.v0) diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp index f57e269646..10f6dfff9a 100644 --- a/pcsx2/Linux/pcsx2.cbp +++ b/pcsx2/Linux/pcsx2.cbp @@ -522,7 +522,6 @@ - diff --git a/pcsx2/gui/Dialogs/AboutBoxDialog.cpp b/pcsx2/gui/Dialogs/AboutBoxDialog.cpp index 3209bf7ceb..d81bf366a1 100644 --- a/pcsx2/gui/Dialogs/AboutBoxDialog.cpp +++ b/pcsx2/gui/Dialogs/AboutBoxDialog.cpp @@ -80,7 +80,7 @@ Dialogs::AboutBoxDialog::AboutBoxDialog( wxWindow* parent ) "Gabest (Gsdx, Cdvdolio, Xpad), Zeydlitz (ZZogl)" "\n\n" "Special thanks to: black_wd, Belmont, BGome, _Demo_, Dreamtime, " - "F|RES, MrBrown, razorblade, Seta-san, Skarmeth, feal87" + "F|RES, MrBrown, razorblade, Seta-san, Skarmeth, feal87, Athos, gregory" ); // This sizer holds text of the authors and a logo! diff --git a/plugins/spu2-x/src/Linux/SPU2-X.cbp b/plugins/spu2-x/src/Linux/SPU2-X.cbp index d69b2a2fe3..eab6590b63 100644 --- a/plugins/spu2-x/src/Linux/SPU2-X.cbp +++ b/plugins/spu2-x/src/Linux/SPU2-X.cbp @@ -28,7 +28,7 @@