X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=Makefile;h=35ca7188dff661e81adb96b26c92f2142425ee96;hp=0fc502edbd54e455e68a434b0fce57e88e76dace;hb=11fdc6f6d0acfeb9ace93beef75fc2f123221a01;hpb=8ecf001ea472d7eca1912b6c6bc02508f4c24fd1

diff --git a/Makefile b/Makefile
index 0fc502ed..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 = -mdll -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 =
@@ -450,7 +450,7 @@ endif
 %.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 dependencies-check $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) | dependencies-check
+%.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 $@