X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=bf98684f13c36c55cf4768731771b3e33714f9de;hb=f33a8b6f26748e82bdda14d8f7bbcf2e1a005bea;hp=009a3d066b1269d01427b04d3620b308f0a709e6;hpb=1b43d194324664a27b2639b326ae55ec996a4c01;p=xonotic%2Fnetradiant.git

diff --git a/Makefile b/Makefile
index 009a3d06..bf98684f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,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: release, or: debug, or: extradebug, or: profile, or: native
 OS                 ?= $(shell uname)
 # or: Linux, Win32, Darwin
 LDFLAGS            ?=
@@ -489,7 +489,7 @@ 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
 $(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): \
@@ -503,6 +503,7 @@ $(INSTALLDIR)/q3map2.$(EXE): \
 	tools/quake3/common/scriplib.o \
 	tools/quake3/common/threads.o \
 	tools/quake3/common/vfs.o \
+	tools/quake3/common/miniz.o \
 	tools/quake3/q3map2/brush.o \
 	tools/quake3/q3map2/brush_primit.o \
 	tools/quake3/q3map2/bspfile_abstract.o \
@@ -616,6 +617,7 @@ $(INSTALLDIR)/q3data.$(EXE): \
 	tools/quake3/common/scriplib.o \
 	tools/quake3/common/trilib.o \
 	tools/quake3/common/vfs.o \
+	tools/quake3/common/miniz.o \
 	tools/quake3/q3data/3dslib.o \
 	tools/quake3/q3data/compress.o \
 	tools/quake3/q3data/images.o \
@@ -663,6 +665,7 @@ $(INSTALLDIR)/radiant.$(EXE): \
 	radiant/error.o \
 	radiant/feedback.o \
 	radiant/filetypes.o \
+	radiant/filterbar.o \
 	radiant/filters.o \
 	radiant/findtexturedialog.o \
 	radiant/glwidget.o \
@@ -670,6 +673,7 @@ $(INSTALLDIR)/radiant.$(EXE): \
 	radiant/groupdialog.o \
 	radiant/gtkdlgs.o \
 	radiant/gtkmisc.o \
+	radiant/gtktheme.o \
 	radiant/help.o \
 	radiant/image.o \
 	radiant/mainframe.o \