ref: 1fdb037589d76f2e7f7d464e0a92daecc7c1f241
parent: 921a73c0fedad5996716535b74b121f6fe203b05
parent: 3ec49f4028e6b0c62cec13437323bd15257da041
author: Simon Howard <[email protected]>
date: Sun Jun 5 08:27:14 EDT 2016
Merge remote-tracking branch 'origin/master' into sdl2-branch
--- /dev/null
+++ b/.travis.yml
@@ -1,0 +1,30 @@
+language: c
+
+compiler: gcc
+
+# Travis uses Ubuntu 12.04 (Precise) for builds by default, which is too
+# old and missing the SDL2 packages, so use Trusty instead.
+sudo: required
+dist: trusty
+
+# TODO: Remove old SDL library dependencies once sdl2-branch is merged.
+addons:
+ apt:
+ packages:
+ - libsdl2-dev
+ - libsdl2-mixer-dev
+ - libsdl2-net-dev
+ - libsdl2-image-dev
+ - libsamplerate0-dev
+ - libsdl1.2-dev
+ - libsdl-mixer1.2-dev
+ - libsdl-net1.2-dev
+ - libpng-dev
+
+script: ./autogen.sh && make
+
+branches:
+ only:
+ - master
+ - sdl2-branch
+
--- a/opl/opl_queue.c
+++ b/opl/opl_queue.c
@@ -210,7 +210,7 @@
for (i = 0; i < queue->num_entries; ++i)
{offset = queue->entries[i].time - time;
- queue->entries[i].time = time + (uint64_t) (offset * factor);
+ queue->entries[i].time = time + (uint64_t) (offset / factor);
}
}
--- a/src/d_iwad.c
+++ b/src/d_iwad.c
@@ -38,7 +38,7 @@
{ "tnt.wad", pack_tnt, commercial, "Final Doom: TNT: Evilution" }, { "doom.wad", doom, retail, "Doom" }, { "doom1.wad", doom, shareware, "Doom Shareware" },- { "chex.wad", pack_chex, shareware, "Chex Quest" },+ { "chex.wad", pack_chex, retail, "Chex Quest" }, { "hacx.wad", pack_hacx, commercial, "Hacx" }, { "freedm.wad", doom2, commercial, "FreeDM" }, { "freedoom2.wad", doom2, commercial, "Freedoom: Phase 2" },