diff options
| author | Jason Maskell <Jason Maskell> | 2016-07-25 12:13:14 +0700 |
|---|---|---|
| committer | Jason Maskell <Jason Maskell> | 2016-07-25 12:13:14 +0700 |
| commit | 9fc34880f8e0674cb61a8dd479c64280d056cca2 (patch) | |
| tree | 417b6f4b8163b32d96bfec784ff3f4bcb2f0bfb6 /src | |
| parent | Renamed Logger.h to GFSDK_Logger.h since it's a shared header. (diff) | |
| download | waveworks_archive-9fc34880f8e0674cb61a8dd479c64280d056cca2.tar.xz waveworks_archive-9fc34880f8e0674cb61a8dd479c64280d056cca2.zip | |
Had some compilation issues without previously generated code, fixed now.
Disabled OpenGL in the D3D11 build, for now. This is an ugly hack and needs to be fixed.
Separated FindFXC into its own finder so that we can fail when it's not found.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Internal.h | 2 | ||||
| -rw-r--r-- | src/shader/CalcGradient.fx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Internal.h b/src/Internal.h index a7a73e7..d8f64ef 100644 --- a/src/Internal.h +++ b/src/Internal.h @@ -414,7 +414,7 @@ void handle_hr_error(HRESULT hr, const char_type* file, int line); #endif #ifdef TARGET_PLATFORM_WINDOWS -#define WAVEWORKS_ENABLE_GL WAVEWORKS_ALLOW_GFX +//#define WAVEWORKS_ENABLE_GL WAVEWORKS_ALLOW_GFX #else #ifdef TARGET_PLATFORM_MACOSX #define WAVEWORKS_ENABLE_GL WAVEWORKS_ALLOW_GFX diff --git a/src/shader/CalcGradient.fx b/src/shader/CalcGradient.fx index e66e75f..58ffd3e 100644 --- a/src/shader/CalcGradient.fx +++ b/src/shader/CalcGradient.fx @@ -26,7 +26,7 @@ // strictly prohibited. // -#include "Common.fxh" +#include "GFSDK_WaveWorks_Common.fxh" #ifdef GFSDK_WAVEWORKS_GL #define DECLARE_ATTR_CONSTANT(Type,Label,Regoff) uniform Type Label |