Fix a few minor bugs with MXE compilation
This commit is contained in:
parent
bd4187c92b
commit
410090a84c
8
Makefile
8
Makefile
|
@ -42,11 +42,9 @@ TARGET_WEB ?= 0
|
||||||
TARGET_ARCH ?= native
|
TARGET_ARCH ?= native
|
||||||
|
|
||||||
ifeq ($(CROSS),i686-w64-mingw32.static-)
|
ifeq ($(CROSS),i686-w64-mingw32.static-)
|
||||||
ifeq ($(CROSS),x86_64-w64-mingw32.static-)
|
|
||||||
TARGET_ARCH = i386pe
|
TARGET_ARCH = i386pe
|
||||||
else
|
else ifeq ($(CROSS),x86_64-w64-mingw32.static-)
|
||||||
TARGET_ARCH = i386pe
|
TARGET_ARCH = i386pe
|
||||||
endif
|
|
||||||
else
|
else
|
||||||
TARGET_ARCH = native
|
TARGET_ARCH = native
|
||||||
endif
|
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)
|
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
|
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),i686-w64-mingw32.static-)
|
||||||
ifneq ($(CROSS),x86_64-w64-mingw32.static-)
|
|
||||||
LDFLAGS += -no-pie
|
LDFLAGS += -no-pie
|
||||||
endif
|
else ifneq ($(CROSS),x86_64-w64-mingw32.static-)
|
||||||
|
LDFLAGS += -no-pie
|
||||||
endif
|
endif
|
||||||
ifeq ($(WINDOWS_CONSOLE),1)
|
ifeq ($(WINDOWS_CONSOLE),1)
|
||||||
LDFLAGS += -mconsole
|
LDFLAGS += -mconsole
|
||||||
|
|
Loading…
Reference in New Issue