1
0
Fork 0
forked from fte/fteqw
Commit graph

115 commits

Author SHA1 Message Date
TimeServ
85fc11e682 trash assembly, old d3d renderers (d3d7/d3d9/fakegl), projects and makefile broken in this commit
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3742 fc73d0e0-1445-4013-8a0c-d673dee63da5
2011-03-03 12:57:34 +00:00
Spoike
d7b9d1019a fix makefiles for the recent d3 proc hack
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3737 fc73d0e0-1445-4013-8a0c-d673dee63da5
2011-02-27 02:04:36 +00:00
Spoike
4fb854e261 Fix a couple of things I noticed while playing in linux.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3727 fc73d0e0-1445-4013-8a0c-d673dee63da5
2011-01-29 19:53:38 +00:00
Lance
b3278577bb Let's not try to build merged clients for every OS
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3725 fc73d0e0-1445-4013-8a0c-d673dee63da5
2011-01-28 09:56:45 +00:00
Lance
65138b6212 win32 and win64 now have a working d3d- target, win32_SDL has support in place to compile merged client (d3d+gl), also the d3d only client.. but both have undefined references to things in_win has and in_sdl doesn't etc
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3724 fc73d0e0-1445-4013-8a0c-d673dee63da5
2011-01-28 08:35:19 +00:00
Lance
6942e100d3 Version prints if d3d renderer is available, the video menu now sets "d3d" instead of invalid "d3d9" when selecting the D3D renderer, fixes to the Makefile so win32's m-rel will compile with gl+d3d, win32_SDL+win64+win64_SDL need alittle work still to compile, win32 d3d-rel/dbg still needs alittle work to compile
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3723 fc73d0e0-1445-4013-8a0c-d673dee63da5
2011-01-28 05:39:40 +00:00
Lance
8b74b55034 Enable D3D renderer in windows merged clients, some other small fixes to help MinGW get closer to compiling the D3D renderer (things are undefined)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3722 fc73d0e0-1445-4013-8a0c-d673dee63da5
2011-01-28 05:06:20 +00:00
Lance
610e66b431 MacOSX and MorphOS header sources added
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3699 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-12-16 03:25:37 +00:00
Lance
f71ac0220e FTE_TARGET=win64_SDL added. SDL updated from 1.2.13->1.2.14 (Better Win7 compatibility), also 64bit SDL static libs added.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3693 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-12-10 13:41:31 +00:00
Lance
d39ca9ac2f Fixed MorphOS dedicated server
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3690 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-12-09 07:37:22 +00:00
Lance
28321ce9c9 Speex support in MorphOS
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3689 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-12-09 03:52:48 +00:00
Lance
6a0549acc1 FTE_TARGET=win64 (thanks to MinGW64), 64bit MinGW64 static libs, and fix for undefined references to vsnprintf within qclib when using MinGW64
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3688 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-12-08 14:42:05 +00:00
Lance
85c2d8afae Compile OpenAL into all builds
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3687 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-12-07 13:19:19 +00:00
Lance
649aafac33 Hand edited MSVC project files yay, fix for speex header issue
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3669 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-11-24 02:54:28 +00:00
Lance
4d145039d2 Fixed some problems with targets not compiling, SDL being compiled into
non-SDL builds etc


