[quake3-commits] [ioquake/ioq3] 1fe4e0: Add USE_INTERNAL_LIBS, a default for USE_INTERNAL_...

[Zack Middleton]

  Branch: refs/heads/master
  Home:   https://github.com/ioquake/ioq3
  Commit: 1fe4e0c239423644f1562d4aadc374495dce81c9
      https://github.com/ioquake/ioq3/commit/1fe4e0c239423644f1562d4aadc374495dce81c9
  Author: Simon McVittie <smcv at debian.org>
  Date:   2013-05-19 (Sun, 19 May 2013)

  Changed paths:
    M Makefile
    M README

  Log Message:
  -----------
  Add USE_INTERNAL_LIBS, a default for USE_INTERNAL_*

Linux distributions that want to link dependencies externally will
generally want to link (almost) every dependency externally; similarly,
minimal-dependency builds that want to use the embedded copies of
dependencies will generally want to do so for (almost) every dependency.
Make it easier to choose one of those by setting USE_INTERNAL_LIBS=0
or USE_INTERNAL_LIBS=1, respectively.

The default can still be overridden per-dependency; for instance,
"make USE_INTERNAL_LIBS=0 USE_INTERNAL_OPUS=1" will use the system
version of everything except Opus.


  Commit: 608347c84d94052311992ed6eca8163f19043c7a
      https://github.com/ioquake/ioq3/commit/608347c84d94052311992ed6eca8163f19043c7a
  Author: Simon McVittie <smcv at debian.org>
  Date:   2013-05-19 (Sun, 19 May 2013)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Centralize checks for Freetype, with a user override

This lets us find a library in a non-standard library directory
(via -L in the pkg-config metadata), and allows overrides similar to
the Autoconf convention, e.g.

    make FREETYPE_CFLAGS=-I/opt/freetype/include \
  FREETYPE_LIBS="-L/opt/freetype/lib -lfreetype"

If pkg-config didn't work, assume that Freetype is in the default
location.


  Commit: b1da3556444ae4413e4c078b6226c25f0a6afe7d
      https://github.com/ioquake/ioq3/commit/b1da3556444ae4413e4c078b6226c25f0a6afe7d
  Author: Simon McVittie <smcv at debian.org>
  Date:   2013-05-19 (Sun, 19 May 2013)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Allow libcurl to be in a non-standard location on all platforms

We didn't add CURL_CFLAGS to CLIENT_CFLAGS on all platforms, and didn't
use CURL_LIBS at all, so if "pkg-config --libs" returned "-L... -lcurl"
or even "/.../libcurl.a", it wouldn't work.


  Commit: 2821aa41d781a7ff15b425ef5cc96b523a796d68
      https://github.com/ioquake/ioq3/commit/2821aa41d781a7ff15b425ef5cc96b523a796d68
  Author: Simon McVittie <smcv at debian.org>
  Date:   2013-05-19 (Sun, 19 May 2013)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Allow OpenAL to be in a non-standard location on all platforms

Similar to libcurl, we didn't use OPENAL_LIBS and assumed it was
always "-lopenal".


  Commit: 9ff2fc3324503a95f1220521b8d063fca15a5db3
      https://github.com/ioquake/ioq3/commit/9ff2fc3324503a95f1220521b8d063fca15a5db3
  Author: Simon McVittie <smcv at debian.org>
  Date:   2013-05-19 (Sun, 19 May 2013)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Allow system libjpeg to be in a non-standard location

It doesn't have pkg-config metadata (at least on Debian), so if the
user doesn't override it, assume normal system paths.


  Commit: c817ab5ae0601a9bbdce6c36f7cdccff9fe7474b
      https://github.com/ioquake/ioq3/commit/c817ab5ae0601a9bbdce6c36f7cdccff9fe7474b
  Author: Simon McVittie <smcv at debian.org>
  Date:   2013-05-19 (Sun, 19 May 2013)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Find system zlib via user override, pkg-config or in standard locations


  Commit: cff1fcd658fe1805791ed9658d2822ab356fffeb
      https://github.com/ioquake/ioq3/commit/cff1fcd658fe1805791ed9658d2822ab356fffeb
  Author: Simon McVittie <smcv at debian.org>
  Date:   2013-05-19 (Sun, 19 May 2013)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Look for system Vorbis, Opus and Ogg via pkg-config

As usual, the order of precedence is: user override, pkg-config,
or assume they're in standard locations.

In particular, Opus isn't in the default search path on Debian.


  Commit: 69999280c6645998a497dd80c87e9c3c0f0f83a4
      https://github.com/ioquake/ioq3/commit/69999280c6645998a497dd80c87e9c3c0f0f83a4
  Author: Simon McVittie <smcv at debian.org>
  Date:   2013-05-19 (Sun, 19 May 2013)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Find Speex via user override, pkg-config or default search path


  Commit: efa9555d741ebd110c464be9b6cf03812522d7ff
      https://github.com/ioquake/ioq3/commit/efa9555d741ebd110c464be9b6cf03812522d7ff
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-07-20 (Sun, 20 Jul 2014)

  Changed paths:
    M Makefile
    M README.md

  Log Message:
  -----------
  Merge branch 'pkg-config' of github.com:smcv/ioq3 into master

Conflicts:
	Makefile


  Commit: b02b54883b49faa6b5c12f9743b8c4d6ed44e909
      https://github.com/ioquake/ioq3/commit/b02b54883b49faa6b5c12f9743b8c4d6ed44e909
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-07-20 (Sun, 20 Jul 2014)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Fix up vorbis handling in Makefile


Compare: https://github.com/ioquake/ioq3/compare/16b48b50dd9b...b02b54883b49