mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-11-22 12:05:11 +00:00
Merge pull request #140 from coltongit/patch-17
Fix small bug with MXE compilation
This commit is contained in:
commit
60bca0e5db
1 changed files with 1 additions and 3 deletions
4
Makefile
4
Makefile
|
@ -514,9 +514,7 @@ ifeq ($(TARGET_WEB),1)
|
||||||
LDFLAGS := -lm -lGL -lSDL2 -no-pie -s TOTAL_MEMORY=20MB -g4 --source-map-base http://localhost:8080/ -s "EXTRA_EXPORTED_RUNTIME_METHODS=['callMain']"
|
LDFLAGS := -lm -lGL -lSDL2 -no-pie -s TOTAL_MEMORY=20MB -g4 --source-map-base http://localhost:8080/ -s "EXTRA_EXPORTED_RUNTIME_METHODS=['callMain']"
|
||||||
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-)
|
ifeq ($(CROSS),)
|
||||||
LDFLAGS += -no-pie
|
|
||||||
else ifneq ($(CROSS),x86_64-w64-mingw32.static-)
|
|
||||||
LDFLAGS += -no-pie
|
LDFLAGS += -no-pie
|
||||||
endif
|
endif
|
||||||
ifeq ($(WINDOWS_CONSOLE),1)
|
ifeq ($(WINDOWS_CONSOLE),1)
|
||||||
|
|
Loading…
Reference in a new issue