shithub: cstory

Info  •  Files  •  Log  •  Branches

Fixed some portability issues (tested on a Pi)

--- a/Makefile

+++ b/Makefile

@@ -8,7 +8,6 @@

 ifeq ($(JAPANESE), 1)

 	CXXFLAGS += -DJAPANESE

-	LIBS += -liconv

 	ifeq ($(RELEASE), 1)

 		FILENAME_DEF = releasejp

 	else

@@ -25,6 +24,9 @@

 ifeq ($(WINDOWS), 1)

 	ifeq ($(CONSOLE), 1)

 		CXXFLAGS += -mconsole

+	endif

+	ifeq ($(JAPANESE), 1)

+		LIBS += -liconv

 	endif

 	CXXFLAGS += -DWINDOWS

 	LIBS += -lkernel32

--- a/src/Generic.cpp

+++ b/src/Generic.cpp

@@ -16,7 +16,7 @@

 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)

--- 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)

 {

-- 

⑨