From cad4518d3021ae8ff810e7a90faf562f7d73572c Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Mon, 11 Feb 2019 14:42:24 +0000
Subject: [PATCH] Fixed some portability issues (tested on a Pi)

---
 Makefile        | 4 +++-
 src/Generic.cpp | 2 +-
 src/PixTone.cpp | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 2f91fa1b..c5029dee 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,6 @@ endif
 
 ifeq ($(JAPANESE), 1)
 	CXXFLAGS += -DJAPANESE
-	LIBS += -liconv
 	ifeq ($(RELEASE), 1)
 		FILENAME_DEF = releasejp
 	else
@@ -26,6 +25,9 @@ ifeq ($(WINDOWS), 1)
 	ifeq ($(CONSOLE), 1)
 		CXXFLAGS += -mconsole
 	endif
+	ifeq ($(JAPANESE), 1)
+		LIBS += -liconv
+	endif
 	CXXFLAGS += -DWINDOWS
 	LIBS += -lkernel32
 endif
diff --git a/src/Generic.cpp b/src/Generic.cpp
index 33f8b811..20bbe30e 100644
--- a/src/Generic.cpp
+++ b/src/Generic.cpp
@@ -16,7 +16,7 @@ bool GetCompileVersion(int *v1, int *v2, int *v3, int *v4)
 bool CheckFileExists(const char *name)
 {
 	char path[PATH_LENGTH];
-	sprintf(path, "%s\\%s", gModulePath, name);
+	sprintf(path, "%s/%s", gModulePath, name);
 	
 	FILE *file = fopen(path, "rb");
 	if (file)
diff --git a/src/PixTone.cpp b/src/PixTone.cpp
index ee7b3df0..33e82185 100644
--- a/src/PixTone.cpp
+++ b/src/PixTone.cpp
@@ -6,7 +6,7 @@
 
 #include "WindowsWrapper.h"
 
-static char gWaveModelTable[6][256];
+static signed char gWaveModelTable[6][256];
 
 void MakeWaveTables(void)
 {