X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=Makefile;h=0a2d4b9711e82c0c466da40e1af62455567c7c5e;hp=a68f3c61410274c1ff28c2ca7aa39b63908f5946;hb=33dc22f8fcffcc18036c2f25bbe7048ba52824a8;hpb=24bca49fde9b8b930e6dff8fbc21c7ce78916c68 diff --git a/Makefile b/Makefile index a68f3c61..0a2d4b97 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ LIBS_GL ?= -lGL # -lopengl32 on Win32 CPPFLAGS_DL ?= LIBS_DL ?= -ldl # nothing on Win32 CPPFLAGS_ZLIB ?= -LIBS_ZLIB ?= -lz +LIBS_ZLIB ?= -lz -lminizip CPPFLAGS_JPEG ?= LIBS_JPEG ?= -ljpeg DEPEND_ON_MAKEFILE ?= yes @@ -113,7 +113,7 @@ CFLAGS_COMMON = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter -fn CPPFLAGS_COMMON = LDFLAGS_COMMON = LIBS_COMMON = -CXXFLAGS_COMMON = -Wno-non-virtual-dtor -Wreorder -fno-exceptions -fno-rtti +CXXFLAGS_COMMON = -std=c++11 -Wno-non-virtual-dtor -Wreorder -fno-exceptions -fno-rtti ifeq ($(BUILD),debug) ifeq ($(findstring $(CFLAGS),-g),) @@ -241,10 +241,11 @@ endif endif # VERSION! -RADIANT_VERSION_NUMBER = 1.5.0 +RADIANT_MAJOR_VERSION = 1 +RADIANT_MINOR_VERSION = 5 +RADIANT_PATCH_VERSION = 0 +RADIANT_VERSION_NUMBER = $(RADIANT_MAJOR_VERSION).$(RADIANT_MINOR_VERSION).$(RADIANT_PATCH_VERSION) RADIANT_VERSION = $(RADIANT_VERSION_NUMBER)n -RADIANT_MAJOR_VERSION = 5 -RADIANT_MINOR_VERSION = 0 Q3MAP_VERSION = 2.5.17n # Executable extension @@ -256,7 +257,8 @@ ifneq ($(GIT_VERSION),) Q3MAP_VERSION := $(Q3MAP_VERSION)-git-$(GIT_VERSION) endif -CPPFLAGS += -DRADIANT_VERSION="\"$(RADIANT_VERSION)\"" -DRADIANT_MAJOR_VERSION="\"$(RADIANT_MAJOR_VERSION)\"" -DRADIANT_MINOR_VERSION="\"$(RADIANT_MINOR_VERSION)\"" -DRADIANT_ABOUTMSG="\"$(RADIANT_ABOUTMSG)\"" -DQ3MAP_VERSION="\"$(Q3MAP_VERSION)\"" -DRADIANT_EXECUTABLE="\"$(RADIANT_EXECUTABLE)\"" +CPPFLAGS += -DRADIANT_VERSION="\"$(RADIANT_VERSION)\"" -DRADIANT_MAJOR_VERSION="\"$(RADIANT_MAJOR_VERSION)\"" -DRADIANT_MINOR_VERSION="\"$(RADIANT_MINOR_VERSION)\"" -DRADIANT_PATCH_VERSION="\"$(RADIANT_PATCH_VERSION)\"" -DRADIANT_ABOUTMSG="\"$(RADIANT_ABOUTMSG)\"" -DQ3MAP_VERSION="\"$(Q3MAP_VERSION)\"" -DRADIANT_EXECUTABLE="\"$(RADIANT_EXECUTABLE)\"" +CPPFLAGS += -DGTK_TARGET=2 .PHONY: all all: \ @@ -493,7 +495,6 @@ $(INSTALLDIR)/q3map2.$(EXE): \ tools/quake3/common/polylib.o \ tools/quake3/common/scriplib.o \ tools/quake3/common/threads.o \ - tools/quake3/common/unzip.o \ tools/quake3/common/vfs.o \ tools/quake3/q3map2/brush.o \ tools/quake3/q3map2/brush_primit.o \ @@ -501,12 +502,19 @@ $(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/exportents.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 \ @@ -516,6 +524,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 \ @@ -599,7 +608,6 @@ $(INSTALLDIR)/q3data.$(EXE): \ tools/quake3/common/md4.o \ tools/quake3/common/scriplib.o \ tools/quake3/common/trilib.o \ - tools/quake3/common/unzip.o \ tools/quake3/common/vfs.o \ tools/quake3/q3data/3dslib.o \ tools/quake3/q3data/compress.o \ @@ -690,6 +698,7 @@ $(INSTALLDIR)/radiant.$(EXE): \ radiant/stacktrace.o \ radiant/surfacedialog.o \ radiant/texmanip.o \ + radiant/textureentry.o \ radiant/textures.o \ radiant/texwindow.o \ radiant/timer.o \ @@ -704,6 +713,7 @@ $(INSTALLDIR)/radiant.$(EXE): \ radiant/xywindow.o \ libcmdlib.$(A) \ libgtkutil.$(A) \ + libuilib.$(A) \ libl_net.$(A) \ libmathlib.$(A) \ libprofile.$(A) \ @@ -728,8 +738,6 @@ libgtkutil.$(A): \ libs/gtkutil/accelerator.o \ libs/gtkutil/button.o \ libs/gtkutil/clipboard.o \ - libs/gtkutil/closure.o \ - libs/gtkutil/container.o \ libs/gtkutil/cursor.o \ libs/gtkutil/dialog.o \ libs/gtkutil/entry.o \ @@ -737,51 +745,42 @@ libgtkutil.$(A): \ libs/gtkutil/frame.o \ libs/gtkutil/glfont.o \ libs/gtkutil/glwidget.o \ - libs/gtkutil/idledraw.o \ libs/gtkutil/image.o \ libs/gtkutil/menu.o \ libs/gtkutil/messagebox.o \ libs/gtkutil/nonmodal.o \ libs/gtkutil/paned.o \ - libs/gtkutil/pointer.o \ libs/gtkutil/toolbar.o \ libs/gtkutil/widget.o \ libs/gtkutil/window.o \ libs/gtkutil/xorrectangle.o \ +libuilib.$(A): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) -Ilibs -Iinclude +libuilib.$(A): \ + libs/uilib/uilib.o \ + libxmllib.$(A): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) -Ilibs -Iinclude libxmllib.$(A): \ - libs/xml/ixml.o \ - libs/xml/xmlelement.o \ - libs/xml/xmlparser.o \ libs/xml/xmltextags.o \ - libs/xml/xmlwriter.o \ $(INSTALLDIR)/modules/archivezip.$(DLL): LIBS_EXTRA := $(LIBS_ZLIB) $(INSTALLDIR)/modules/archivezip.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_ZLIB) -Ilibs -Iinclude $(INSTALLDIR)/modules/archivezip.$(DLL): \ plugins/archivezip/archive.o \ - plugins/archivezip/pkzip.o \ plugins/archivezip/plugin.o \ - plugins/archivezip/zlibstream.o \ $(INSTALLDIR)/modules/archivewad.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude $(INSTALLDIR)/modules/archivewad.$(DLL): \ plugins/archivewad/archive.o \ plugins/archivewad/plugin.o \ - plugins/archivewad/wad.o \ $(INSTALLDIR)/modules/archivepak.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude $(INSTALLDIR)/modules/archivepak.$(DLL): \ plugins/archivepak/archive.o \ - plugins/archivepak/pak.o \ plugins/archivepak/plugin.o \ -$(INSTALLDIR)/modules/entity.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude +$(INSTALLDIR)/modules/entity.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) -Ilibs -Iinclude $(INSTALLDIR)/modules/entity.$(DLL): \ - plugins/entity/angle.o \ - plugins/entity/angles.o \ - plugins/entity/colour.o \ plugins/entity/doom3group.o \ plugins/entity/eclassmodel.o \ plugins/entity/entity.o \ @@ -790,13 +789,7 @@ $(INSTALLDIR)/modules/entity.$(DLL): \ plugins/entity/group.o \ plugins/entity/light.o \ plugins/entity/miscmodel.o \ - plugins/entity/model.o \ - plugins/entity/modelskinkey.o \ - plugins/entity/namedentity.o \ - plugins/entity/origin.o \ plugins/entity/plugin.o \ - plugins/entity/rotation.o \ - plugins/entity/scale.o \ plugins/entity/skincache.o \ plugins/entity/targetable.o \ @@ -831,7 +824,7 @@ $(INSTALLDIR)/modules/imagepng.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_PNG) -Ilibs $(INSTALLDIR)/modules/imagepng.$(DLL): \ plugins/imagepng/plugin.o \ -$(INSTALLDIR)/modules/mapq3.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude +$(INSTALLDIR)/modules/mapq3.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) -Ilibs -Iinclude $(INSTALLDIR)/modules/mapq3.$(DLL): \ plugins/mapq3/parse.o \ plugins/mapq3/plugin.o \ @@ -1052,8 +1045,9 @@ install-data: binaries $(MKDIR) $(INSTALLDIR)/games $(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune 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 + $(ECHO) $(RADIANT_MINOR_VERSION) > $(INSTALLDIR)/RADIANT_MINOR + $(ECHO) $(RADIANT_PATCH_VERSION) > $(INSTALLDIR)/RADIANT_PATCH $(CP_R) setup/data/tools/* $(INSTALLDIR)/ $(MKDIR) $(INSTALLDIR)/docs $(CP_R) docs/* $(INSTALLDIR)/docs/