From: Thomas Debesse <dev@illwieckz.net>
Date: Mon, 11 Feb 2019 06:36:53 +0000 (+0100)
Subject: Merge commit 'bf803dd851539f0d5f806f12a1e2ab93fdddae08' into garux-merge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9c4c8b725fdca551dc9379b77ebd9c498d0c6f28;p=xonotic%2Fnetradiant.git

Merge commit 'bf803dd851539f0d5f806f12a1e2ab93fdddae08' into garux-merge
---

9c4c8b725fdca551dc9379b77ebd9c498d0c6f28
diff --cc Makefile
index 009a3d06,e2d56e38..f71d2784
--- a/Makefile
+++ b/Makefile
@@@ -489,9 -482,9 +489,9 @@@ endi
  %.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
 -$(INSTALLDIR)/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG) $(LIBS_JPEG) $(LIBS_ZLIB)
 -$(INSTALLDIR)/q3map2.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) $(CPPFLAGS_JPEG) -Itools/quake3/common -Ilibs -Iinclude
 +$(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): \
  	tools/quake3/common/cmdlib.o \
  	tools/quake3/common/imagelib.o \
diff --cc tools/quake3/q3map2/q3map2.h
index 13496b97,c819d38b..7f132007
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@@ -2030,10 -2001,11 +2030,11 @@@ Q_EXTERN float jitters[ MAX_JITTERS ]
  
  /*can't code*/
  Q_EXTERN qboolean doingBSP Q_ASSIGN( qfalse );
- 
+ Q_EXTERN qboolean doingModelClip Q_ASSIGN( qfalse );
+ Q_EXTERN qboolean snapModelClip Q_ASSIGN( qfalse );
  
  /* commandline arguments */
 -Q_EXTERN qboolean			nocmdline Q_ASSIGN( qfalse );
 +Q_EXTERN qboolean nocmdline Q_ASSIGN( qfalse );
  Q_EXTERN qboolean verbose;
  Q_EXTERN qboolean verboseEntities Q_ASSIGN( qfalse );
  Q_EXTERN qboolean force Q_ASSIGN( qfalse );