diff --git a/build.sh b/build.sh index 0cef5ad602..78129722f6 100644 --- a/build.sh +++ b/build.sh @@ -27,6 +27,8 @@ option=$@ export PCSX2PLUGINS="`pwd`/bin/plugins" curdir=`pwd` +echo "Building the Pcsx2 Suite." +echo "Note: will not compile on Linux x64." cd ${curdir}/plugins sh build.sh $option @@ -36,6 +38,8 @@ echo Error with building plugins exit 1 fi +echo "Building Pcsx2." +echo "Note: will not compile on Linux x64." cd ${curdir}/pcsx2 sh build.sh $option diff --git a/plugins/zerogs/opengl/zerogs.cpp b/plugins/zerogs/opengl/zerogs.cpp index 3e2725f6af..5a0b73db35 100644 --- a/plugins/zerogs/opengl/zerogs.cpp +++ b/plugins/zerogs/opengl/zerogs.cpp @@ -4118,7 +4118,7 @@ __forceinline void MOVFOG(VertexGPU *p, Vertex gsf) p->f = ((s16)(gsf).f<<7)|0x7f; } -__forceinline void SET_VERTEX(VertexGPU *p, int Index, const VB& curvb) +void SET_VERTEX(VertexGPU *p, int Index, const VB& curvb) { int index = Index; @@ -4274,7 +4274,7 @@ void ZeroGS::KickTriangleFan() #endif } -__forceinline void SetKickVertex(VertexGPU *p, Vertex v, int next, const VB& curvb) +void SetKickVertex(VertexGPU *p, Vertex v, int next, const VB& curvb) { SET_VERTEX(p, next, curvb); MOVZ(p, v.z, curvb); diff --git a/plugins/zeropad/zeropad.cpp b/plugins/zeropad/zeropad.cpp index 6148e8b888..488aac59fc 100644 --- a/plugins/zeropad/zeropad.cpp +++ b/plugins/zeropad/zeropad.cpp @@ -16,15 +16,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include +#include +#include #include #include #include "zeropad.h" -#include -#include -#include #ifndef _WIN32 + #include #else #include "svnrev.h" diff --git a/plugins/zerospu2/Linux/Linux.cpp b/plugins/zerospu2/Linux/Linux.cpp index 2458a0c55e..1d4fe18420 100644 --- a/plugins/zerospu2/Linux/Linux.cpp +++ b/plugins/zerospu2/Linux/Linux.cpp @@ -26,8 +26,8 @@ extern "C" { #include "callbacks.h" } -#include "zerospu2.h" #include "Linux.h" +#include "zerospu2.h" extern char *libraryName; extern string s_strIniPath;