Mercurial > repos > blastem
changeset 795:bce97fc0bb8a
Fix mingw-w64 build and cross-compilation
author | =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> |
---|---|
date | Sun, 26 Jul 2015 10:59:41 -0700 |
parents | e8b14d5a5b5a |
children | 41f73c76b978 |
files | Makefile config.c mem_win.c util.c |
diffstat | 4 files changed, 19 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Jul 25 02:54:00 2015 -0700 +++ b/Makefile Sun Jul 26 10:59:41 2015 -0700 @@ -3,12 +3,18 @@ endif ifeq ($(OS),Windows) +ifndef SDL2_PREFIX +SDL2_PREFIX:="C:/MinGW/usr" +endif +ifndef GLEW32S_LIB +GLEW32S_LIB=glew32s.lib +endif MEM:=mem_win.o BLASTEM:=blastem.exe CC:=wine gcc.exe -CFLAGS:=-O2 -std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -I"C:/MinGW/usr/include/SDL2" -DGLEW_STATIC -LDFLAGS:= -L"C:/MinGW/usr/lib" -lm -lmingw32 -lSDL2main -lSDL2 -lopengl32 -lglu32 -mwindows +CFLAGS:=-O2 -std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -I"$(SDL2_PREFIX)/include/SDL2" -DGLEW_STATIC +LDFLAGS:= $(GLEW32S_LIB) -L"$(SDL2_PREFIX)/lib" -lm -lmingw32 -lSDL2main -lSDL2 -lopengl32 -lglu32 -mwindows CPU:=i686 else @@ -117,11 +123,7 @@ MAINOBJS+= $(Z80OBJS) endif -ifeq ($(OS),Windows) -MAINOBJS+= glew32s.lib -endif - -all : dis zdis stateview vgmplay blastem +all : dis zdis stateview vgmplay $(BLASTEM) $(BLASTEM) : $(MAINOBJS) $(CC) -o $(BLASTEM) $(MAINOBJS) $(LDFLAGS)
--- a/config.c Sat Jul 25 02:54:00 2015 -0700 +++ b/config.c Sun Jul 26 10:59:41 2015 -0700 @@ -9,7 +9,13 @@ #include <stdlib.h> #include <string.h> -#ifdef _WIN32 +#ifdef __MINGW64_VERSION_MAJOR +#define MINGW_W64_VERSION (__MINGW64_VERSION_MAJOR * 1000 + __MINGW64_VERSION_MINOR) +#else +#define MINGW_W64_VERSION 0 +#endif + +#if defined(_WIN32) && (MINGW_W64_VERSION < 3003) char * strtok_r(char * input, char * sep, char ** state) { if (input) {