etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-22 12:05:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a few minor bugs with MXE compilation

Browse source
This commit is contained in:
Colton G. Rushton 2020-05-16 21:24:29 -03:00 committed by GitHub
parent bd4187c92b
commit 410090a84c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -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