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

Tue Aug 26 08:41:00 EDT 2014

  Branch: refs/heads/sdl2
  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: 95b241b8ba3d7eacf5e8a9dfbab45aab907b4b6c
      https://github.com/ioquake/ioq3/commit/95b241b8ba3d7eacf5e8a9dfbab45aab907b4b6c
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M code/renderergl2/tr_world.c

  Log Message:
  -----------
  OpenGL2 don't try to dlight surfaces that had all dlights culled

In the renderers, dlightbits are never cleared from world surfaces.
The dlight image does not repeat, so if it draws on extra surfaces it's
not visible.

However if using a repeating image (tr.defaultImage instead of tr.dlightImage);

  * In OpenGL1 image is only drawn on surfaces close to dlight origin.
  * In OpenGL2 image is draw on surfaces clearly outside the dlight radius, including past non-dlighted surfaces.

It seems there was a similar issue with pshadowBits. So update surface
dlightBits even if 0, like already done for pshadowBits. This causes
only surfaces close to origin to be affected. (Though it is a little
farther than in OpenGL1.)

I have no idea why this isn't a problem in OpenGL1.

  Commit: 5c1091b41453594735d23096b5ddc727ad963602
      https://github.com/ioquake/ioq3/commit/5c1091b41453594735d23096b5ddc727ad963602
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M code/qcommon/q_shared.c

  Log Message:
  -----------
  Fix SkipRestOfLine going past end of string

If string data starts with a 0 (string terminator), don't skip over it at p++.

Not causing any problems in ioq3 as far as I know.

  Commit: 599456453786acd021e4e702ff0075116536eb79
      https://github.com/ioquake/ioq3/commit/599456453786acd021e4e702ff0075116536eb79
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M code/sdl/sdl_input.c

  Log Message:
  -----------
  Remove unused array joy_pressed

  Commit: 1d664a3a10d6edbf97ee9f6d9f45f48e1d22b112
      https://github.com/ioquake/ioq3/commit/1d664a3a10d6edbf97ee9f6d9f45f48e1d22b112
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M code/sdl/sdl_input.c

  Log Message:
  -----------
  Remove unused cvar in_joystickDebug

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

  Changed paths:
    M code/q3_ui/ui_mfield.c

  Log Message:
  -----------
  Fix overstrike/insert logic being reversed in q3_ui

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

  Changed paths:
    M code/client/cl_console.c

  Log Message:
  -----------
  Don't draw client console buffer past top of screen

Thanks @Pan7.

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

  Changed paths:
    M code/client/cl_console.c

  Log Message:
  -----------
  Restore drawing a cut off client console line in 1920x1080

The text lines don't meet at top of the sceen in 1920x1080, restore
drawing a cut off line across the top. In 640x480 this line isn't seen
at all. This is still better then trying to draw twice as many lines
than are actually seen (the way it was before the last commit).

  Commit: 7afb433e2045a65e139e48a3744027543552fd1a
      https://github.com/ioquake/ioq3/commit/7afb433e2045a65e139e48a3744027543552fd1a
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-07-15 (Tue, 15 Jul 2014)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Fix fast-math optimize flag for MinGW x86_64 build

Found by /dev/humancontroller.

  Commit: 16b48b50dd9be097a88757f955afd702322a1dfc
      https://github.com/ioquake/ioq3/commit/16b48b50dd9be097a88757f955afd702322a1dfc
  Author: Pan7 <panter at gmx.net>
  Date:   2014-07-20 (Sun, 20 Jul 2014)

  Changed paths:
    M misc/msvc/opengl1.vcproj
    M misc/msvc/opengl2.vcproj
    M misc/msvc/quake3.vcproj
    M misc/msvc10/quake3.vcxproj
    M misc/msvc11/quake3.vcxproj

  Log Message:
  -----------
  -ffast-math for msvc

  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

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

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Allow overriding external opus libs/cflags in Makefile

Pointed out by @MAN-AT-ARMS.

  Commit: a8dcf60b761f3c08991f42d473e17c7708a5e6fa
      https://github.com/ioquake/ioq3/commit/a8dcf60b761f3c08991f42d473e17c7708a5e6fa
  Author: MAN-AT-ARMS <donny at ecgnetwork.com>
  Date:   2014-07-20 (Sun, 20 Jul 2014)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Fix compiling on Linux Mint

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

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Allow user override of cURL, OpenAL, and SDL libs/cflags

  Commit: 3d01543e2c48cdaa5b5d7f5a1c2c96ef07c13a69
      https://github.com/ioquake/ioq3/commit/3d01543e2c48cdaa5b5d7f5a1c2c96ef07c13a69
  Author: SmileTheory <SmileTheory at gmail.com>
  Date:   2014-07-22 (Tue, 22 Jul 2014)

  Changed paths:
    M code/renderergl2/tr_extramath.h
    M code/renderergl2/tr_image.c

  Log Message:
  -----------
  OpenGL2: Replace R_MipMapsRGB() with faster version.

  Commit: 75cce50a9ca5a606f271ef18bd27f27ac46dfd0f
      https://github.com/ioquake/ioq3/commit/75cce50a9ca5a606f271ef18bd27f27ac46dfd0f
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-07-25 (Fri, 25 Jul 2014)

  Changed paths:
    M code/renderergl2/tr_glsl.c
    M code/renderergl2/tr_init.c
    M code/renderergl2/tr_local.h

  Log Message:
  -----------
  Don't load external GLSL files by default

