From: divverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Date: Wed, 14 Jan 2009 12:33:52 +0000 (+0000)
Subject: reverse order of includes to fix jpeg problems on OS X
X-Git-Tag: svn-r421~247
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7421140b5f91cbe9e3f1338e3ba97a1cfa4e6793;p=xonotic%2Fnetradiant.git

reverse order of includes to fix jpeg problems on OS X


git-svn-id: svn://svn.icculus.org/netradiant/trunk@173 61c419a2-8eb2-4b30-bcec-8cead039b335
---

diff --git a/Makefile b/Makefile
index 8ce76bab..b93f3eb5 100644
--- a/Makefile
+++ b/Makefile
@@ -351,10 +351,10 @@ ifeq ($(OS),Win32)
 endif
 
 %.o: %.cpp $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),)
-	$(CXX) $< $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(TARGET_ARCH) -c -o $@
+	$(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*),)
-	$(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(TARGET_ARCH) -c -o $@
+	$(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@
 
 $(INSTALLDIR)/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG)
 $(INSTALLDIR)/q3map2.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) -Itools/quake3/common -Ilibs -Iinclude