80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fix incompatibility with latest mingw toolchain

Browse Source 
This patch fixes the incompatibility with the latest mingw toolchain
(which uses GCC-9.2).
This commit is contained in:
Yvan Janssens
2019-09-03 08:33:05 +01:00
parent f6f982c413
commit 8243df99e5
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/win/Makefile.mingw
View File

@@ -233,14 +233,14 @@ VPATH := $(EXPATH) . cpu \
sound/resid-fp \ sound/resid-fp \
scsi video network network/slirp win scsi video network network/slirp win
ifeq ($(X64), y) ifeq ($(X64), y)
CPP := g++ -m64 TOOL_PREFIX := x86_64-w64-mingw32-
CC := gcc -m64
else else
CPP := g++ -m32 TOOL_PREFIX := i686-w64-mingw32-
CC := gcc -m32
endif endif
CPP := ${TOOL_PREFIX}g++
CC := ${TOOL_PREFIX}gcc
WINDRES := windres WINDRES := windres
STRIP := strip STRIP := strip
ifeq ($(ARM64), y) ifeq ($(ARM64), y)
CPP := aarch64-w64-mingw32-g++ CPP := aarch64-w64-mingw32-g++
CC := aarch64-w64-mingw32-gcc CC := aarch64-w64-mingw32-gcc
@@ -467,6 +467,10 @@ endif
CFLAGS := $(WX_FLAGS) $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \ CFLAGS := $(WX_FLAGS) $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \
$(AFLAGS) -fomit-frame-pointer -mstackrealign -Wall \ $(AFLAGS) -fomit-frame-pointer -mstackrealign -Wall \
-fno-strict-aliasing -fno-strict-aliasing
# Add freetyp2 references through pkgconfig
CFLAGS := $(CFLAGS) `pkg-config.exe --cflags freetype2`
CXXFLAGS := $(CFLAGS) CXXFLAGS := $(CFLAGS)