X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=Makefile;h=2ad7c0a84f3f5fc0d806302721b3ba89532b8483;hp=e92030f70ca6d0a249cbfa1fcd82c170ef86aa27;hb=8b22a94541ec912f1722878eb054dc82ed909e04;hpb=0d10413fe0f5f33a0b80485963d4b7a05530d2e7 diff --git a/Makefile b/Makefile index e92030f7..2ad7c0a8 100644 --- a/Makefile +++ b/Makefile @@ -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 = @@ -216,8 +233,6 @@ ifeq ($(OS),Darwin) # workaround: we have no "ldd" for OS X, so... LDD = OTOOL = otool - - INSTALLDIR := $(INSTALLDIR_BASE)/NetRadiant.app/Contents/MacOS/install else $(error Unsupported build OS: $(OS)) @@ -384,6 +399,7 @@ binaries-radiant-plugins: \ .PHONY: binaries-radiant binaries-radiant-core: \ $(INSTALLDIR)/radiant.$(EXE) \ + $(INSTALLDIR)/radiant \ .PHONY: binaries-tools binaries-tools: \ @@ -399,14 +415,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 +435,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 +454,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) $@ @@ -477,12 +501,18 @@ $(INSTALLDIR)/q3map2.$(EXE): \ tools/quake3/q3map2/bspfile_ibsp.o \ tools/quake3/q3map2/bspfile_rbsp.o \ tools/quake3/q3map2/bsp.o \ + tools/quake3/q3map2/bsp_analyze.o \ + tools/quake3/q3map2/bsp_scale.o \ + tools/quake3/q3map2/bsp_info.o \ tools/quake3/q3map2/convert_ase.o \ + tools/quake3/q3map2/convert_bsp.o \ tools/quake3/q3map2/convert_obj.o \ tools/quake3/q3map2/convert_map.o \ tools/quake3/q3map2/decals.o \ tools/quake3/q3map2/facebsp.o \ + tools/quake3/q3map2/fixaas.o \ tools/quake3/q3map2/fog.o \ + tools/quake3/q3map2/help.o \ tools/quake3/q3map2/image.o \ tools/quake3/q3map2/leakfile.o \ tools/quake3/q3map2/light_bounce.o \ @@ -492,6 +522,7 @@ $(INSTALLDIR)/q3map2.$(EXE): \ tools/quake3/q3map2/light_ydnar.o \ tools/quake3/q3map2/main.o \ tools/quake3/q3map2/map.o \ + tools/quake3/q3map2/minimap.o \ tools/quake3/q3map2/mesh.o \ tools/quake3/q3map2/model.o \ tools/quake3/q3map2/patch.o \ @@ -510,6 +541,7 @@ $(INSTALLDIR)/q3map2.$(EXE): \ tools/quake3/q3map2/vis.o \ tools/quake3/q3map2/writebsp.o \ libddslib.$(A) \ + libetclib.$(A) \ libfilematch.$(A) \ libl_net.$(A) \ libmathlib.$(A) \ @@ -559,6 +591,10 @@ libddslib.$(A): CPPFLAGS_EXTRA := -Ilibs libddslib.$(A): \ libs/ddslib/ddslib.o \ +libetclib.$(A): CPPFLAGS_EXTRA := -Ilibs +libetclib.$(A): \ + libs/etclib.o \ + $(INSTALLDIR)/q3data.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_ZLIB) $(INSTALLDIR)/q3data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_ZLIB) -Itools/quake3/common -Ilibs -Iinclude $(INSTALLDIR)/q3data.$(EXE): \ @@ -583,6 +619,7 @@ $(INSTALLDIR)/q3data.$(EXE): \ tools/quake3/q3data/stripper.o \ tools/quake3/q3data/video.o \ libfilematch.$(A) \ + libetclib.$(A) \ libl_net.$(A) \ libmathlib.$(A) \ $(if $(findstring $(OS),Win32),icons/q3data.o,) \ @@ -777,9 +814,11 @@ $(INSTALLDIR)/modules/image.$(DLL): \ plugins/image/dds.o \ plugins/image/image.o \ plugins/image/jpeg.o \ + plugins/image/ktx.o \ plugins/image/pcx.o \ plugins/image/tga.o \ libddslib.$(A) \ + libetclib.$(A) \ $(INSTALLDIR)/modules/imageq2.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude $(INSTALLDIR)/modules/imageq2.$(DLL): \ @@ -1019,7 +1058,6 @@ $(INSTALLDIR)/heretic2/h2data.$(EXE): \ install-data: binaries $(MKDIR) $(INSTALLDIR)/games $(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune - [ "$(OS)" != "Darwin" ] || $(CP_R) setup/data/osx/NetRadiant.app/* $(INSTALLDIR_BASE)/NetRadiant.app/ DOWNLOAD_GAMEPACKS="$(DOWNLOAD_GAMEPACKS)" GIT="$(GIT)" SVN="$(SVN)" WGET="$(WGET)" RM_R="$(RM_R)" MV="$(MV)" UNZIPPER="$(UNZIPPER)" ECHO="$(ECHO)" SH="$(SH)" CP="$(CP)" CP_R="$(CP_R)" $(SH) install-gamepacks.sh "$(INSTALLDIR)" $(ECHO) $(RADIANT_MINOR_VERSION) > $(INSTALLDIR)/RADIANT_MINOR $(ECHO) $(RADIANT_MAJOR_VERSION) > $(INSTALLDIR)/RADIANT_MAJOR @@ -1031,16 +1069,11 @@ 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 -else -ifeq ($(OS),Darwin) -install-dll: binaries - EXE="$(EXE)" MACLIBDIR="$(MACLIBDIR)" CP="$(CP)" OTOOL="$(OTOOL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dylibs.sh + MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) $(DLLINSTALL) else install-dll: binaries @$(ECHO) No DLL inclusion implemented for this target. endif -endif # release building... NOT for general users # these may use tools not in the list that is checked by the build system