diff options
Diffstat (limited to '3rdparty/bgfx/tools/texturec/texturec.cpp')
-rw-r--r-- | 3rdparty/bgfx/tools/texturec/texturec.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/3rdparty/bgfx/tools/texturec/texturec.cpp b/3rdparty/bgfx/tools/texturec/texturec.cpp index e950ab82855..32715c4499b 100644 --- a/3rdparty/bgfx/tools/texturec/texturec.cpp +++ b/3rdparty/bgfx/tools/texturec/texturec.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 Branimir Karadzic. All rights reserved. + * Copyright 2011-2017 Branimir Karadzic. All rights reserved. * License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause */ @@ -16,7 +16,7 @@ #include <etc2/ProcessRGB.hpp> #include <nvtt/nvtt.h> #include <pvrtc/PvrTcEncoder.h> -#include <tinyexr/tinyexr.h> + #include <edtaa3/edtaa3func.h> extern "C" { @@ -57,6 +57,14 @@ BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wint-to-pointer-cast") #include <stb/stb_image.c> BX_PRAGMA_DIAGNOSTIC_POP(); +BX_PRAGMA_DIAGNOSTIC_PUSH() +BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wtype-limits") +BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-value") +#define MINIZ_NO_STDIO +#define TINYEXR_IMPLEMENTATION +#include <tinyexr/tinyexr.h> +BX_PRAGMA_DIAGNOSTIC_POP() + #if 0 # define BX_TRACE(_format, ...) fprintf(stderr, "" _format "\n", ##__VA_ARGS__) #endif // DEBUG @@ -496,7 +504,7 @@ void help(const char* _error = NULL) fprintf(stderr , "texturec, bgfx texture compiler tool\n" - "Copyright 2011-2016 Branimir Karadzic. All rights reserved.\n" + "Copyright 2011-2017 Branimir Karadzic. All rights reserved.\n" "License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause\n\n" ); |