diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-07-24 10:24:16 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-07-24 10:24:16 +0000 |
| commit | 53f5bc682d5347e2771dc857fcb29c59f9b77c62 (patch) | |
| tree | ba2db1d96471849c0b17a4e54dee819fcf781129 /Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp | |
| parent | 7828a689e716bb3f1165b6f2d4d7f4d39e05a4fc (diff) | |
Make Cg conditional on those platforms for which it is available.
Of course, this doesn't do much good without another shader compiler..
WIP of OS X application bundle building.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5961 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp index 04c481178d..8bdab0f9a7 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp @@ -20,9 +20,6 @@ #include "GLUtil.h" -#include <Cg/cg.h> -#include <Cg/cgGL.h> - #include <cmath> #include "Statistics.h" @@ -248,6 +245,7 @@ bool PixelShaderCache::CompilePixelShader(FRAGMENTSHADER& ps, const char* pstrpr ERROR_LOG(VIDEO, "glError %08x before PS!", err); } +#if defined HAVE_CG && HAVE_CG char stropt[128]; sprintf(stropt, "MaxLocalParams=32,NumInstructionSlots=%d", s_nMaxPixelInstructions); const char *opts[] = {"-profileopts", stropt, "-O2", "-q", NULL}; @@ -305,6 +303,7 @@ bool PixelShaderCache::CompilePixelShader(FRAGMENTSHADER& ps, const char* pstrpr } cgDestroyProgram(tempprog); +#endif #if defined(_DEBUG) || defined(DEBUGFAST) ps.strprog = pstrprogram; |