zzogl-pg:

* Removed extern "C" and applied static const to s_clut16 vars.  Should be fine since the old x86.S files that needed extern "C" have been removed from zzogl.
 * Fixed a compilation error in Win32/Debug builds.
 * Changed some references of DEVBUILD ZEROGS_DEVBUILD.  Not sure if all of them should be changed over or not, so I just stuck to some of the more obviously correct bits.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3500 96395faa-99c1-11dd-bbfe-3dabce05a288

plugins/zzogl-pg/opengl/HostMemory.cpp

@@ -686,7 +686,7 @@
 
 		g_MemTargs.ClearRange(dststart, dstend);
 
-	#ifdef DEVBUILD
+	#ifdef ZEROGS_DEVBUILD
 
 		if (g_bSaveTrans)
 		{

plugins/zzogl-pg/opengl/ZZLog.h

@@ -83,10 +83,6 @@ static bool SPAM_PASS;
 #define ZEROGS_DEVBUILD
 #endif
 
-#ifdef ZEROGS_DEVBUILD
-//#define DEVBUILD
-#endif
-
 
 // sends a message to output window if assert fails
 #define BMSG(x, str)			{ if( !(x) ) { ZZLog::Log(str); ZZLog::Log(str); } }

plugins/zzogl-pg/opengl/ZZoglFlush.cpp

@@ -29,7 +29,7 @@
 using namespace ZeroGS;
 
 //------------------ Defines
-#ifndef DEVBUILD
+#ifndef ZEROGS_DEVBUILD
 
 #define INC_GENVARS()
 #define INC_TEXVARS()

plugins/zzogl-pg/opengl/targets.cpp

@@ -42,10 +42,6 @@ extern bool g_bUpdateStencil;
 #	define INC_RESOLVE() ++g_nResolve
 #endif
 
-#ifdef DEVBUILD
-//static int g_bSaveResolved = 0;
-#endif
-
 extern int s_nResolved;
 extern u32 g_nResolve;
 extern bool g_bSaveTrans;
@@ -302,7 +298,7 @@ void ZeroGS::CRenderTarget::Resolve()
 
 		GL_REPORT_ERRORD();
 
-#if defined(DEVBUILD)
+#if defined(ZEROGS_DEVBUILD)
 
 		if (g_bSaveResolved)
 		{
@@ -328,7 +324,7 @@ void ZeroGS::CRenderTarget::Resolve(int startrange, int endrange)
 		// flush if necessary
 		FlushIfNecesary(this) ;
 
-#if defined(DEVBUILD)
+#if defined(ZEROGS_DEVBUILD)
 		if (g_bSaveResolved)
 		{
 			SaveTexture("resolved.tga", GL_TEXTURE_RECTANGLE_NV, ptex, RW(fbw), RH(fbh));

plugins/zzogl-pg/opengl/x86.cpp

@@ -308,13 +308,10 @@ extern "C" void __fastcall WriteCLUT_T32_I4_CSM1_sse2(u32* vm, u32* clut)
 }
 
 
-extern "C"
-{
-	PCSX2_ALIGNED16(int s_clut16mask2[4]) = { 0x0000ffff, 0x0000ffff, 0x0000ffff, 0x0000ffff };
-	PCSX2_ALIGNED16(int s_clut16mask[8]) = { 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000,
+static const __aligned16 int s_clut16mask2[4] = { 0x0000ffff, 0x0000ffff, 0x0000ffff, 0x0000ffff };
+static const __aligned16 int s_clut16mask[8] = { 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000,
 										   0x0000ffff, 0x0000ffff, 0x0000ffff, 0x0000ffff
 										   };
-}
 
 extern "C" void __fastcall WriteCLUT_T16_I4_CSM1_sse2(u32* vm, u32* clut)
 {

plugins/zzogl-pg/opengl/zerogs.h

@@ -96,7 +96,7 @@ extern u32 ptexBilinearBlocks;
 // State parameters
 
 
-#ifdef DEVBUILD
+#ifdef ZEROGS_DEVBUILD
 extern char* EFFECT_NAME;
 extern char* EFFECT_DIR;
 extern u32 g_nGenVars, g_nTexVars, g_nAlphaVars, g_nResolve;