]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
more depcheck fixes
authorrpolzer <rpolzer@61c419a2-8eb2-4b30-bcec-8cead039b335>
Wed, 17 Sep 2008 07:34:12 +0000 (07:34 +0000)
committerrpolzer <rpolzer@61c419a2-8eb2-4b30-bcec-8cead039b335>
Wed, 17 Sep 2008 07:34:12 +0000 (07:34 +0000)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@78 61c419a2-8eb2-4b30-bcec-8cead039b335

Makefile

index def04346bc9c3dfdf5a240f56c86f008cf5f419c..a9f34f0b9b7645708889b55265b2834bf7a228ef 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ BUILD              ?= debug
 # or: release
 OS                 ?= $(shell uname)
 # or: Linux, Win32, Darwin
+LDFLAGS            ?=
 CFLAGS             ?=
 CXXFLAGS           ?=
 CPPFLAGS           ?=
@@ -187,7 +188,7 @@ dependencies-check:
                $(ECHO_NOLF) "Checking for $$2 ($$1)... "; \
                if \
                        $(CXX) conftest.cpp $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $$4 -DCONFTEST_HEADER="<$$2>" -DCONFTEST_SYMBOL="$$3" $(TARGET_ARCH) $(LDFLAGS) -c -o conftest.o $(TO_DEVNULL) && \
-                       $(CXX) conftest.o $(LDFLAGS_COMMON) $$5 $(LIBS_COMMON) $(LIBS) -o conftest $(TO_DEVNULL); \
+                       $(CXX) conftest.o $(LDFLAGS) $(LDFLAGS_COMMON) $$5 $(LIBS_COMMON) $(LIBS) -o conftest $(TO_DEVNULL); \
                then \
                        $(RM) conftest conftest.o conftest.d; \
                        $(ECHO) "found."; \