Merge branch 'master' into codec/mp3

Conflicts:
	Makefile

.gitignore

@@ -2,6 +2,7 @@ build
 Makefile.local
 *.swp
 *tags
+*~
 
 # OS X
 ####################
@@ -35,4 +36,6 @@ profile
 
 # Microsoft Visual Studio
 ####################
-*.sdf
+*.sdf
+*.opensdf
+*.suo

.travis.yml

@@ -1,37 +1,48 @@
+# sudo is required for travis-ci to use ubuntu trusty
+# ubuntu trusty is required for libsdl2-dev
+sudo: required
+dist: trusty
+
 language: c
 
 env:
-  # standard builds
-  - CC=gcc
-  - CC=clang
-  # extra libs
-  - CC=gcc USE_CODEC_VORBIS=1 USE_FREETYPE=1
-  - CC=clang USE_CODEC_VORBIS=1 USE_FREETYPE=1
-  # cross-compile using mingw
-  - CC= PLATFORM="mingw32" ARCH="x86"
-  - CC= PLATFORM="mingw32" ARCH="x86_64"
+  global:
+    # coverity token
+    - secure: "a2pGsG/+LS12sD/vgCF912TKBDDiT8PwRTH50eE94trQoHmD+bubIc4mXR9rSuU/NKNPdn6KZlqrVkVuoIanjYaf+rg28VavGMcBrtVO2cI1yjTUxb5Eq/cT20m3KfZCSFw3iWXfiK1CpDkm9Pdrr2Yz99EGZse3Y6jRGJ6giWM="
+  matrix:
+    # standard builds
+    - CC=gcc
+    - CC=clang
+    # extra libs
+    - CC=gcc USE_FREETYPE=1
+    - CC=clang USE_FREETYPE=1
+    # cross-compile using mingw
+    # dlopen curl to workaround link error because mingw-w64 in trusty is missing strtok_r required by libcurl.a
+    - CC= PLATFORM="mingw32" ARCH="x86" USE_CURL_DLOPEN=1
+    - CC= PLATFORM="mingw32" ARCH="x86_64" USE_CURL_DLOPEN=1
 
 script: ./travis-ci-build.sh
 
-before_install:
-  - echo "yes" | sudo apt-add-repository ppa:zoogie/sdl2-snapshots
-  - sudo apt-get update -qq
-  - sudo apt-get remove -qq -y mingw32
-  - sudo apt-get install -q -y libgl1-mesa-dev libsdl2-dev libfreetype6-dev mingw-w64
-
 notifications:
   email: false
 
-env:
-  global:
-    - secure: "a2pGsG/+LS12sD/vgCF912TKBDDiT8PwRTH50eE94trQoHmD+bubIc4mXR9rSuU/NKNPdn6KZlqrVkVuoIanjYaf+rg28VavGMcBrtVO2cI1yjTUxb5Eq/cT20m3KfZCSFw3iWXfiK1CpDkm9Pdrr2Yz99EGZse3Y6jRGJ6giWM="
-
 addons:
+  apt:
+    packages:
+      - binutils-mingw-w64-i686
+      - gcc-mingw-w64-i686
+      - binutils-mingw-w64-x86-64
+      - gcc-mingw-w64-x86-64
+      - gcc-mingw-w64
+      - mingw-w64
+      - libgl1-mesa-dev
+      - libsdl2-dev
+      - libfreetype6-dev
   coverity_scan:
     project:
       name: "ioquake/ioq3"
       description: "Build submitted via Travis CI"
     notification_email: quake3-commits@icculus.org
     build_command_prepend: "make clean"
     build_command: "make release"
-    branch_pattern: master
+    branch_pattern: coverity_scan

ChangeLog

@@ -634,7 +634,7 @@
     #1 current directory
     #2 fs_homepath
     #3 fs_basepath
-    this was needed to make mod developement easier
+    this was needed to make mod development easier
 
 2001-10-09  Timothee Besset <ttimo@idsoftware.com>
   + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=51
