quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better dependency check

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@354 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-04-28 13:08:15 +00:00
parent 3844ff04ac
commit d0244e3b2e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -238,6 +238,7 @@ else
dependencies-check: dependencies-check:
@$(ECHO) @$(ECHO)
@if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \ @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \
failed=0; \
checkbinary() \ checkbinary() \
{ \ { \
$(ECHO_NOLF) "Checking for $$2 ($$1)... "; \ $(ECHO_NOLF) "Checking for $$2 ($$1)... "; \
@ -248,7 +249,7 @@ dependencies-check:
$(ECHO) "not found, please install it or set PATH right!"; \ $(ECHO) "not found, please install it or set PATH right!"; \
$(ECHO) "To see the failed commands, set DEPENDENCIES_CHECK=verbose"; \ $(ECHO) "To see the failed commands, set DEPENDENCIES_CHECK=verbose"; \
$(ECHO) "To proceed anyway, set DEPENDENCIES_CHECK=off"; \ $(ECHO) "To proceed anyway, set DEPENDENCIES_CHECK=off"; \
exit 1; \ failed=1; \
fi; \ fi; \
}; \ }; \
$(ECHO) checking that the build tools exist; \ $(ECHO) checking that the build tools exist; \
@ -273,9 +274,10 @@ dependencies-check:
[ "$(OS)" = "Win32" ] && checkbinary mingw32 "$(WINDRES)"; \ [ "$(OS)" = "Win32" ] && checkbinary mingw32 "$(WINDRES)"; \
[ -n "$(LDD)" ] && checkbinary libc6 "$(LDD)"; \ [ -n "$(LDD)" ] && checkbinary libc6 "$(LDD)"; \
[ -n "$(OTOOL)" ] && checkbinary xcode "$(OTOOL)"; \ [ -n "$(OTOOL)" ] && checkbinary xcode "$(OTOOL)"; \
$(ECHO) All required tools have been found! [ "$$failed" = "0" ] && $(ECHO) All required tools have been found!
@$(ECHO) @$(ECHO)
@if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \ @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \
failed=0; \
checkheader() \ checkheader() \
{ \ { \
$(ECHO_NOLF) "Checking for $$2 ($$1)... "; \ $(ECHO_NOLF) "Checking for $$2 ($$1)... "; \
@ -290,7 +292,7 @@ dependencies-check:
$(ECHO) "not found, please install it or set PKG_CONFIG_PATH right!"; \ $(ECHO) "not found, please install it or set PKG_CONFIG_PATH right!"; \
$(ECHO) "To see the failed commands, set DEPENDENCIES_CHECK=verbose"; \ $(ECHO) "To see the failed commands, set DEPENDENCIES_CHECK=verbose"; \
$(ECHO) "To proceed anyway, set DEPENDENCIES_CHECK=off"; \ $(ECHO) "To proceed anyway, set DEPENDENCIES_CHECK=off"; \
exit 1; \ failed=1; \
fi; \ fi; \
}; \ }; \
$(ECHO) checking that the dependencies exist; \ $(ECHO) checking that the dependencies exist; \
@ -302,7 +304,7 @@ dependencies-check:
checkheader libgtkglext1-dev gtk/gtkglwidget.h gtk_widget_get_gl_context "$(CPPFLAGS_GTKGLEXT)" "$(LIBS_GTKGLEXT)"; \ checkheader libgtkglext1-dev gtk/gtkglwidget.h gtk_widget_get_gl_context "$(CPPFLAGS_GTKGLEXT)" "$(LIBS_GTKGLEXT)"; \
[ "$(OS)" != "Win32" ] && checkheader libc6-dev dlfcn.h dlopen "$(CPPFLAGS_DL)" "$(LIBS_DL)"; \ [ "$(OS)" != "Win32" ] && checkheader libc6-dev dlfcn.h dlopen "$(CPPFLAGS_DL)" "$(LIBS_DL)"; \
checkheader zlib1g-dev zlib.h zlibVersion "$(CPPFLAGS_ZLIB)" "$(LIBS_ZLIB)"; \ checkheader zlib1g-dev zlib.h zlibVersion "$(CPPFLAGS_ZLIB)" "$(LIBS_ZLIB)"; \
$(ECHO) All required libraries have been found! [ "$$failed" = "0" ] && $(ECHO) All required libraries have been found!
@$(ECHO) @$(ECHO)
endif endif