From 7bfae6a2faa33d388c24449df1c2bfeb750b2a76 Mon Sep 17 00:00:00 2001
From: "gregory.hainaut" <gregory.hainaut@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Wed, 23 Jun 2010 10:07:18 +0000
Subject: [PATCH] [cmake] * Add a new header * Check that libjpeg is installed
 for zzogl

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3279 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 cmake/SearchForStuff.cmake     | 6 ++++++
 cmake/SelectPcsx2Plugins.cmake | 9 +++++----
 pcsx2/CMakeLists.txt           | 1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
index 65ed2710f7..d3a179e853 100644
--- a/cmake/SearchForStuff.cmake
+++ b/cmake/SearchForStuff.cmake
@@ -15,6 +15,7 @@ endif(Linux)
 # Use cmake package to find module
 find_package(ALSA)
 find_package(BZip2)
+find_package(JPEG)
 find_package(OpenGL)
 # Tell cmake that we use SDL as a library and not as an application
 set(SDL_BUILDING_LIBRARY TRUE)
@@ -99,6 +100,11 @@ if(CG_FOUND)
 	include_directories(${CG_INCLUDE_DIR})
 endif(CG_FOUND)
 
+# Jpeg
+if(JPEG_FOUND)
+	include_directories(${JPEG_INCLUDE_DIR})
+endif(JPEG_FOUND)
+
 # GLEW
 if(GLEW_FOUND)
 	include_directories(${GLEW_INCLUDE_PATH})
diff --git a/cmake/SelectPcsx2Plugins.cmake b/cmake/SelectPcsx2Plugins.cmake
index 763fecaa64..40a6292dc5 100644
--- a/cmake/SelectPcsx2Plugins.cmake
+++ b/cmake/SelectPcsx2Plugins.cmake
@@ -5,7 +5,7 @@ set(msg_dep_common_libs "check these libraries -> wxWidgets (>=2.8.10), sparseha
 set(msg_dep_pcsx2       "check these libraries -> wxWidgets (>=2.8.10), gtk2 (>=2.16), zlib (>=1.2.4), pcsx2 common libs")
 set(msg_dep_cdvdiso     "check these libraries -> bzip2 (>=1.0.5)")
 set(msg_dep_zerogs      "check these libraries -> glew (>=1.5), opengl, X11, nvidia-cg-toolkit (>=2.1)")
-set(msg_dep_zzogl       "check these libraries -> glew (>=1.5), opengl, X11, nvidia-cg-toolkit (>=2.1), pcsx2 common libs")
+set(msg_dep_zzogl       "check these libraries -> glew (>=1.5), jpeg (>=6.2), opengl, X11, nvidia-cg-toolkit (>=2.1), pcsx2 common libs")
 set(msg_dep_onepad      "check these libraries -> sdl (>=1.2)")
 set(msg_dep_zeropad     "check these libraries -> sdl (>=1.2)")
 set(msg_dep_spu2x       "check these libraries -> soundtouch (>=1.5), alsa, portaudio (>=1.9), a52 (>= 0.7.4), pcsx2 common libs")
@@ -123,15 +123,16 @@ endif(GLEW_FOUND AND OPENGL_FOUND AND X11_FOUND AND CG_FOUND)
 #			-OpenGL
 #			-X11
 #			-CG
+#			-JPEG
 #           -common_libs
 #---------------------------------------
-if(GLEW_FOUND AND OPENGL_FOUND AND X11_FOUND AND CG_FOUND AND common_libs)
+if(GLEW_FOUND AND OPENGL_FOUND AND X11_FOUND AND CG_FOUND AND JPEG_FOUND AND common_libs)
 	set(zzogl TRUE)
-else(GLEW_FOUND AND OPENGL_FOUND AND X11_FOUND AND CG_FOUND AND common_libs)
+else(GLEW_FOUND AND OPENGL_FOUND AND X11_FOUND AND CG_FOUND AND JPEG_FOUND AND common_libs)
 	set(zzogl FALSE)
     message(STATUS "Skip build of zzogl: miss some dependencies")
     message(STATUS "${msg_dep_zzogl}")
-endif(GLEW_FOUND AND OPENGL_FOUND AND X11_FOUND AND CG_FOUND AND common_libs)
+endif(GLEW_FOUND AND OPENGL_FOUND AND X11_FOUND AND CG_FOUND AND JPEG_FOUND AND common_libs)
 #---------------------------------------
 
 #---------------------------------------
diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index 5379923a2d..5923db56fc 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -235,6 +235,7 @@ set(pcsx2Headers
 	SPR.h
 	Stats.h
 	StringUtils.h
+    SysForwardDefs.h
 	System.h
 	Vif_Dma.h
 	Vif.h