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
jeremiah sypult
744651f72f
Updated Makefile to only build release OS X app bundles
2013-07-18 00:47:00 -05:00
jeremiah sypult
260233d4ec
bug 5986 - Configure jenkins to spit out mac .app
...
https://bugzilla.icculus.org/show_bug.cgi?id=5986
Created make-macosx-app.sh to handle manually creating an app bundle from other scripts.
Updated make-macosx.sh to create bundle with make-macosx-app.sh (TODO: make-macosx-ub.sh support).
Updated Makefile to create bundle with make-macosx-app.sh and zip up the resulting ioquake3.app if ARCHIVE is defined.
2013-07-18 00:11:10 -05:00
Tim Angus
d9d52f0306
Merge branch 'master' into sdl2
...
Conflicts:
Makefile
code/renderercommon/qgl.h
code/renderergl1/tr_local.h
code/sdl/sdl_glimp.c
2013-05-08 14:27:15 +01:00
Jonathan Gray
a88357b93c
sync the OpenBSD cflags with Linux
2013-05-05 11:56:24 +10:00
Jonathan Gray
258c4782c6
correct the linked libs on OpenBSD
2013-05-05 11:40:57 +10:00
Tim Angus
efaa87de10
Fix typo preventing OSX native compiles
2013-03-28 11:13:58 +00:00
Tim Angus
0183f3978a
Fix OSX app/ub scripts
2013-03-28 09:56:29 +00:00
Zack Middleton
59061e853e
Change missionpack QVM build order in Makefile
...
Now it matches native libs and baseq3 QVMs.
2013-03-27 14:26:34 -05:00
Tim Angus
2b3c5492c7
Add option to create archive of build product
2013-03-27 14:35:11 +00:00
Tim Angus
838fcf45cb
Make the build summary more pretty
2013-03-26 23:12:17 +00:00
Tim Angus
946c89b5f1
Fix 'make -jX clean release'
2013-03-26 20:58:55 +00:00
Tim Angus
352cd151e0
Cross compiling for OS X
2013-03-25 22:41:45 +00:00
Tim Angus
4f452fcfed
Enable building QVMs when cross-compiling
2013-03-24 22:06:45 +00:00
Tim Angus
cae7ae9ce6
(bug #5904 ) Fix OpenBSD and Solaris builds
2013-03-23 12:14:03 +00:00
Tim Angus
02a625a1b3
Fix it more
2013-03-22 14:47:37 +00:00
Tim Angus
6155816672
(Hopefully) fix the Jenkins build
2013-03-22 14:26:29 +00:00
Tim Angus
b720b60295
Move cross-make-mingw.sh's functionality to the Makefile and remove it
2013-03-22 13:49:50 +00:00
Tim Angus
e4151c1d55
Add DEBUG_MAKEFILE to... debug the Makefile
2013-03-22 13:42:11 +00:00
Tim Angus
8d70929d12
Ditch 'historical compatibility' and use 'logic' instead
2013-03-22 11:33:27 +00:00
Tim Angus
bba199e795
Fix comment grammar (and test jenkins)
2013-03-21 22:37:44 +00:00
Tim Angus
2c8e751130
Consolidate architecture names
...
amd64, x64, x86_64 -> x86_64
i386, i86pc, x86 -> x86
powerpc, ppc -> ppc
powerpc64, ppc64 -> ppc64
axp -> alpha
Some exceptions are made for the actual build product names
2013-03-21 18:00:17 +00:00
Tim Angus
dfbad1360f
Fix some clang warnings
2013-03-12 21:50:59 +00:00
Tim Angus
78132cf829
Remove old x86_64 JIT compiler
2013-03-11 22:20:10 +00:00
Zack Middleton
2a31f33fc6
Add libogg 1.3.0
2013-02-17 18:56:06 -06:00
Zack Middleton
3dd5c5d862
Add Ogg Opus support
2013-02-17 18:32:05 -06:00
Tim Angus
93e6183ce3
Move some things into renderercommon
2013-02-16 12:15:36 +00:00
Tim Angus
f6fb9eb602
renderer -> renderergl1, rend2 -> renderergl2
2013-02-15 23:46:37 +00:00
Tim Angus
517c65d85e
Fix some SMP bits I missed
2013-01-26 21:40:45 +00:00
Tim Angus
51df89ab13
Remove the SMP renderer feature
2013-01-24 22:53:08 +00:00
Tim Angus
b43f766141
Update bundled SDL headers/libs
2013-01-21 22:40:05 +00:00
Tim Angus
f478761e07
Use SDL 2 instead of SDL 1.2
2013-01-17 18:20:03 +00:00