瀏覽代碼

Fixed warnings.

Branimir Karadžić 9 年之前
父節點
當前提交
5c10e94533

+ 1 - 1
3rdparty/glslang/glslang/Include/Common.h

@@ -37,7 +37,7 @@
 #ifndef _COMMON_INCLUDED_
 #define _COMMON_INCLUDED_
 
-#if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/) || defined MINGW_HAS_SECURE_API
+#if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/) // || defined MINGW_HAS_SECURE_API
     #include <basetsd.h>
     #define snprintf sprintf_s
     #define safe_vsprintf(buf,max,format,args) vsnprintf_s((buf), (max), (max), (format), (args))

+ 0 - 2
3rdparty/tinyexr/tinyexr.cc

@@ -1,2 +0,0 @@
-#define TINYEXR_IMPLEMENTATION
-#include "tinyexr.h"

+ 1 - 0
examples/common/bgfx_utils.cpp

@@ -23,6 +23,7 @@ namespace stl = tinystl;
 
 BX_PRAGMA_DIAGNOSTIC_PUSH()
 BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wtype-limits")
+#define MINIZ_NO_STDIO
 #define TINYEXR_IMPLEMENTATION
 #include <tinyexr/tinyexr.h>
 BX_PRAGMA_DIAGNOSTIC_POP()

+ 3 - 0
makefile

@@ -340,6 +340,9 @@ texturev: .build/projects/$(BUILD_PROJECT_DIR) ## Build texturev tool.
 
 tools: geometryc shaderc texturec texturev ## Build tools.
 
+clean-tools: ## Clean tools projects.
+	-$(SILENT) rm -r .build/projects/$(BUILD_PROJECT_DIR)
+
 dist-windows: .build/projects/gmake-mingw-gcc
 	$(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 geometryc
 	$(SILENT) cp .build/win64_mingw-gcc/bin/geometrycRelease.exe tools/bin/windows/geometryc.exe

+ 0 - 1
scripts/texturec.lua

@@ -30,7 +30,6 @@ project "texturec"
 		path.join(BGFX_DIR, "3rdparty/nvtt/**.h"),
 		path.join(BGFX_DIR, "3rdparty/pvrtc/**.cpp"),
 		path.join(BGFX_DIR, "3rdparty/pvrtc/**.h"),
-		path.join(BGFX_DIR, "3rdparty/tinyexr/**.cc"),
 		path.join(BGFX_DIR, "3rdparty/tinyexr/**.h"),
 		path.join(BGFX_DIR, "3rdparty/iqa/include/**.h"),
 		path.join(BGFX_DIR, "3rdparty/iqa/source/**.c"),

+ 8 - 1
tools/texturec/texturec.cpp

@@ -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,13 @@ 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")
+#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