Zack Middleton
6b9a3a47db
Merge branch 'master' into game/eliteforce
...
Conflicts:
code/renderergl1/tr_main.c
code/renderergl2/tr_main.c
2015-07-09 18:42:11 -05:00
Zack Middleton
6a03817a9c
Merge pull request #4 from smcv/hurd
...
Add support for the GNU/Hurd architecture
2015-06-30 19:02:46 -05:00
Martin Michlmayr
ebb69f699c
Add support for Aarch64 (ARM64)
...
Add support for Aarch64, the 64-bit ARM architecture.
2015-06-30 14:22:49 -04:00
Zack Middleton
3e84d5696f
Add Spearmint portable SDL for Linux compile stuff
2015-06-24 18:08:00 -05:00
Zack Middleton
add8b1826d
Rename ioST:V to Lilium Voyager
...
I'd like to avoid confusion with 'official' ioSTVEF releases.
2015-06-24 17:24:03 -05:00
Zack Middleton
73de855c27
Merge branch 'master' into game/eliteforce
...
Conflicts:
code/client/cl_main.c
2015-06-24 16:48:46 -05:00
Zack Middleton
d0a3ba301b
Merge pull request #89 from bostick/master
...
Add mingw prefix for cygwin32 and mingw32
2015-06-18 13:13:16 -05:00
Zack Middleton
9522028a0e
Sort tr_image_*.c filenames in Makefile
2015-06-12 14:31:58 -05:00
Tim Angus
76e0c51a1a
Merge pull request #110 from zsoltm/mingw64
...
added mingw64 (msys2) platform support
2015-06-12 16:28:13 +01:00
Tim Angus
708fe6937a
use osxcross compilers
2015-06-07 03:48:09 -07:00
Tim Angus
92b74e58cc
clang gets upset by some of these compiler options (and they're probably pretty pointless in 2015 anyway)
2015-06-06 22:42:10 +01:00
Zack Middleton
56bdf5d656
Merge branch 'master' into game/eliteforce
2015-04-30 22:34:34 -05:00
Zack Middleton
956bea9cda
Merge branch 'master' into game/eliteforce
2015-03-23 23:54:32 -05:00
Simon McVittie
0fc86e9632
Use pkg-config for a system libjpeg if available: libjpeg-turbo has it
...
Bug: https://github.com/ioquake/ioq3/pull/116
2015-03-18 17:37:42 +00:00
ZsoltM
31fea24321
added mingw64 (msys2) platform support
2015-01-30 22:52:53 +01:00
Zack Middleton
4e029b1f6b
Fix compiling lcc using mingw under cygwin
...
Also have 'make' under cygwin automatically use mingw.
2015-01-27 04:51:03 -06:00
Zack Middleton
80986cbf21
Build Elite Force by default
2014-10-29 09:14:57 -05:00
Zack Middleton
c6e5f060fe
Port Elite Force iorev2231 patch to latest ioq3
...
Port Thilo Schulz's Elite Force Holomatch patch to latest ioq3.
Patch for ioq3 svn r2231.
No support for OpenGL2 renderer yet.
2014-10-29 07:15:12 -05:00
Zack Middleton
0e412276c5
Add support for playing MP3s using libmad
...
Based on Thilo's Elite Force patch for ioq3.
Updated Makefile changes. Left out in-tree win32 lib support.
Striped trailing whitespace from snd_codec_mp3.c.
Changed two #if USE_CODEC_MP3 to use #ifdef.
2014-10-29 05:49:57 -05:00
Brenton Bostick
66edc4b296
Add mingw prefix for cygwin32 and mingw32
2014-10-03 21:59:26 -04:00
Tim Angus
02d197ca08
Bullshit change to test jenkins configuration
2014-08-27 10:36:56 +01:00
Tim Angus
00909a4c16
Add SDL libraries to the builds
2014-08-26 16:59:33 +01:00
Tim Angus
cf7004ffb2
Fix OSX build
2014-08-25 12:03:10 -04:00
Tim Angus
2a3368481d
Merge branch 'master' into sdl2
...
Conflicts:
Makefile
code/renderergl2/tr_image.c
2014-08-25 15:00:48 +01:00
hairball
3c52f2dccc
Don't use -mwindows with Clang on Windows
...
Thanks to stigmha for pointing out this doesn't work in Windows.
2014-07-26 00:47:28 -05:00
Zack Middleton
48738599a0
Allow user override of cURL, OpenAL, and SDL libs/cflags
2014-07-20 17:39:27 -05:00
MAN-AT-ARMS
a8dcf60b76
Fix compiling on Linux Mint
2014-07-20 17:32:11 -05:00
Zack Middleton
574f6d1f31
Allow overriding external opus libs/cflags in Makefile
...
Pointed out by @MAN-AT-ARMS.
2014-07-20 16:55:45 -05:00
Zack Middleton
b02b54883b
Fix up vorbis handling in Makefile
2014-07-20 06:14:44 -05:00
Zack Middleton
efa9555d74
Merge branch 'pkg-config' of github.com:smcv/ioq3 into master
...
Conflicts:
Makefile
2014-07-20 05:51:17 -05:00
Zack Middleton
7afb433e20
Fix fast-math optimize flag for MinGW x86_64 build
...
Found by /dev/humancontroller.
2014-07-15 00:23:02 -05:00
Zack Middleton
c55df2c9aa
Merge branch 'master' into sdl2
2014-03-24 17:53:08 -05:00
Zack Middleton
cf7d8ef9cf
Remove -falign-loops and -falign-jumps from Makefile
...
Clang warns and errors because of them on various platforms.
Based on pull request #43 by @xhairball.
2014-03-24 13:09:49 -05:00
Tim Angus
1cbb5e9771
Merge pull request #44 from xhairball/features/add-vorbis-1.3.4
...
Add vorbis 1.3.4 support
2014-03-24 14:15:11 +00:00
MAN-AT-ARMS
5e1011bf70
Update SDL 1.2.15 to Revision 8040
2014-03-09 09:24:54 -04:00
MAN-AT-ARMS
dafed0fd66
Update SDL2 to 2.0.2
2014-03-08 21:33:02 -06:00
hairball
31d8f95427
Remove unnecessary NEED_VORBIS since you have USE_CODEC_VORBIS
...
Thanks zturtleman for catching this
2014-02-08 22:02:24 +00:00
hairball
cc40051839
Add vorbis 1.3.4 build support
2014-02-08 08:26:03 +00:00
Zack Middleton
ed087bb89e
Merge branch 'master' into sdl2
2014-02-07 23:24:12 -06:00
Zack Middleton
c2e2514efc
Merge pull request #41 from xhairball/fixes/check-cc-when-cross-compiling-mingw32
...
When cross compiling on mingw32, make sure it finds a CC
2014-02-07 22:33:02 -06:00
Zack Middleton
d0b1fb4fed
Merge branch 'features/upgrade-opus-1.1' of https://github.com/xhairball/ioq3 into opus_update
...
Conflicts:
Makefile
2014-02-07 22:12:59 -06:00
Zack Middleton
166f5ab90c
Merge branch 'features/upgrade-opusfile-0.5' of https://github.com/xhairball/ioq3 into opus_update
2014-02-07 22:11:31 -06:00
hairball
6fa6ab1064
When cross compiling on mingw32, make sure it finds a CC
2014-02-08 03:57:39 +00:00
hairball
2de340895f
Upgrade libogg 1.3.0 to 1.3.1
...
This is a minor bugfix release with few changes
2014-02-08 03:38:01 +00:00
hairball
b0aed02823
Upgrade opusfile 0.2 to 0.5
2014-02-08 03:29:10 +00:00
hairball
9e0c602795
Upgrade opus 1.0.2 -> 1.1
2014-02-08 03:21:02 +00:00
Andrey Vihrov
7bffad0981
Don't forget to install the renderer2 binary if USE_RENDERER_DLOPEN=0
2013-12-16 18:01:29 +02:00
Tim Angus
32a859c680
More updates to SDL2 libs from MAN-AT-ARMS
2013-08-19 23:19:29 +01:00
Tim Angus
bde7665462
Merge branch 'master' into sdl2
...
Conflicts:
code/sdl/sdl_input.c
2013-08-16 23:34:08 +01:00
jeremiah sypult
d9485b696e
Makefile builds fall back to traditional archiving when Mac OS X application bundle generation fails
2013-07-18 11:29:23 -05:00