From 583994735018b556cd4e7728ee8cc045fda74b98 Mon Sep 17 00:00:00 2001 From: terminx Date: Sun, 2 Jul 2017 00:44:30 +0000 Subject: [PATCH] Makefile changes required for MSYS2 builds to be functional again git-svn-id: https://svn.eduke32.com/eduke32@6310 1a8010ca-5511-0410-912e-c29ae57300e0 --- Common.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Common.mak b/Common.mak index 60585e2f0..6eb40d1ef 100644 --- a/Common.mak +++ b/Common.mak @@ -413,7 +413,7 @@ ASFORMAT=elf$(BITS) # Options to "luajit -b" for synthesis. Since it runs on Linux, we need to tell # the native LuaJIT to emit PE object files. ifeq ($(PLATFORM),WINDOWS) - LINKERFLAGS+= -static-libgcc + LINKERFLAGS+= -static-libgcc -static ifeq (0,$(CLANG)) L_CXXONLYFLAGS += -static-libstdc++ endif @@ -853,7 +853,7 @@ ifeq ($(PLATFORM),WINDOWS) ifneq (0,$(GCC_PREREQ_4)) L_SSP := -lssp endif - LIBS+= -lmingwex -lgdi32 + LIBS+= -lmingwex -lgdi32 -lpthread ifeq ($(RENDERTYPE),WIN) LIBS += -ldxguid else