From e105c88e55704bcbb963febf656125759a3bce2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?=
 <branimirkaradzic@gmail.com>
Date: Fri, 18 Jan 2019 18:07:29 -0800
Subject: [PATCH] Cleanup.

---
 examples/20-nanovg/nanovg.cpp | 14 ++++++--------
 tools/shaderc/shaderc.cpp     |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/examples/20-nanovg/nanovg.cpp b/examples/20-nanovg/nanovg.cpp
index 3f158ec5d..7e902022d 100644
--- a/examples/20-nanovg/nanovg.cpp
+++ b/examples/20-nanovg/nanovg.cpp
@@ -24,9 +24,6 @@
 #include "common.h"
 #include "bgfx_utils.h"
 
-#include <stdio.h>
-#include <math.h>
-
 #include <bx/string.h>
 #include <bx/timer.h>
 #include <bimg/decode.h>
@@ -1029,7 +1026,7 @@ int loadDemoData(struct NVGcontext* vg, struct DemoData* data)
 		data->images[i] = createImage(vg, file, 0);
 		if (data->images[i] == 0)
 		{
-			printf("Could not load %s.\n", file);
+			bx::debugPrintf("Could not load %s.\n", file);
 			return -1;
 		}
 	}
@@ -1037,30 +1034,31 @@ int loadDemoData(struct NVGcontext* vg, struct DemoData* data)
 	data->fontIcons = nvgCreateFont(vg, "icons", "font/entypo.ttf");
 	if (data->fontIcons == -1)
 	{
-		printf("Could not add font icons.\n");
+		bx::debugPrintf("Could not add font icons.\n");
 		return -1;
 	}
 
 	data->fontNormal = nvgCreateFont(vg, "sans", "font/roboto-regular.ttf");
 	if (data->fontNormal == -1)
 	{
-		printf("Could not add font italic.\n");
+		bx::debugPrintf("Could not add font italic.\n");
 		return -1;
 	}
 
 	data->fontBold = nvgCreateFont(vg, "sans-bold", "font/roboto-bold.ttf");
 	if (data->fontBold == -1)
 	{
-		printf("Could not add font bold.\n");
+		bx::debugPrintf("Could not add font bold.\n");
 		return -1;
 	}
 
 	data->fontEmoji = nvgCreateFont(vg, "emoji", "font/NotoEmoji-Regular.ttf");
 	if (data->fontEmoji == -1)
 	{
-		printf("Could not add font emoji.\n");
+		bx::debugPrintf("Could not add font emoji.\n");
 		return -1;
 	}
+
 	nvgAddFallbackFontId(vg, data->fontNormal, data->fontEmoji);
 	nvgAddFallbackFontId(vg, data->fontBold, data->fontEmoji);
 
diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp
index 713565d9d..0f5ce77f3 100644
--- a/tools/shaderc/shaderc.cpp
+++ b/tools/shaderc/shaderc.cpp
@@ -2540,7 +2540,7 @@ namespace bgfx
 			return bx::kExitSuccess;
 		}
 
-		remove(outFilePath);
+		bx::remove(outFilePath);
 
 		fprintf(stderr, "Failed to build shader.\n");
 		return bx::kExitFailure;