more depcheck fixes
git-svn-id: svn://svn.icculus.org/netradiant/trunk@78 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
parent
f79a93f095
commit
911a5e0fdd
3
Makefile
3
Makefile
|
|
@ -7,6 +7,7 @@ BUILD ?= debug
|
||||||
# or: release
|
# or: release
|
||||||
OS ?= $(shell uname)
|
OS ?= $(shell uname)
|
||||||
# or: Linux, Win32, Darwin
|
# or: Linux, Win32, Darwin
|
||||||
|
LDFLAGS ?=
|
||||||
CFLAGS ?=
|
CFLAGS ?=
|
||||||
CXXFLAGS ?=
|
CXXFLAGS ?=
|
||||||
CPPFLAGS ?=
|
CPPFLAGS ?=
|
||||||
|
|
@ -187,7 +188,7 @@ dependencies-check:
|
||||||
$(ECHO_NOLF) "Checking for $$2 ($$1)... "; \
|
$(ECHO_NOLF) "Checking for $$2 ($$1)... "; \
|
||||||
if \
|
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.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 \
|
then \
|
||||||
$(RM) conftest conftest.o conftest.d; \
|
$(RM) conftest conftest.o conftest.d; \
|
||||||
$(ECHO) "found."; \
|
$(ECHO) "found."; \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user