From cdf9146b6d98a79c339a68ef8f90fcd031ae379b Mon Sep 17 00:00:00 2001 From: Garux Date: Thu, 8 Feb 2018 00:54:52 +0300 Subject: [PATCH] omit --large-address-aware for win64 build once again --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index de040638..644d5e37 100644 --- a/Makefile +++ b/Makefile @@ -510,10 +510,10 @@ endif $(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ ifeq ($(OS),Win32) -ifeq ($(ARCH),x64) -$(INSTALLDIR)/q3map2.$(EXE): LDFLAGS_EXTRA := -Wl,--stack,4194304 -else +ifeq ($(shell ARCH),i686) $(INSTALLDIR)/q3map2.$(EXE): LDFLAGS_EXTRA := -Wl,--large-address-aware,--stack,4194304 +else +$(INSTALLDIR)/q3map2.$(EXE): LDFLAGS_EXTRA := -Wl,--stack,4194304 endif endif $(INSTALLDIR)/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG) $(LIBS_JPEG) $(LIBS_ZLIB)