External GLSL should probably only be used for development testing,
not released products. The GLSL files are tied to the code, and the
code changes some what often.

Fixes using OpenArena 0.8.8 which has incompatible GLSL files in a pk3.

  Commit: 3c52f2dccc68aab3e0446cf531f844c9bd711fe6
      https://github.com/ioquake/ioq3/commit/3c52f2dccc68aab3e0446cf531f844c9bd711fe6
  Author: hairball <xhairball at gmail.com>
  Date:   2014-07-26 (Sat, 26 Jul 2014)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Don't use -mwindows with Clang on Windows

Thanks to stigmha for pointing out this doesn't work in Windows.

  Commit: 7b866ae96d97d876f5b5ca134c6533d10565782e
      https://github.com/ioquake/ioq3/commit/7b866ae96d97d876f5b5ca134c6533d10565782e
  Author: /dev/humancontroller <devhc at example.com>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

  Changed paths:
    M code/qcommon/vm_x86.c

  Log Message:
  -----------
  guard against out-of-bounds jump table targets

  Commit: 2b2d696f1243b8810ab5ef26b84118a6c2389c70
      https://github.com/ioquake/ioq3/commit/2b2d696f1243b8810ab5ef26b84118a6c2389c70
  Author: SmileTheory <SmileTheory at gmail.com>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

  Changed paths:
    M code/renderergl2/glsl/shadowmask_fp.glsl
    M code/renderergl2/tr_backend.c
    M code/renderergl2/tr_bsp.c
    M code/renderergl2/tr_fbo.c
    M code/renderergl2/tr_glsl.c
    M code/renderergl2/tr_image.c
    M code/renderergl2/tr_init.c
    M code/renderergl2/tr_local.h
    M code/renderergl2/tr_main.c
    M code/renderergl2/tr_scene.c

  Log Message:
  -----------
  OpenGL2: Add fourth cascade for sun shadows, and adjust sun shadow cvar defaults.

  Commit: ff1f093a0bab87bc08f4bc2a8fef6a5a8878f861
      https://github.com/ioquake/ioq3/commit/ff1f093a0bab87bc08f4bc2a8fef6a5a8878f861
  Author: SmileTheory <SmileTheory at gmail.com>
  Date:   2014-08-01 (Fri, 01 Aug 2014)

  Changed paths:
    M code/renderergl2/tr_image.c

  Log Message:
  -----------
  OpenGL2: Remove R_MipMap() and R_MipMap2(), and fix gamma conversion in R_MipMapsRGB()

  Commit: ca9eebb125458b65a0cc705bfd9d26ac683c3bab
      https://github.com/ioquake/ioq3/commit/ca9eebb125458b65a0cc705bfd9d26ac683c3bab
  Author: SmileTheory <SmileTheory at gmail.com>
  Date:   2014-08-02 (Sat, 02 Aug 2014)

  Changed paths:
    M code/renderergl2/glsl/shadowmask_fp.glsl

  Log Message:
  -----------
  OpenGL2: Fix a glsl compile error on old hardware with r_shadowFilter 0.

  Commit: 7d026177ad6e572fe43bd70cebf7b529c739a5e7
      https://github.com/ioquake/ioq3/commit/7d026177ad6e572fe43bd70cebf7b529c739a5e7
  Author: Tim Angus <tim.angus at roslin.ed.ac.uk>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M code/botlib/be_aas_reach.c
    M code/botlib/be_aas_route.c
    M code/opus-1.1/silk/float/solve_LS_FLP.c
    M code/opusfile-0.5/src/opusfile.c
    M code/renderercommon/qgl.h
    M code/renderergl2/tr_extensions.c
    M code/renderergl2/tr_image.c

  Log Message:
  -----------
  Fix assorted warnings

  Commit: 2a3368481d67685fd05494ba5da2cc2078ca4c01
      https://github.com/ioquake/ioq3/commit/2a3368481d67685fd05494ba5da2cc2078ca4c01
  Author: Tim Angus <tim.angus at roslin.ed.ac.uk>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M Makefile
    M README.md
    M code/client/cl_console.c
    M code/q3_ui/ui_mfield.c
    M code/qcommon/q_shared.c
    M code/qcommon/vm_x86.c
    M code/renderergl2/glsl/shadowmask_fp.glsl
    M code/renderergl2/tr_backend.c
    M code/renderergl2/tr_bsp.c
    M code/renderergl2/tr_extramath.h
    M code/renderergl2/tr_fbo.c
    M code/renderergl2/tr_glsl.c
    M code/renderergl2/tr_image.c
    M code/renderergl2/tr_init.c
    M code/renderergl2/tr_local.h
    M code/renderergl2/tr_main.c
    M code/renderergl2/tr_scene.c
    M code/renderergl2/tr_world.c
    M code/sdl/sdl_input.c
    M misc/msvc/opengl1.vcproj
    M misc/msvc/opengl2.vcproj
    M misc/msvc/quake3.vcproj
    M misc/msvc10/quake3.vcxproj
    M misc/msvc11/quake3.vcxproj

  Log Message:
  -----------
  Merge branch 'master' into sdl2

Conflicts:
	Makefile
	code/renderergl2/tr_image.c

Compare: https://github.com/ioquake/ioq3/compare/107cae63d624...2a3368481d67