From e17bf47470965ba35fc63a628942d4c2e8bca551 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Thu, 18 Feb 2010 10:07:15 +0000 Subject: [PATCH] Fix up last commit for Linux. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2604 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/CMakeLists.txt | 1 + pcsx2/Linux/pcsx2.cbp | 1 + pcsx2/Vif_Codes.cpp | 4 ++-- pcsx2/Vif_Commands.cpp | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index a5dc3f2f5d..a202c656c9 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -172,6 +172,7 @@ set(pcsx2Sources Vif1_Dma.cpp Vif1_MFIFO.cpp Vif.cpp + Vif_Codes.cpp Vif_Commands.cpp Vif_Unpack.cpp Vif_Unpack.inl diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp index 6ba1d8b4a8..b5a7eb626b 100644 --- a/pcsx2/Linux/pcsx2.cbp +++ b/pcsx2/Linux/pcsx2.cbp @@ -333,6 +333,7 @@ + diff --git a/pcsx2/Vif_Codes.cpp b/pcsx2/Vif_Codes.cpp index 86d7185ba2..32073d8ce8 100644 --- a/pcsx2/Vif_Codes.cpp +++ b/pcsx2/Vif_Codes.cpp @@ -32,12 +32,12 @@ vifOp(vifCode_Null); // Vif0/Vif1 Misc Functions //------------------------------------------------------------------ -_f void vifFlush(int idx) { +static _f void vifFlush(int idx) { if (!idx) vif0FLUSH(); else vif1FLUSH(); } -_f void vuExecMicro(int idx, u32 addr) { +static _f void vuExecMicro(int idx, u32 addr) { VURegs* VU = nVif[idx].VU; vifFlush(idx); diff --git a/pcsx2/Vif_Commands.cpp b/pcsx2/Vif_Commands.cpp index feb0a6dfcb..888342e68a 100644 --- a/pcsx2/Vif_Commands.cpp +++ b/pcsx2/Vif_Commands.cpp @@ -30,12 +30,12 @@ _vifT void vifCMD_Null(); // Vif0/Vif1 Misc Functions //------------------------------------------------------------------ -_f void vifFlush(int idx) { +static _f void vifFlush(int idx) { if (!idx) vif0FLUSH(); else vif1FLUSH(); } -_f void vuExecMicro(int idx, u32 addr) { +static _f void vuExecMicro(int idx, u32 addr) { VURegs* VU = nVif[idx].VU; vifFlush(idx);