From 83adf0f0d4ebb47116f490133e24b3f02a738ff9 Mon Sep 17 00:00:00 2001
From: arcum42 <arcum42@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Wed, 7 Jul 2010 10:41:17 +0000
Subject: [PATCH] zzogl-pg: Add -fno-strict-aliasing to zzogl-pg's compiler
 flags. (Fixes FF X-2.)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3415 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 plugins/zzogl-pg/opengl/CMakeLists.txt              | 1 +
 plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp | 3 ++-
 plugins/zzogl-pg/opengl/ZZoglFlush.cpp              | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/zzogl-pg/opengl/CMakeLists.txt b/plugins/zzogl-pg/opengl/CMakeLists.txt
index bb45dceb30..5e61fc6e5c 100644
--- a/plugins/zzogl-pg/opengl/CMakeLists.txt
+++ b/plugins/zzogl-pg/opengl/CMakeLists.txt
@@ -28,6 +28,7 @@ set(CommonFlags
     -Wunused-variable
     -msse2
     -fno-regmove
+    -fno-strict-aliasing
     -DZEROGS_SSE2
     )
 
diff --git a/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp b/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp
index d9abfd63f5..aa37c39c71 100644
--- a/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp
+++ b/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp
@@ -31,8 +31,8 @@
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-O2" />
-					<Add option="-W" />
 					<Add option="-g" />
+					<Add option="-W" />
 					<Add option="-DZEROGS_DEVBUILD" />
 					<Add option="-DNDEBUG" />
 				</Compiler>
@@ -70,6 +70,7 @@
 			<Add option="-L/opt/cg/lib" />
 			<Add option="-msse2" />
 			<Add option="-fno-regmove" />
+			<Add option="-fno-strict-aliasing" />
 			<Add option="-DZEROGS_SSE2" />
 			<Add directory="../../Linux" />
 			<Add directory="../../../opengl" />
diff --git a/plugins/zzogl-pg/opengl/ZZoglFlush.cpp b/plugins/zzogl-pg/opengl/ZZoglFlush.cpp
index 374f7752e6..3313f59a73 100644
--- a/plugins/zzogl-pg/opengl/ZZoglFlush.cpp
+++ b/plugins/zzogl-pg/opengl/ZZoglFlush.cpp
@@ -637,7 +637,7 @@ inline void FlushSetContextTarget(VB& curvb, int context)
 		// Reduce an assert to a warning.
 		if (curvb.pdepth->status & CRenderTarget::TS_NeedUpdate)
 		{
-			ZZLog::Debug_Log("In FlushSetContextTarget, pdepth is has TS_NeedUpdate set.");
+			ZZLog::Debug_Log("In FlushSetContextTarget, pdepth has TS_NeedUpdate set.");
 		}
 #endif
 		if (!curvb.zbuf.zmsk)