X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=8f7d036c4dfb2224c0d617d64495ac788ab427c9;hb=b25aa8735d6bfc07384c372cbc7c0ce18af316fd;hp=1c376fc89c7a819467d7246f7059203b125d017e;hpb=24856f26219a65e51ad7c9599f7f31117b78b710;p=xonotic%2Fnetradiant.git

diff --git a/Makefile b/Makefile
index 1c376fc8..8f7d036c 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
@@ -344,13 +344,13 @@ endif
 .PHONY: binaries
 binaries: \
 	binaries-tools \
-	binaries-radiant-all \
+	binaries-radiant \
 
 .PHONY: binaries-radiant-all
-binaries-radiant-all: \
+binaries-radiant: \
 	binaries-radiant-modules \
 	binaries-radiant-plugins \
-	binaries-radiant \
+	binaries-radiant-core \
 
 .PHONY: binaries-radiant-modules
 binaries-radiant-modules: \
@@ -379,7 +379,7 @@ binaries-radiant-plugins: \
 	$(INSTALLDIR)/plugins/ufoaiplug.$(DLL) \
 
 .PHONY: binaries-radiant
-binaries-radiant: \
+binaries-radiant-core: \
 	$(INSTALLDIR)/radiant.$(EXE) \
 
 .PHONY: binaries-tools
@@ -391,7 +391,7 @@ binaries-tools: \
 binaries-tools-quake2: \
 	binaries-q2map \
 	binaries-qdata3 \
-	binaries-heretic2 \
+	binaries-h2data \
 
 .PHONY: binaries-q2map
 binaries-q2map: \
@@ -401,8 +401,8 @@ binaries-q2map: \
 binaries-qdata3: \
 	$(INSTALLDIR)/qdata3.$(EXE) \
 
-.PHONY: binaries-heretic2
-binaries-heretic2: \
+.PHONY: binaries-h2data
+binaries-h2data: \
 	$(INSTALLDIR)/heretic2/h2data.$(EXE)
 
 .PHONY: binaries-tools-quake3
@@ -506,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) \
@@ -603,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,) \
@@ -700,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 \
@@ -856,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