ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-10 15:21:35 +00:00
Code Issues Projects Releases Packages Wiki Activity
2568 commits 1 branch 0 tags 137 MiB
Commit graph

294 commits

Author SHA1 Message Date
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
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
Simon McVittie
69999280c6 Find Speex via user override, pkg-config or default search path 2013-05-19 21:32:20 +01:00
Simon McVittie
cff1fcd658 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.
 2013-05-19 21:31:26 +01:00
Simon McVittie
c817ab5ae0 Find system zlib via user override, pkg-config or in standard locations 2013-05-19 21:31:12 +01:00
Simon McVittie
9ff2fc3324 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.
 2013-05-19 21:28:31 +01:00
Simon McVittie
2821aa41d7 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".
 2013-05-19 21:27:24 +01:00
Simon McVittie
b1da355644 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.
 2013-05-19 21:23:50 +01:00
Simon McVittie
608347c84d 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.
 2013-05-19 21:20:43 +01:00
Simon McVittie
1fe4e0c239 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.
 2013-05-19 21:19:52 +01: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