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
Tim Angus
6999fdba91
Assorted whitespace fixes
2013-01-05 15:35:50 +00:00
Tim Angus
631db38d25
Fix dist target and comment refering to svn
2013-01-05 15:35:32 +00:00
Tim Angus
20ef1b0115
Fix whitespace
2013-01-05 15:05:30 +00:00
Tim Angus
f6c98fd29f
Replace svnversion use with git equivalent
2013-01-03 21:08:28 +00:00
Richard Allen
6a7a67a497
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
2012-12-31 01:32:15 +00:00
Richard Allen
1c8fa31c0d
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
2012-12-20 00:15:17 +00:00
Zack Middleton
76584dbcec
Makefile fixes for OpenBSD by Jonathan Gray. ( #5728 )
2012-12-16 02:58:47 +00:00
James Canete
edb414b34a
#5808 - Include and use .glsl in source (rend2)
2012-12-04 01:56:52 +00:00
James Canete
b5eb31b4f6
From /dev/humancontroller:
...
when hard-linking renderers, put the old renderer (not the new one) into the "ioquake3" executable, and use a distinguished "ioquake3_rend2" executable for the new renderer
(Fixes bug #5789.)
2012-10-28 21:04:41 +00:00
James Canete
dfdfc656ea
From /dev/humancontroller:
...
fix the SMP functionality not being utilized (as of the import of Rend2)
2012-10-28 20:56:26 +00:00
James Canete
4f7eb9fa21
Added Rend2, an alternate renderer. (Bug #4358 )
2012-10-26 01:23:06 +00:00
Zachary Slater
afffc10a54
switch mac to the framework SDL...
2012-07-18 04:57:52 +00:00
Zack Middleton
73a5f01baf
Don't use local SDL headers on Linux (need system sdl-config and SDL library anyway).
2012-05-07 23:31:38 +00:00
Zack Middleton
ea0102d403
- Added support for enabling FreeType Support (make USE_FREETYPE=1).
...
- Fixed compiling tr_font.c for dynamic renderer.
2012-03-29 04:05:13 +00:00
Ludwig Nussel
6c8a9af300
fix mingw64 installer
2012-02-07 09:29:13 +00:00
Zack Middleton
c84377854a
Unix clients can now enter commands from tty console. Patch by Rambetter with some edits by me. ( #4799 )
2012-02-06 21:05:57 +00:00
Zack Middleton
bdf1af34dc
Fixed typo in Makefiles copyfiles directory path check.
2011-12-10 00:37:59 +00:00
Tim Angus
5e7e61a648
* More Makefile configuration (ZTurtleMan)
2011-10-28 19:12:43 +00:00
Tim Angus
7d570e693d
* (bug #5283 ) Changes to the Makefile to make building standalone games
...
easier (JBravo)
2011-10-27 21:39:05 +00:00
Tim Angus
fd986dae06
* Fix various warnings with GCC and clang
2011-10-27 21:32:28 +00:00
Tim Angus
675e7a641a
* clang support
2011-10-21 22:48:53 +00:00