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

fix the dependency checking

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@74 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
rpolzer 2008-09-17 06:13:34 +00:00
parent cf7024d5af
commit 224f26f10b
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -59,6 +59,7 @@ LIBS_DL ?= -ldl # nothing on Win32
CPPFLAGS_ZLIB ?= CPPFLAGS_ZLIB ?=
LIBS_ZLIB ?= -lz LIBS_ZLIB ?= -lz
DEPEND_ON_MAKEFILE ?= yes DEPEND_ON_MAKEFILE ?= yes
DEPENDENCIES_CHECK ?= quiet
# these are used on Win32 only # these are used on Win32 only
GTKDIR ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --variable=prefix $(STDERR_TO_DEVNULL)) GTKDIR ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --variable=prefix $(STDERR_TO_DEVNULL))
@ -159,6 +160,7 @@ dependencies-check:
$(AR) --help $(TO_DEVNULL); [ $$? != 127 ] $(AR) --help $(TO_DEVNULL); [ $$? != 127 ]
@$(ECHO) @$(ECHO)
@$(ECHO) checking that the dependencies exist @$(ECHO) checking that the dependencies exist
@if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \
checkheader() \ checkheader() \
{ \ { \
$(ECHO_NOLF) "Checking for $$1... "; \ $(ECHO_NOLF) "Checking for $$1... "; \
@ -171,17 +173,18 @@ dependencies-check:
else \ else \
$(RM) conftest conftest.o; \ $(RM) conftest conftest.o; \
$(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"; \
exit 1; \ exit 1; \
fi; \ fi; \
}; \ }; \
checkheader glib glib/gutils.h g_path_is_absolute "$(CPPFLAGS_GLIB)" "$(LIBS_GLIB)"; \ checkheader libglib2.0-dev glib/gutils.h g_path_is_absolute "$(CPPFLAGS_GLIB)" "$(LIBS_GLIB)"; \
checkheader libxml2 libxml/xpath.h xmlXPathInit "$(CPPFLAGS_XML)" "$(LIBS_XML)"; \ checkheader libxml2-dev libxml/xpath.h xmlXPathInit "$(CPPFLAGS_XML)" "$(LIBS_XML)"; \
checkheader libpng png.h png_create_struct "$(CPPFLAGS_PNG)" "$(LIBS_PNG)"; \ checkheader libpng12-dev png.h png_create_read_struct "$(CPPFLAGS_PNG)" "$(LIBS_PNG)"; \
checkheader libGL GL/gl.h glClear "$(CPPFLAGS_GL)" "$(LIBS_GL)"; \ checkheader "mesa-common-dev (or another OpenGL library)" GL/gl.h glClear "$(CPPFLAGS_GL)" "$(LIBS_GL)"; \
checkheader gtk2 gtk/gtkdialog.h gtk_dialog_run "$(CPPFLAGS_GTK)" "$(LIBS_GTK)"; \ checkheader libgtk2.0-dev gtk/gtkdialog.h gtk_dialog_run "$(CPPFLAGS_GTK)" "$(LIBS_GTK)"; \
checkheader gtkglext 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 libdl dlfcn.h dlopen "$(CPPFLAGS_DL)" "$(LIBS_DL)"; \ [ "$(OS)" != "Win32" ] && checkheader libc6-dev dlfcn.h dlopen "$(CPPFLAGS_DL)" "$(LIBS_DL)"; \
checkheader zlib libz.h deflateInit "$(CPPFLAGS_ZLIB)" "$(LIBS_ZLIB)"; \ checkheader zlib1g-dev zlib.h zlibVersion "$(CPPFLAGS_ZLIB)" "$(LIBS_ZLIB)"; \
$(ECHO) All required libraries have been found! $(ECHO) All required libraries have been found!
.PHONY: binaries .PHONY: binaries