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

zzogl & cmake: fix build failure of previous heavy change 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5168 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2012-04-20 16:48:03 +00:00
parent fa4b9cb1a8
commit d487c57f11
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/BuildParameters.cmake
View File

@ -188,6 +188,6 @@ endif(PACKAGE_MODE)
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Select nvidia cg shader api by default # Select nvidia cg shader api by default
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
if(NOT DEFINED FORCE_INTERNAL_SOUNDTOUCH) if(NOT DEFINED GLSL_API)
set(GLSL_API FALSE) set(GLSL_API FALSE)
endif(NOT DEFINED FORCE_INTERNAL_SOUNDTOUCH) endif(NOT DEFINED GLSL_API)

2
plugins/zzogl-pg-cg/opengl/ZeroGSShaders/CMakeLists.txt
View File

@ -7,7 +7,7 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
# plugin name # plugin name
set(Output zzogl-shader) set(Output zzogl-cg-shader)
set(CommonFlags set(CommonFlags
-pthread -pthread

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

@ -511,7 +511,7 @@ EXPORT_C_(void) GSvsync(int current_interlace)
g_dump.Open(filename, g_LastCRC, fd, g_pBasePS2Mem); g_dump.Open(filename, g_LastCRC, fd, g_pBasePS2Mem);
conf.dump--; conf.dump--;
} }
g_dump.VSync(interlace, (conf.dump == 0), g_pBasePS2Mem); g_dump.VSync(current_interlace, (conf.dump == 0), g_pBasePS2Mem);
#endif #endif
GL_REPORT_ERRORD(); GL_REPORT_ERRORD();