X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=Makefile;h=e92030f70ca6d0a249cbfa1fcd82c170ef86aa27;hp=564a3c97f89d2050189fb9fbc5a2dd3a2e84da60;hb=bfc8a12a6b315ae261101a34db8ba1b682c67bb7;hpb=bc2185ec9485c3bb60f6a3d3f6df8d802de7357b diff --git a/Makefile b/Makefile index 564a3c97..e92030f7 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ GIT ?= git SVN ?= svn WGET ?= wget MV ?= mv -UNZIP ?= unzip +UNZIPPER ?= unzip FD_TO_DEVNULL ?= >/dev/null STDOUT_TO_DEVNULL ?= 1$(FD_TO_DEVNULL) @@ -80,6 +80,8 @@ CPPFLAGS_DL ?= LIBS_DL ?= -ldl # nothing on Win32 CPPFLAGS_ZLIB ?= LIBS_ZLIB ?= -lz +CPPFLAGS_JPEG ?= +LIBS_JPEG ?= -ljpeg DEPEND_ON_MAKEFILE ?= yes DOWNLOAD_GAMEPACKS ?= yes # set to no to disable gamepack, set to all to even download undistributable gamepacks @@ -178,8 +180,8 @@ else ifeq ($(OS),Win32) CPPFLAGS_COMMON += -DWIN32 -D_WIN32 -D_inline=inline CFLAGS_COMMON += -mms-bitfields - LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias - LIBS_COMMON = -lws2_32 -luser32 -lgdi32 + LDFLAGS_DLL = -Wl,--add-stdcall-alias + LIBS_COMMON = -lws2_32 -luser32 -lgdi32 -lole32 EXE ?= exe A = a DLL = dll @@ -197,11 +199,11 @@ ifeq ($(OS),Darwin) CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS CFLAGS_COMMON += -fPIC CXXFLAGS_COMMON += -fno-exceptions -fno-rtti - CPPFLAGS_COMMON += -I/opt/local/include -I/sw/include -I/usr/X11R6/include - LDFLAGS_COMMON += -L/opt/local/lib -L/sw/lib -L/usr/X11R6/lib + MACLIBDIR ?= /opt/local/lib + CPPFLAGS_COMMON += -I$(MACLIBDIR)/../include -I/usr/X11R6/include + LDFLAGS_COMMON += -L$(MACLIBDIR) -L/usr/X11R6/lib LDFLAGS_DLL += -dynamiclib -ldl EXE ?= ppc - MACLIBDIR ?= /opt/local/lib A = a DLL = dylib MWINDOWS = @@ -224,7 +226,8 @@ endif endif # VERSION! -RADIANT_VERSION = 1.5.0n +RADIANT_VERSION_NUMBER = 1.5.0 +RADIANT_VERSION = $(RADIANT_VERSION_NUMBER)n RADIANT_MAJOR_VERSION = 5 RADIANT_MINOR_VERSION = 0 Q3MAP_VERSION = 2.5.17n @@ -289,7 +292,7 @@ dependencies-check: checkbinary binutils "$(RANLIB)"; \ checkbinary binutils "$(AR)"; \ checkbinary pkg-config "$(PKGCONFIG)"; \ - checkbinary unzip "$(UNZIP)"; \ + checkbinary unzip "$(UNZIPPER)"; \ checkbinary git-core "$(GIT)"; \ checkbinary subversion "$(SVN)"; \ checkbinary wget "$(WGET)"; \ @@ -304,11 +307,20 @@ dependencies-check: { \ $(ECHO_NOLF) "Checking for $$2 ($$1)... "; \ if \ - $(CXX) conftest.cpp $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $$4 -DCONFTEST_HEADER="<$$2>" -DCONFTEST_SYMBOL="$$3" $(TARGET_ARCH) $(LDFLAGS) -c -o conftest.o >&3 $(STDERR_TO_STDOUT) && \ - $(CXX) conftest.o $(LDFLAGS) $(LDFLAGS_COMMON) $$5 $(LIBS_COMMON) $(LIBS) -o conftest >&3 $(STDERR_TO_STDOUT); \ + $(CXX) conftest.cpp $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $$4 -DCONFTEST_HEADER="<$$2>" -DCONFTEST_SYMBOL="$$3" $(TARGET_ARCH) $(LDFLAGS) -c -o conftest.o >&3 $(STDERR_TO_STDOUT); \ then \ - $(RM) conftest conftest.o conftest.d; \ - $(ECHO) "found."; \ + if \ + $(CXX) conftest.o $(LDFLAGS) $(LDFLAGS_COMMON) $$5 $(LIBS_COMMON) $(LIBS) -o conftest >&3 $(STDERR_TO_STDOUT); \ + then \ + $(RM) conftest conftest.o conftest.d; \ + $(ECHO) "found and links."; \ + else \ + $(RM) conftest.o conftest.d; \ + $(ECHO) "found but does not link, please install it or set PKG_CONFIG_PATH right!"; \ + $(ECHO) "To see the failed commands, set DEPENDENCIES_CHECK=verbose"; \ + $(ECHO) "To proceed anyway, set DEPENDENCIES_CHECK=off"; \ + failed=1; \ + fi; \ else \ $(RM) conftest conftest.o conftest.d; \ $(ECHO) "not found, please install it or set PKG_CONFIG_PATH right!"; \ @@ -318,7 +330,8 @@ dependencies-check: fi; \ }; \ $(ECHO) checking that the dependencies exist; \ - checkheader libglib2.0-dev glib/gutils.h g_path_is_absolute "$(CPPFLAGS_GLIB)" "$(LIBS_GLIB)"; \ + checkheader libjpeg8-dev jpeglib.h jpeg_set_defaults "$(CPPFLAGS_JPEG)" "$(LIBS_JPEG)"; \ + checkheader libglib2.0-dev glib.h g_path_is_absolute "$(CPPFLAGS_GLIB)" "$(LIBS_GLIB)"; \ checkheader libxml2-dev libxml/xpath.h xmlXPathInit "$(CPPFLAGS_XML)" "$(LIBS_XML)"; \ checkheader libpng12-dev png.h png_create_read_struct "$(CPPFLAGS_PNG)" "$(LIBS_PNG)"; \ checkheader "mesa-common-dev (or another OpenGL library)" GL/gl.h glClear "$(CPPFLAGS_GL)" "$(LIBS_GL)"; \ @@ -333,7 +346,17 @@ endif .PHONY: binaries binaries: \ - $(INSTALLDIR)/heretic2/h2data.$(EXE) \ + binaries-tools \ + binaries-radiant \ + +.PHONY: binaries-radiant-all +binaries-radiant: \ + binaries-radiant-modules \ + binaries-radiant-plugins \ + binaries-radiant-core \ + +.PHONY: binaries-radiant-modules +binaries-radiant-modules: \ $(INSTALLDIR)/modules/archivepak.$(DLL) \ $(INSTALLDIR)/modules/archivewad.$(DLL) \ $(INSTALLDIR)/modules/archivezip.$(DLL) \ @@ -348,17 +371,56 @@ binaries: \ $(INSTALLDIR)/modules/model.$(DLL) \ $(INSTALLDIR)/modules/shaders.$(DLL) \ $(INSTALLDIR)/modules/vfspk3.$(DLL) \ + +.PHONY: binaries-radiant-plugins +binaries-radiant-plugins: \ $(INSTALLDIR)/plugins/bobtoolz.$(DLL) \ $(INSTALLDIR)/plugins/brushexport.$(DLL) \ $(INSTALLDIR)/plugins/prtview.$(DLL) \ $(INSTALLDIR)/plugins/shaderplug.$(DLL) \ $(INSTALLDIR)/plugins/sunplug.$(DLL) \ $(INSTALLDIR)/plugins/ufoaiplug.$(DLL) \ + +.PHONY: binaries-radiant +binaries-radiant-core: \ + $(INSTALLDIR)/radiant.$(EXE) \ + +.PHONY: binaries-tools +binaries-tools: \ + binaries-tools-quake2 \ + binaries-tools-quake3 \ + +.PHONY: binaries-tools-quake2 +binaries-tools-quake2: \ + binaries-q2map \ + binaries-qdata3 \ + binaries-h2data \ + +.PHONY: binaries-q2map +binaries-q2map: \ $(INSTALLDIR)/q2map.$(EXE) \ + +.PHONY: binaries-qdata3 +binaries-qdata3: \ + $(INSTALLDIR)/qdata3.$(EXE) \ + +.PHONY: binaries-h2data +binaries-h2data: \ + $(INSTALLDIR)/heretic2/h2data.$(EXE) + +.PHONY: binaries-tools-quake3 +binaries-tools-quake3: \ + binaries-q3data \ + binaries-q3map2 \ + +.PHONY: binaries-q3data +binaries-q3data: \ $(INSTALLDIR)/q3data.$(EXE) \ + +.PHONY: binaries-q3map2 +binaries-q3map2: \ $(INSTALLDIR)/q3map2.$(EXE) \ - $(INSTALLDIR)/qdata3.$(EXE) \ - $(INSTALLDIR)/radiant.$(EXE) \ + .PHONY: clean clean: @@ -388,19 +450,20 @@ ifeq ($(OS),Win32) $(WINDRES) $< $@ endif -%.o: %.cpp $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) +%.o: %.cpp $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) | dependencies-check $(CXX) $< $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ -%.o: %.c $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) +%.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): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG) $(LIBS_ZLIB) -$(INSTALLDIR)/q3map2.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) -Itools/quake3/common -Ilibs -Iinclude +$(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): \ tools/quake3/common/cmdlib.o \ tools/quake3/common/imagelib.o \ tools/quake3/common/inout.o \ + tools/quake3/common/jpeg.o \ tools/quake3/common/md4.o \ tools/quake3/common/mutex.o \ tools/quake3/common/polylib.o \ @@ -415,6 +478,7 @@ $(INSTALLDIR)/q3map2.$(EXE): \ tools/quake3/q3map2/bspfile_rbsp.o \ tools/quake3/q3map2/bsp.o \ tools/quake3/q3map2/convert_ase.o \ + tools/quake3/q3map2/convert_obj.o \ tools/quake3/q3map2/convert_map.o \ tools/quake3/q3map2/decals.o \ tools/quake3/q3map2/facebsp.o \ @@ -446,7 +510,7 @@ $(INSTALLDIR)/q3map2.$(EXE): \ tools/quake3/q3map2/vis.o \ tools/quake3/q3map2/writebsp.o \ libddslib.$(A) \ - libjpeg6.$(A) \ + libfilematch.$(A) \ libl_net.$(A) \ libmathlib.$(A) \ libpicomodel.$(A) \ @@ -465,31 +529,6 @@ libl_net.$(A): \ libs/l_net/l_net.o \ $(if $(findstring $(OS),Win32),libs/l_net/l_net_wins.o,libs/l_net/l_net_berkley.o) \ -libjpeg6.$(A): CPPFLAGS_EXTRA := -Ilibs/jpeg6 -Ilibs -libjpeg6.$(A): \ - libs/jpeg6/jcomapi.o \ - libs/jpeg6/jdapimin.o \ - libs/jpeg6/jdapistd.o \ - libs/jpeg6/jdatasrc.o \ - libs/jpeg6/jdcoefct.o \ - libs/jpeg6/jdcolor.o \ - libs/jpeg6/jddctmgr.o \ - libs/jpeg6/jdhuff.o \ - libs/jpeg6/jdinput.o \ - libs/jpeg6/jdmainct.o \ - libs/jpeg6/jdmarker.o \ - libs/jpeg6/jdmaster.o \ - libs/jpeg6/jdpostct.o \ - libs/jpeg6/jdsample.o \ - libs/jpeg6/jdtrans.o \ - libs/jpeg6/jerror.o \ - libs/jpeg6/jfdctflt.o \ - libs/jpeg6/jidctflt.o \ - libs/jpeg6/jmemmgr.o \ - libs/jpeg6/jmemnobs.o \ - libs/jpeg6/jpgload.o \ - libs/jpeg6/jutils.o \ - libpicomodel.$(A): CPPFLAGS_EXTRA := -Ilibs libpicomodel.$(A): \ libs/picomodel/lwo/clip.o \ @@ -543,6 +582,7 @@ $(INSTALLDIR)/q3data.$(EXE): \ tools/quake3/q3data/q3data.o \ tools/quake3/q3data/stripper.o \ tools/quake3/q3data/video.o \ + libfilematch.$(A) \ libl_net.$(A) \ libmathlib.$(A) \ $(if $(findstring $(OS),Win32),icons/q3data.o,) \ @@ -640,6 +680,10 @@ $(INSTALLDIR)/radiant.$(EXE): \ libxmllib.$(A) \ $(if $(findstring $(OS),Win32),icons/radiant.o,) \ +libfilematch.$(A): CPPFLAGS_EXTRA := -Ilibs +libfilematch.$(A): \ + libs/filematch.o \ + libcmdlib.$(A): CPPFLAGS_EXTRA := -Ilibs libcmdlib.$(A): \ libs/cmdlib/cmdlib.o \ @@ -726,7 +770,8 @@ $(INSTALLDIR)/modules/entity.$(DLL): \ plugins/entity/skincache.o \ plugins/entity/targetable.o \ -$(INSTALLDIR)/modules/image.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude +$(INSTALLDIR)/modules/image.$(DLL): LIBS_EXTRA := $(LIBS_JPEG) +$(INSTALLDIR)/modules/image.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_JPEG) -Ilibs -Iinclude $(INSTALLDIR)/modules/image.$(DLL): \ plugins/image/bmp.o \ plugins/image/dds.o \ @@ -735,7 +780,6 @@ $(INSTALLDIR)/modules/image.$(DLL): \ plugins/image/pcx.o \ plugins/image/tga.o \ libddslib.$(A) \ - libjpeg6.$(A) \ $(INSTALLDIR)/modules/imageq2.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude $(INSTALLDIR)/modules/imageq2.$(DLL): \ @@ -796,6 +840,7 @@ $(INSTALLDIR)/modules/vfspk3.$(DLL): \ plugins/vfspk3/archive.o \ plugins/vfspk3/vfs.o \ plugins/vfspk3/vfspk3.o \ + libfilematch.$(A) \ $(INSTALLDIR)/plugins/bobtoolz.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) $(INSTALLDIR)/plugins/bobtoolz.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude @@ -975,7 +1020,7 @@ 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)" UNZIP="$(UNZIP)" ECHO="$(ECHO)" SH="$(SH)" CP="$(CP)" CP_R="$(CP_R)" $(SH) install-gamepacks.sh "$(INSTALLDIR)" + 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 $(CP_R) setup/data/tools/* $(INSTALLDIR)/ @@ -997,4 +1042,25 @@ install-dll: binaries endif endif +# release building... NOT for general users +# these may use tools not in the list that is checked by the build system +release-src: BUILD_DATE := $(shell date +%Y%m%d) +release-src: INSTALLDIR := netradiant-$(RADIANT_VERSION_NUMBER)-$(BUILD_DATE) +release-src: + $(GIT) archive --format=tar --prefix=$(INSTALLDIR)/ HEAD | bzip2 > ../$(INSTALLDIR).tar.bz2 + +release-win32: BUILD_DATE := $(shell date +%Y%m%d) +release-win32: INSTALLDIR := netradiant-$(RADIANT_VERSION_NUMBER)-$(BUILD_DATE) +release-win32: + $(MAKE) all INSTALLDIR=$(INSTALLDIR) MAKEFILE_CONF=cross-Makefile.conf RADIANT_ABOUTMSG="Official release build" BUILD=release + 7za a -sfx../../../../../../../../../../$(HOME)/7z.sfx ../$(INSTALLDIR)-win32-7z.exe $(INSTALLDIR)/ + chmod 644 ../$(INSTALLDIR)-win32-7z.exe # 7zip is evil + $(MAKE) clean INSTALLDIR=$(INSTALLDIR) MAKEFILE_CONF=cross-Makefile.conf RADIANT_ABOUTMSG="Official release build" BUILD=release + +release-all: + $(GIT) clean -xdf + $(MAKE) release-src + $(MAKE) release-win32 + +# load dependency files -include $(shell find . -name \*.d)