X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=Makefile;h=ff8161fbad379d4ea70c667d115a96b5974d5d90;hp=29471bdefd3dd6964fa350a88863c40977da6541;hb=HEAD;hpb=a31b98dae8f43e0cc1b13b65b9517c09e8f9da20 diff --git a/Makefile b/Makefile index 29471bde..2a63b9cc 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ MAKEFILE_CONF ?= Makefile.conf # user customizable stuf # you may override this in Makefile.conf or the environment BUILD ?= debug -# or: release, or: extradebug, or: profile, or: debug +# or: release, or: debug, or: extradebug, or: profile, or: native OS ?= $(shell uname) # or: Linux, Win32, Darwin LDFLAGS ?= @@ -498,7 +498,9 @@ endif %.o: %.c $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) | dependencies-check $(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ -$(INSTALLDIR)/q3map2.$(EXE): LDFLAGS_EXTRA := -Wl,--large-address-aware +ifeq ($(OS),Win32) +$(INSTALLDIR)/q3map2.$(EXE): LDFLAGS_EXTRA := -Wl,--large-address-aware,--stack,4194304 +endif $(INSTALLDIR)/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG) $(LIBS_JPEG) $(LIBS_WEBP) $(LIBS_ZLIB) $(INSTALLDIR)/q3map2.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) $(CPPFLAGS_JPEG) $(CPPFLAGS_WEBP) -Itools/quake3/common -Ilibs -Iinclude $(INSTALLDIR)/q3map2.$(EXE): \