another experimental change: better handle leaky maps

[xonotic/netradiant.git] / Makefile

diff --git a/Makefile b/Makefile
index 1c376fc89c7a819467d7246f7059203b125d017e..35ca7188dff661e81adb96b26c92f2142425ee96 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -178,8 +178,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 +197,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 =
@@ -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
@@ -447,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 $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) | dependencies-check
        $(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@
 
 
@@ -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