Remove forceinlining on a few functions that won't inline, a few minor tweaks, and add a warning in the build file for Linux x64 people trying to compile.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@624 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-02-27 04:54:07 +00:00
parent 1504b88a75
commit b528ef29b2
4 changed files with 11 additions and 6 deletions

View File

@ -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

View File

@ -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);

View File

@ -16,15 +16,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
#include <string.h>
#include <stdarg.h>
#include "zeropad.h"
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
#ifndef _WIN32
#include <unistd.h>
#else
#include "svnrev.h"

View File

@ -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;