From 5d800819df0caa8a01ffd8be2aecba27494f7f01 Mon Sep 17 00:00:00 2001 From: "Colton G. Rushton" Date: Sat, 16 May 2020 22:54:03 -0300 Subject: [PATCH 1/2] fix small bug with MXE compilation the no-pie command line option was being sent to MXE when it shouldn't have been, breaking MXE compilation. Urgent fix. --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fe9add23..6767bf89 100644 --- a/Makefile +++ b/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']" 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-) - LDFLAGS += -no-pie - else ifneq ($(CROSS),x86_64-w64-mingw32.static-) + ifeq ($(CROSS),) LDFLAGS += -no-pie endif ifeq ($(WINDOWS_CONSOLE),1) From a40892a1bf695da78b23bd560b95f4f8ad735c51 Mon Sep 17 00:00:00 2001 From: "Colton G. Rushton" Date: Sat, 16 May 2020 23:05:24 -0300 Subject: [PATCH 2/2] Update readme for MXE compilation support --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c9fabe58..1ba69773 100644 --- a/README.md +++ b/README.md @@ -22,4 +22,4 @@ Please contribute **first** to the [nightly branch](https://github.com/sm64pc/sm ## Building For building instructions, please refer to the [wiki](https://github.com/sm64pc/sm64pc/wiki). -**Do NOT attempt to compile Windows executables with `WINDOWS_BUILD=1` under Linux or WSL. It will NOT work. Follow the guide on the wiki.** +**Make sure you have MXE first before attempting to compile for Windows on Linux and WSL. Follow the guide on the wiki.**