X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=Makefile;h=5a9f292360d13c8b57b2a6effb8250a60133999e;hp=1d9f068f1f277860c693cf58656e8e102c0b4fb4;hb=870333585c699ba2915285311c284ef1b4a2f38e;hpb=3316aca1f4fc388fc2591065354f614277244940

diff --git a/Makefile b/Makefile
index 1d9f068f..5a9f2923 100644
--- a/Makefile
+++ b/Makefile
@@ -179,7 +179,7 @@ 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
+	LIBS_COMMON = -lws2_32 -luser32 -lgdi32 -lole32
 	EXE ?= exe
 	A = a
 	DLL = dll
@@ -343,7 +343,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) \
@@ -358,17 +368,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:
@@ -398,10 +447,10 @@ 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 dependencies-check $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) | dependencies-check
 	$(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@
 
 
@@ -425,6 +474,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 \
@@ -456,6 +506,7 @@ $(INSTALLDIR)/q3map2.$(EXE): \
 	tools/quake3/q3map2/vis.o \
 	tools/quake3/q3map2/writebsp.o \
 	libddslib.$(A) \
+	libfilematch.$(A) \
 	libjpeg6.$(A) \
 	libl_net.$(A) \
 	libmathlib.$(A) \
@@ -553,6 +604,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,) \
@@ -650,6 +702,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 \
@@ -806,6 +862,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
@@ -1019,6 +1076,7 @@ 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: