From a321c4c78586c913c1da88ec0dd5ff906d2c9d3e Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 8 May 2017 09:33:01 +0200 Subject: [PATCH] Fix building with MinGW from Linux --- src/Makefile | 4 +++- src/input.c | 2 +- src/readline.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index 6e531b9d..34db452f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -318,10 +318,12 @@ endif # These can only be used under linux and maybe freebsd. They allow to compile for the gp2x or to create a windows binary ifdef WIN32CROSS #cross compile a Win32 executable - CC = i586-mingw32msvc-gcc + CC = i686-w64-mingw32-gcc BIN = ../bin/grafx2.exe COPT = -W -Wall -Wdeclaration-after-statement -O$(OPTIM) -g -ggdb -Dmain=SDL_main $(shell /usr/local/cross-tools/i386-mingw32/bin/sdl-config --cflags) $(TTFCOPT) LOPT = -mwindows -lmingw32 -lSDLmain -lSDL -lshlwapi $(shell /usr/local/cross-tools/i386-mingw32/bin/sdl-config --libs) -lSDL_image $(TTFLOPT) + COPT += $(shell PKG_CONFIG_PATH=/usr/local/cross-tools/i386-mingw32/lib/pkgconfig i686-w64-mingw32-pkg-config --cflags libpng) + LOPT += $(shell PKG_CONFIG_PATH=/usr/local/cross-tools/i386-mingw32/lib/pkgconfig i686-w64-mingw32-pkg-config --libs libpng) OBJDIR = ../obj/win32 PLATFORM = win32 else diff --git a/src/input.c b/src/input.c index e5c5d207..c4a9adba 100644 --- a/src/input.c +++ b/src/input.c @@ -25,7 +25,7 @@ #ifdef __WIN32__ #include - #include + #include #endif #include "global.h" diff --git a/src/readline.c b/src/readline.c index 94c0c0a6..ed5838b8 100644 --- a/src/readline.c +++ b/src/readline.c @@ -43,7 +43,7 @@ #include "engine.h" #ifdef __WIN32__ -#include +#include #include #elif defined __HAIKU__ #include "haiku.h"