remove a LOT of unused symbols from qgl.cpp

[xonotic/netradiant.git] / Makefile

diff --git a/Makefile b/Makefile
index 564a3c97f89d2050189fb9fbc5a2dd3a2e84da60..6319795c66c0fd59d24c1cd510a6c9b2e7c24197 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ GIT                ?= git
 SVN                ?= svn
 WGET               ?= wget
 MV                 ?= mv
-UNZIP              ?= unzip
+UNZIPPER           ?= unzip
 
 FD_TO_DEVNULL      ?= >/dev/null
 STDOUT_TO_DEVNULL  ?= 1$(FD_TO_DEVNULL)
@@ -289,7 +289,7 @@ dependencies-check:
        checkbinary binutils "$(RANLIB)"; \
        checkbinary binutils "$(AR)"; \
        checkbinary pkg-config "$(PKGCONFIG)"; \
-       checkbinary unzip "$(UNZIP)"; \
+       checkbinary unzip "$(UNZIPPER)"; \
        checkbinary git-core "$(GIT)"; \
        checkbinary subversion "$(SVN)"; \
        checkbinary wget "$(WGET)"; \
@@ -304,11 +304,20 @@ 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 >&3 $(STDERR_TO_STDOUT) && \
-                       $(CXX) conftest.o $(LDFLAGS) $(LDFLAGS_COMMON) $$5 $(LIBS_COMMON) $(LIBS) -o conftest >&3 $(STDERR_TO_STDOUT); \
+                       $(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 >&3 $(STDERR_TO_STDOUT); \
                then \
-                       $(RM) conftest conftest.o conftest.d; \
-                       $(ECHO) "found."; \
+                       if \
+                               $(CXX) conftest.o $(LDFLAGS) $(LDFLAGS_COMMON) $$5 $(LIBS_COMMON) $(LIBS) -o conftest >&3 $(STDERR_TO_STDOUT); \
+                       then \
+                               $(RM) conftest conftest.o conftest.d; \
+                               $(ECHO) "found and links."; \
+                       else \
+                               $(RM) conftest.o conftest.d; \
+                               $(ECHO) "found but does not link, please install it or set PKG_CONFIG_PATH right!"; \
+                               $(ECHO) "To see the failed commands, set DEPENDENCIES_CHECK=verbose"; \
+                               $(ECHO) "To proceed anyway, set DEPENDENCIES_CHECK=off"; \
+                               failed=1; \
+                       fi; \
                else \
                        $(RM) conftest conftest.o conftest.d; \
                        $(ECHO) "not found, please install it or set PKG_CONFIG_PATH right!"; \
@@ -975,7 +984,7 @@ install-data: binaries
        $(MKDIR) $(INSTALLDIR)/games
        $(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune
        [ "$(OS)" != "Darwin" ] || $(CP_R) setup/data/osx/NetRadiant.app/* $(INSTALLDIR_BASE)/NetRadiant.app/
-       DOWNLOAD_GAMEPACKS="$(DOWNLOAD_GAMEPACKS)" GIT="$(GIT)" SVN="$(SVN)" WGET="$(WGET)" RM_R="$(RM_R)" MV="$(MV)" UNZIP="$(UNZIP)" ECHO="$(ECHO)" SH="$(SH)" CP="$(CP)" CP_R="$(CP_R)" $(SH) install-gamepacks.sh "$(INSTALLDIR)"
+       DOWNLOAD_GAMEPACKS="$(DOWNLOAD_GAMEPACKS)" GIT="$(GIT)" SVN="$(SVN)" WGET="$(WGET)" RM_R="$(RM_R)" MV="$(MV)" UNZIPPER="$(UNZIPPER)" ECHO="$(ECHO)" SH="$(SH)" CP="$(CP)" CP_R="$(CP_R)" $(SH) install-gamepacks.sh "$(INSTALLDIR)"
        $(ECHO) $(RADIANT_MINOR_VERSION) > $(INSTALLDIR)/RADIANT_MINOR
        $(ECHO) $(RADIANT_MAJOR_VERSION) > $(INSTALLDIR)/RADIANT_MAJOR
        $(CP_R) setup/data/tools/* $(INSTALLDIR)/