@@ -814,7 +814,7 @@
 	* rebuilding 1.28b, various fixes on linux build:
 	  - SetProgramPath was renamed to Sys_SetDefaultCDPath in unix_shared.c
 	    updated unix_main.c accordingly
-	  - some prototypes in qgl.h are guarded by #ifndef GL_VERSION_1_2 (ARB extentions)
+	  - some prototypes in qgl.h are guarded by #ifndef GL_VERSION_1_2 (ARB extensions)
 	    those prototypes are needed by linux_glimp for importing functions and casting, added a #ifdef __linux__
 	    (not a clean solution)
 	  - game/q_shared.h
@@ -861,7 +861,7 @@
 2001-04-23  Timothee Besset <ttimo@idsoftware.com>
 
 	* cleanup the mod selection code, remove duplicates
-	* some issues with release builds, my main developement box doesn't build stable binaries with release settings
+	* some issues with release builds, my main development box doesn't build stable binaries with release settings
 	  removing -fomit-frame-pointer seems to fix (there's probably a performance hit)
 	  see OMIT-FRAME-POINTER.txt
 
@@ -984,7 +984,7 @@
 	//* or // /* or variations of this. I reverted to exact mirror
 	image of SOS to be sure - short of removing it's too easy to mistake 
 	live code for dead one.
-	Later: have to change 5 occurences to avoid gcc complaints about
+	Later: have to change 5 occurrences to avoid gcc complaints about
 	nested comment tokens.
 	TODO: somebody please get rid of the cruft in here.
 
@@ -1235,7 +1235,7 @@
 	* code/game/g_cmds.c (G_SayTo): CON_CONNECTED.
 	* code/game/ai_main.c: HOOK added (SOS).
 	* code/botlib/be_aas_move.c (AAS_HorizontalVelocityForJump): 
-	correct fix for FPE occuring (SOS).
+	correct fix for FPE occurring (SOS).
 	* code/game/ai_dmq3.c: initmove.viewoffset (SOS).
 
 	* code/game/q_math.c: guard asser/isnan with Q3_VM (q3asm).
@@ -1679,7 +1679,7 @@
 	* code/game/q_shared.c: Q_strncpyz does zero padding (duh).
 	Note: calls strncpy, which does a zero fill up to destsize.
 	If destsize exceeds memory size, zero padding will overwrite
-	adjacent memory. Suspicion was this happend to botimport.
+	adjacent memory. Suspicion was this happened to botimport.
 
 	* code/qcommon/cvar.c: possible problem in Q_strncpyz call.
 
@@ -1783,7 +1783,7 @@
 	* TEST: running with RC4 data files.
 	TODO: "bot library used before setup" (Q3+TA)
 	TODO: Q3 old mods wreak havoc (graceful bounce)
-	TODO: supress "FreeType code not available" in renderer
+	TODO: suppress "FreeType code not available" in renderer
 	TODO: can't move in Q3
 	TODO: items flicker in Q3
 	TODO: no decals in Q3
@@ -2015,7 +2015,7 @@
 
 	* TEST: tried executing a script - get bounced.
 	TODO: is there any way to jump into a map?
-	TODO: cl_cinematics 0 (supress all fullscreen RoQ)
+	TODO: cl_cinematics 0 (suppress all fullscreen RoQ)
 	Next: used r_logfile 200 in Win32 (RC4) and Linux.
 	There is a buckload of setup code seemingly not done
 	at all in Linux? Either that, or logging is enabled
@@ -2983,7 +2983,7 @@
         Modules:
           code:      the Q3 engine code, including a jpeg-6/ copy
           common:    code shared by tools
-          libs:      code shared by tools, inlcuding a jpeg6/ copy
+          libs:      code shared by tools, including a jpeg6/ copy
           q3asm:     VM bytecode assembly 
           q3data:    misc. Q3 data conversions
           q3map:     BSP builder