From 4e9584e17837f3100c3d980bc4429e541aaa58ec Mon Sep 17 00:00:00 2001 From: "Colton G. Rushton" Date: Sat, 16 May 2020 21:24:29 -0300 Subject: [PATCH] Fix a few minor bugs with MXE compilation --- Makefile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 80213c10..fe9add23 100644 --- a/Makefile +++ b/Makefile @@ -42,11 +42,9 @@ TARGET_WEB ?= 0 TARGET_ARCH ?= native ifeq ($(CROSS),i686-w64-mingw32.static-) - ifeq ($(CROSS),x86_64-w64-mingw32.static-) - TARGET_ARCH = i386pe - else - TARGET_ARCH = i386pe - endif + TARGET_ARCH = i386pe +else ifeq ($(CROSS),x86_64-w64-mingw32.static-) + TARGET_ARCH = i386pe else TARGET_ARCH = native endif @@ -517,9 +515,9 @@ LDFLAGS := -lm -lGL -lSDL2 -no-pie -s TOTAL_MEMORY=20MB -g4 --source-map-base ht else ifeq ($(WINDOWS_BUILD),1) LDFLAGS := $(BITS) -march=$(TARGET_ARCH) -Llib -lpthread -lglew32 `$(SDLCONFIG) --static-libs` -lm -lglu32 -lsetupapi -ldinput8 -luser32 -lgdi32 -limm32 -lole32 -loleaut32 -lshell32 -lwinmm -lversion -luuid -lopengl32 -static ifneq ($(CROSS),i686-w64-mingw32.static-) - ifneq ($(CROSS),x86_64-w64-mingw32.static-) - LDFLAGS += -no-pie - endif + LDFLAGS += -no-pie + else ifneq ($(CROSS),x86_64-w64-mingw32.static-) + LDFLAGS += -no-pie endif ifeq ($(WINDOWS_CONSOLE),1) LDFLAGS += -mconsole