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

zzogl-pg: fix a warning on win32, and remove the non-existent gssoft.def file form the vsproj. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3329 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-06-28 03:01:06 +00:00
parent 4186201f3b
commit b7f2af1160
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj
View File

@ -269,10 +269,6 @@
RelativePath="..\GSmain.cpp"
>
</File>
<File
RelativePath=".\GSsoftdx.def"
>
</File>
<File
RelativePath="..\Mem.cpp"
>
@ -289,6 +285,10 @@
RelativePath="..\memcpy_amd.cpp"
>
</File>
<File
RelativePath="..\Profile.cpp"
>
</File>
<File
RelativePath="..\rasterfont.cpp"
>
@ -297,10 +297,6 @@
RelativePath="..\Regs.cpp"
>
</File>
<File
RelativePath="..\Profile.cpp"
>
</File>
<File
RelativePath="..\targets.cpp"
>
@ -389,20 +385,16 @@
RelativePath=".\aviUtil.h"
>
</File>
<File
RelativePath="..\GifTransfer.h"
>
</File>
<File
RelativePath="..\CRC.h"
>
</File>
<File
RelativePath="..\GS.h"
RelativePath="..\GifTransfer.h"
>
</File>
<File
RelativePath="..\Util.h"
RelativePath="..\GS.h"
>
</File>
<File
@ -417,6 +409,10 @@
RelativePath="..\Mem_Transmit.h"
>
</File>
<File
RelativePath="..\Profile.h"
>
</File>
<File
RelativePath="..\PS2Edefs.h"
>
@ -433,10 +429,6 @@
RelativePath="..\Regs.h"
>
</File>
<File
RelativePath="..\Profile.h"
>
</File>
<File
RelativePath="resource.h"
>
@ -449,6 +441,10 @@
RelativePath="..\targets.h"
>
</File>
<File
RelativePath="..\Util.h"
>
</File>
<File
RelativePath="Win32.h"
>

2
plugins/zzogl-pg/opengl/targets.cpp
View File

@ -1664,7 +1664,7 @@ int memcmp_clut16(u16* pSavedBuffer, u16* pClutBuffer, int clutsize)
// left > 0 only when csa < 16
int left = 0;
if ((u32)(uptr)pClutBuffer & 2 == 0)
if (((u32)(uptr)pClutBuffer & 2) == 0)
{
left = (((u32)(uptr)pClutBuffer & 0x3ff) / 2) + clutsize - 512;
clutsize -= left;