From fa4b9cb1a8b33291bbf092640e9f4a3e69af3553 Mon Sep 17 00:00:00 2001 From: "gregory.hainaut" Date: Thu, 19 Apr 2012 21:53:00 +0000 Subject: [PATCH] zzogl: bump the version to 0.4 because of the previous merge git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5167 96395faa-99c1-11dd-bbfe-3dabce05a288 --- cmake/SearchForStuff.cmake | 5 +++-- plugins/zzogl-pg/opengl/CMakeLists.txt | 2 +- plugins/zzogl-pg/opengl/GSmain.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index da39519c89..b63401f72a 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake @@ -53,9 +53,10 @@ if(NOT FORCE_INTERNAL_ZLIB) endif(NOT FORCE_INTERNAL_ZLIB) ## Use pcsx2 package to find module -if(NOT GLSL_API) +## Include cg because of zzogl-cg +#if(NOT GLSL_API) include(FindCg) -endif(NOT GLSL_API) +#endif(NOT GLSL_API) include(FindGlew) include(FindLibc) include(FindPortAudio) diff --git a/plugins/zzogl-pg/opengl/CMakeLists.txt b/plugins/zzogl-pg/opengl/CMakeLists.txt index 5c40f84e65..409a33f79a 100644 --- a/plugins/zzogl-pg/opengl/CMakeLists.txt +++ b/plugins/zzogl-pg/opengl/CMakeLists.txt @@ -11,7 +11,7 @@ if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/zzogl-pg/opengl/ZeroGSShaders") endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/zzogl-pg/opengl/ZeroGSShaders") # plugin name -set(Output zzogl-0.3.0) +set(Output zzogl-0.4.0) set(CommonFlags -pthread diff --git a/plugins/zzogl-pg/opengl/GSmain.cpp b/plugins/zzogl-pg/opengl/GSmain.cpp index f92417edab..b3082571a1 100644 --- a/plugins/zzogl-pg/opengl/GSmain.cpp +++ b/plugins/zzogl-pg/opengl/GSmain.cpp @@ -58,7 +58,7 @@ extern const char* pbilinear[]; // statistics u32 g_nGenVars = 0, g_nTexVars = 0, g_nAlphaVars = 0, g_nResolve = 0; -#define VER 3 +#define VER 4 const unsigned char zgsversion = PS2E_GS_VERSION; unsigned char zgsrevision = 0; // revision and build gives plugin version unsigned char zgsbuild = VER;