X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=b7521e0a6f94b459b53654114b4552b065f2ef41;hb=2de8ee725b2a6e54e21d5e217ae453ee115b913a;hp=e92030f70ca6d0a249cbfa1fcd82c170ef86aa27;hpb=7fc621fc78d0e040dc2c12f38dc53dd9048215dc;p=xonotic%2Fnetradiant.git

diff --git a/Makefile b/Makefile
index e92030f7..b7521e0a 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: extradebug, or: profile, or: debug
 OS                 ?= $(shell uname)
 # or: Linux, Win32, Darwin
 LDFLAGS            ?=
@@ -37,6 +37,8 @@ CAT                ?= cat
 MKDIR              ?= mkdir -p
 CP                 ?= cp
 CP_R               ?= $(CP) -r
+LN                 ?= ln
+LN_SNF             ?= $(LN) -snf
 RM                 ?= rm
 RM_R               ?= $(RM) -r
 TEE_STDERR         ?= | tee /dev/stderr
@@ -97,6 +99,7 @@ endif
 # these are used on Win32 only
 GTKDIR             ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --variable=prefix $(STDERR_TO_DEVNULL))
 WHICHDLL           ?= which
+DLLINSTALL         ?= install-dlls.sh
 
 # alias mingw32 OSes
 ifeq ($(OS),MINGW32_NT-6.0)
@@ -152,26 +155,39 @@ ifeq ($(BUILD),release)
 ifeq ($(findstring $(CFLAGS),-O),)
 	CFLAGS_COMMON += -O3
 	# only add -O3 if no -O flag is in $(CFLAGS)
-	# to allow overriding the optimizations
 endif
 	CPPFLAGS_COMMON +=
 	LDFLAGS_COMMON += -s
 else
 
+ifeq ($(BUILD),native)
+ifeq ($(findstring $(CFLAGS),-O),)
+	CFLAGS_COMMON += -O3
+	# only add -O3 if no -O flag is in $(CFLAGS)
+endif
+	CFLAGS_COMMON += -march=native -mcpu=native
+	CPPFLAGS_COMMON +=
+	LDFLAGS_COMMON += -s
+else
+
 $(error Unsupported build type: $(BUILD))
 endif
 endif
 endif
 endif
+endif
 
 INSTALLDIR_BASE := $(INSTALLDIR)
 
+MAKE_EXE_SYMLINK = false
+
 ifeq ($(OS),Linux)
 	CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS
 	CFLAGS_COMMON += -fPIC
 	LDFLAGS_DLL = -fPIC -ldl
 	LIBS_COMMON = -lpthread
-	EXE ?= x86
+	EXE ?= $(shell uname -m)
+	MAKE_EXE_SYMLINK = true
 	A = a
 	DLL = so
 	MWINDOWS =
@@ -203,7 +219,8 @@ ifeq ($(OS),Darwin)
 	CPPFLAGS_COMMON += -I$(MACLIBDIR)/../include -I/usr/X11R6/include
 	LDFLAGS_COMMON += -L$(MACLIBDIR) -L/usr/X11R6/lib
 	LDFLAGS_DLL += -dynamiclib -ldl
-	EXE ?= ppc
+	EXE ?= $(shell uname -m)
+	MAKE_EXE_SYMLINK = true
 	A = a
 	DLL = dylib
 	MWINDOWS =
@@ -384,6 +401,7 @@ binaries-radiant-plugins: \
 .PHONY: binaries-radiant
 binaries-radiant-core: \
 	$(INSTALLDIR)/radiant.$(EXE) \
+	$(INSTALLDIR)/radiant \
 
 .PHONY: binaries-tools
 binaries-tools: \
@@ -399,14 +417,17 @@ binaries-tools-quake2: \
 .PHONY: binaries-q2map
 binaries-q2map: \
 	$(INSTALLDIR)/q2map.$(EXE) \
+	$(INSTALLDIR)/q2map \
 
 .PHONY: binaries-qdata3
 binaries-qdata3: \
 	$(INSTALLDIR)/qdata3.$(EXE) \
+	$(INSTALLDIR)/qdata3 \
 
 .PHONY: binaries-h2data
 binaries-h2data: \
-	$(INSTALLDIR)/heretic2/h2data.$(EXE)
+	$(INSTALLDIR)/heretic2/h2data.$(EXE) \
+	$(INSTALLDIR)/heretic2/h2data \
 
 .PHONY: binaries-tools-quake3
 binaries-tools-quake3: \
@@ -416,10 +437,12 @@ binaries-tools-quake3: \
 .PHONY: binaries-q3data
 binaries-q3data: \
 	$(INSTALLDIR)/q3data.$(EXE) \
+	$(INSTALLDIR)/q3data \
 
 .PHONY: binaries-q3map2
 binaries-q3map2: \
 	$(INSTALLDIR)/q3map2.$(EXE) \
+	$(INSTALLDIR)/q3map2 \
 
 
 .PHONY: clean
@@ -433,6 +456,9 @@ clean:
 	$(CXX) $^ $(LDFLAGS) $(LDFLAGS_COMMON) $(LDFLAGS_EXTRA) $(LIBS_EXTRA) $(LIBS_COMMON) $(LIBS) -o $@
 	[ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ $(STDERR_TO_STDOUT) $(STDOUT_TO_DEVNULL) $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; }
 
+$(INSTALLDIR)/%: $(INSTALLDIR)/%.$(EXE)
+	if $(MAKE_EXE_SYMLINK); then o=$<; $(LN_SNF) $${o##*/} $@; else true; fi
+
 %.$(A):
 	$(AR) rc $@ $^
 	$(RANLIB) $@
@@ -456,7 +482,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_ZLIB)
 $(INSTALLDIR)/q3map2.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) $(CPPFLAGS_JPEG) -Itools/quake3/common -Ilibs -Iinclude
 $(INSTALLDIR)/q3map2.$(EXE): \
@@ -471,6 +497,7 @@ $(INSTALLDIR)/q3map2.$(EXE): \
 	tools/quake3/common/threads.o \
 	tools/quake3/common/unzip.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 \
@@ -572,6 +599,7 @@ $(INSTALLDIR)/q3data.$(EXE): \
 	tools/quake3/common/trilib.o \
 	tools/quake3/common/unzip.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 \
@@ -618,6 +646,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 \
@@ -1031,7 +1060,7 @@ install-data: binaries
 .PHONY: install-dll
 ifeq ($(OS),Win32)
 install-dll: binaries
-	MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dlls.sh
+	MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) $(DLLINSTALL) 
 else
 ifeq ($(OS),Darwin)
 install-dll: binaries