X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=9eee12128f465bbbc5945ae2e63f1f3fa7ce379e;hb=e995cc897b8a0d2b2828612cb0b226b7520fea86;hp=7bc32d70df525240a7c9e3818d34c5f8cf9bce2e;hpb=32201f62a3b9d50fff9b18dfe3aa262b68e5381b;p=xonotic%2Fnetradiant.git diff --git a/Makefile b/Makefile index 7bc32d70..9eee1212 100644 --- a/Makefile +++ b/Makefile @@ -155,17 +155,27 @@ 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) @@ -391,6 +401,7 @@ binaries-radiant-plugins: \ .PHONY: binaries-radiant binaries-radiant-core: \ $(INSTALLDIR)/radiant.$(EXE) \ + $(INSTALLDIR)/radiant \ .PHONY: binaries-tools binaries-tools: \ @@ -406,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: \ @@ -423,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 @@ -439,7 +455,9 @@ clean: file=$@; $(MKDIR) $${file%/*} $(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; } - if $(MAKE_EXE_SYMLINK); then o=$@; $(LN_SNF) $${o##*/} $*; fi + +$(INSTALLDIR)/%: $(INSTALLDIR)/%.$(EXE) + if $(MAKE_EXE_SYMLINK); then o=$<; $(LN_SNF) $${o##*/} $@; else true; fi %.$(A): $(AR) rc $@ $^