X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=35ca7188dff661e81adb96b26c92f2142425ee96;hb=95e8ef16a2e789d9727c69395033c0275466cd7c;hp=1f8b26a9baddb4bb41e9032fc60137a76200bbc6;hpb=ff1b9a5bfa52164ee2229c7b8d936c5931fd3ab1;p=xonotic%2Fnetradiant.git

diff --git a/Makefile b/Makefile
index 1f8b26a9..35ca7188 100644
--- a/Makefile
+++ b/Makefile
@@ -178,7 +178,7 @@ else
 ifeq ($(OS),Win32)
 	CPPFLAGS_COMMON += -DWIN32 -D_WIN32 -D_inline=inline
 	CFLAGS_COMMON += -mms-bitfields
-	LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias
+	LDFLAGS_DLL = -Wl,--add-stdcall-alias
 	LIBS_COMMON = -lws2_32 -luser32 -lgdi32 -lole32
 	EXE ?= exe
 	A = a
@@ -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 =
@@ -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 $@
 
 
@@ -695,7 +695,6 @@ $(INSTALLDIR)/radiant.$(EXE): \
 	radiant/xmlstuff.o \
 	radiant/xywindow.o \
 	libcmdlib.$(A) \
-	libfilematch.$(A) \
 	libgtkutil.$(A) \
 	libl_net.$(A) \
 	libmathlib.$(A) \
@@ -863,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