git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3664 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-11-18 06:44:46 +00:00
Lance
6edfa34c98 #3662 didn't work as I expected, let's try the system's headers first
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3663 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-11-17 03:42:08 +00:00
Lance
956da68bda SDL fix
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3662 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-11-17 03:10:34 +00:00
Spoike
1cf4aed554 Those haven't been needed in a long time, and small fix for my last commit.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3657 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-11-15 02:45:59 +00:00
Lance
e6ccb2c84f Use MinGW specific Zlib library with MinGW compiled dedicated server
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3634 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-11-07 15:07:15 +00:00
Spoike
3e9fd517c3 Compile fixes.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3630 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-11-07 03:58:09 +00:00
Spoike
34e50e1489 don't spam that warning, its too annoying and hopefully not generally a problem
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3627 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-11-07 02:30:44 +00:00
Spoike
f34a7fe277 Try to fix fteplug stuff.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3623 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-11-07 02:12:35 +00:00
Spoike
0b1e3020d3 Trying to kill a few warnings.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3542 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-11 10:53:13 +00:00
Lance
8f43c1297f Added zlib library to the SDL server target
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3461 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-15 11:00:11 +00:00
Spoike
e6d1ae1a8f more cleanups: csqc now shares collision code with ssqc. Still lacks physics.
gl_rsurf.c has been split into gl specific and generic code - the d3d renderer can now draw the world.
ifdef removed the old server-side mvd playback which had been disabled all this time anyway.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3426 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-07 13:29:15 +00:00
Spoike
ad83ffa7c8 Fixed dependencies. Finally.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3420 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-07 02:55:09 +00:00
Spoike
4c37c34c13 Fixed some stuff. Cygwin stuff compiles now, so maybe linux will too. I've not tested it though cos cygwin uses software gl rendering, and I'm impatient. Also boosted NUM_SPAWN_PARMS a little, so saved games will break.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3408 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-05 03:07:52 +00:00
Spoike
5a649378f5 makefile works for the server again
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3407 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-05 01:42:19 +00:00
Spoike
66b78c0b11 Work In Progress branch.
In this version: replacement GL backend. Replacement D3D backend sharing code with GL. Lots of code reorganisation.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3401 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-04 21:16:50 +00:00
Lance
b773f51349 Added GCC profiling targets "-profile" which is just the release "-rel"
targets but with support for profiling. When FTE is exited cleanly it 
will create a profiling file (a.out or gmon.out) in the same 
directory depending on the compiler used. Can then "gprof programname 
gmon.out > humanreadable.txt" to read the profiling data.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3372 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-09-05 11:03:25 +00:00
Molgrum
ae4a809407 Added a mingl-dbg target to the Makefile.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3371 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-09-04 15:29:08 +00:00
Lance
8b086016f4 Removed all compiler optimizations from the crosscompiled MinGW32
binaries, so we're not chasing our tails with compiler bugs.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3367 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-09-02 15:14:50 +00:00
Lance
d2f908b886 Makefile should be all happy cat now
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3354 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-08-29 15:17:43 +00:00
Mark Olsen
959b204c3e Call svnversion only once.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3334 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-25 13:21:40 +00:00
Lance
c88cdc4716 Added the SVN revision number to the 'version' command, but only for
compilers which use "Makefile" (which rules out MSVC)


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3333 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-25 11:22:28 +00:00
Lance
e14edce4fd FTE now looks for libraries & associated includes where Fink installs
them in addition to where MacPorts/Darwinports installs them in MacOSX 
while compiling


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3328 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-22 05:43:13 +00:00
Lance
72d41bc846 Added include directories for freetype, MinGW working again.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3322 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-20 00:58:37 +00:00
Lance
150fdb2bd4 Minor MacOSX dedicated server tweak, zlib enabled.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3317 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-19 11:05:00 +00:00
Lance
2e10193d27 Enabled zlib, png & jpeg support in MacOSX.
If GCC complains about missing headers for libjpeg and libpng: 
1. Install Darwin Ports from darwinports.com. 
2. export PATH=$PATH:/opt/local/bin
3. sudo port -d selfupdate
4. sudo port install libpng
5. sudo port install jpeg


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3316 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-19 10:11:32 +00:00
Lance
a55a2326f2 Temporarily remove merged release & debug (m-rel & m-dbg) from the
"all" target in the makefile until it's needed


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3295 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-18 05:19:09 +00:00
TimeServ
d753d47758 fix "merged" sdl
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3284 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-17 10:17:22 +00:00
TimeServ
a94a33212c destroy software rendering and break everything (and that won't be all!)
also note that merged builds on non-windows no longer make much sense

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3283 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-16 22:06:59 +00:00
Spoike
57c9515b39 Updated QVM apiFixed up some of the slowness in the sky/water warping code.
Enabled freetype in gl builds. It'll try to link dynamically. Headers are included for windows users. unix users will need the freetype2-dev package for their system, sorry. you could probably get away with editing the makefile to include the headers if that's a problem.
Fixed occasional missing skies.
Updated q1qvm api stuff version (to 13).
Cleaned up the ban code. There are no longer two separate mechanisms to ban people.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3279 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-14 23:42:54 +00:00
Lance
17512cc406 Changed all instances of -lwsock32 to -lws2_32, "apparently wsock32 is old and shouldn't be used (since win95..)"
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3224 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-06-14 13:51:13 +00:00
Lance
226ae08d0a Use -DCLANG with clang (sv_rankin.c hotfix), Makefile cleanup (cleaner filenames) and -D_SDL added to the
win32_SDL 
targets


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3215 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-06-08 08:10:32 +00:00
Spoike
9cd988a836 Added csqc->ssqc requests.
Fixed up cl_indepphysics. Sending is fully independent, bar sync points.
Fixed so #if 0 works in qc code.
Fixed up error conditions in qclib when features are not supported.
The webpage generator will now refcount properly.
Fixed error conditions when using glsl shaders.
If MULTITHREAD is defined, r_loadlit will not light inside a separate thread.
We now generate VBOs for bsp objects. Shaders/rtlights don't use them yet.
Fixed up MVD/multiview playback a bit. It now looks like it works! (cl_hightrack will no longer track the same person in all views).
Fixed error conditions when attempting to download versioned csprogs.
Reduced the number of places that a q3-style marked up string is expanded. I think there are a couple places left still though. Approximated ezquake colour codes.
Memory mapped read file access in win32, where we can. Not sure about this. Lets see how things pan out.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3195 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-05-24 10:11:17 +00:00
Lance
43d97c3e31 win_SDL binaries now have icons
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3168 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-04-10 03:39:47 +00:00
Lance
e71b59bf92 Crosscompile all Win32 SDL binaries from Linux with FTE_TARGET=win32_SDL, binaries have been tested alittle and still have bugs
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3165 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-04-08 08:12:29 +00:00
Lance
84117bd7e3 MinGL & Merged targets added to SDL. Dedicated server, OpenGL & Software rendered SDL clients now build in Linux
and run but untested. r3162 was to resolve the SDL MinGL's build error: undefined reference to `NET_Sleep'


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3163 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-04-07 03:48:32 +00:00
Lance
648caa9c57 Just make the help output alittle more helpful, added crosscompiling
comments


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3157 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-04-06 02:45:11 +00:00