Commit graph

117 commits

Author SHA1 Message Date
Zack Middleton
3521787c14 Merge branch 'misc/lilium_common' into game/eliteforce
Conflicts:
	README.md
	code/client/cl_main.c
	code/qcommon/common.c
	code/qcommon/q_shared.h
	code/sys/sys_unix.c
2018-03-04 04:04:35 -06:00
Zack Middleton
4c31c90f6c Add lily icon for macOS and edit app bundle 2018-03-04 03:53:09 -06:00
Zack Middleton
e45538b1c5 Merge branch 'master' into game/eliteforce
Conflicts:
	README.md
	code/server/sv_client.c
2018-03-03 19:27:28 -06:00
Zack Middleton
ad10e6610c Changes to systemd q3a.service
Use an absolute path as required by systemd. Distro packages will need
to change it. (Reported by @andreyv and @zeroxfourc.)
Link to server documentation on the wiki instead of maintaining a subset
in the service file.
2018-02-04 07:51:17 -06:00
Zack Middleton
acce0e5452 Fix building msvc12 project
* Don't try to embed manifest (it causes build to fail because it's
  specified in win_resource.rc).
* Fix curl include path.
* Compile sys_autoupdater.c.
* Make quake3 debug link to msvcrtd.lib instead of msvcrt.lib to fix
  unresolved external symbol __imp___CrtDbgReportW.
* Fix q3_ui dll output directory.
* Fix opus path filter.
* Use UseOfMfc false and CharacterSet NotSet.
* Fix header paths and remove non-existent files.
2018-01-30 07:40:09 -06:00
Matt Palmer
14cb72f912 Improvements to the linux build script
In no particular order:

* Use `set -e`, because it prevents accidents, and means we can avoid
  lengthy &&-joined command chains.
* Override defaults by setting env vars; this means people don't have to
  edit the script to change things.
* Use an unpredictable and safely-created tmpdir for building; ain't nobody
  wants to cleanup from a tmpdir race condition attack.
* Test for the presence of `git` and `make` *before* asking questions, and
  only prompt the user about them if they're missing.  No need to bother
  people with unnecessary reading.
* Automatically clean up the build directory after use.
* Tidy up some indenting that had come asunder.
2017-11-21 23:07:54 -06:00
Zack Middleton
4837f4619e Merge branch 'master' into game/eliteforce
Conflicts:
	code/client/cl_main.c
	code/qcommon/common.c
	code/qcommon/files.c
	code/qcommon/msg.c
	code/qcommon/q_shared.h
	code/renderercommon/tr_common.h
	code/renderergl2/tr_extensions.c
	code/sdl/sdl_glimp.c
2017-09-17 23:16:55 -05:00
Zack Middleton
c2ce1c2f51 Make client for Windows x86_64 use OpenAL64.dll by default
ioquake3.x86_64.exe can't load x86 OpenAL32.dll. Using separate
library names allows shipping OpenAL for both architectures.

Though since the dll name is saved in the config file, using both
clients on the same computer will cause one client arch to always
try to load the wrong OpenAL dll and then fallback to the correct
default OpenAL dll. I guess it could be fixed by using separate
cvar names for s_alDriver.
2017-09-04 20:34:55 -05:00
Zack Middleton
00a5339b27 Update arch in misc/setup for ioq3 changing from i386 to x86 2017-08-07 05:52:13 -05:00
Zack Middleton
67dace6c20 Escape quotes for sv_dlURL in shell so it doesn't become "http:"
q3ded +set sv_dlURL "http://example.org"

The shell removes the quotes but makes the content be a single argument
for progam args. Quake 3 concatenates all the program args and splits
lines at + or newlines. Then Quake 3 parses them using a tokenizer
that skips unquoted C comments beginning with //. This results in
the cvar being set to "http:".

Escape the quotes so they are passed to the program and the tokenizer
knows not to skip C comments.

    q3ded +set sv_dlURL \"http://example.org\"
2017-07-20 23:24:52 -05:00
Zack Middleton
ef8ad54421 Rename (already updated) opus-1.1 to opus-1.1.4 2017-05-23 11:47:27 -05:00
Zack Middleton
853110d5d4 Update opus from 1.1 to 1.1.4
Define FLOAT_APPROX in Makefile and misc/msvc12/quake3.vcxproj.
2017-05-23 11:47:26 -05:00
Zack Middleton
1c1e1f61f1 Allow overriding platform in NSIS installer
MSYS2 and some mingw builds use mingw64 instead of mingw32. If you run
`make installer` from the top-level, PLATFORM should be set correctly
when building the installer.
2016-11-01 17:53:25 -05:00
Zachary J. Slater
f47aaa2a61 Minor URL change. 2016-08-07 23:53:38 -10:00
Zack Middleton
69f9c7d692 Merge branch 'master' into game/eliteforce
Conflicts:
	Makefile
	code/qcommon/q_shared.h
2016-06-17 02:22:52 -05:00
Zack Middleton
e0b2256043 Include SDL2 dll from repository in NSIS installer
Before it required manually copying SDL 1.2 dll into misc/nsis/ which the
engine no longer uses.
2016-05-27 00:44:13 -05:00
Zack Middleton
80357ff1f2 Remove incorrect documentation from q3a.service
rate, snaps, and cl_maxpackets cvars only affect client.
2016-04-04 12:19:17 -05:00
SmileTheory
275317fefb OpenGL2: Direct state access, part 1: Texture binds 2016-01-18 04:46:01 -08:00
SmileTheory
3089df0398 Add msvc12 project files. 2016-01-15 02:54:34 -08:00
Zachary J. Slater
e0b58abf53 Don't quote me. 2015-09-24 11:26:10 -07:00
Zachary J. Slater
45162a395f Fixed the os x path and now both scripts will take arguments 2015-09-24 11:21:18 -07:00
Zachary J. Slater
c138659de1 A mac dedicated server script 2015-09-24 11:00:08 -07:00
Zack Middleton
1c628c0fe5 Update headers in VS (10 and 11) projects
So VS doesn't always want to rebuild.

Reported by @shearer12345.
2015-08-19 13:50:39 -05:00
Zack Middleton
b5e9e1357a Make msvc10/11 x86_64 copy SDL264.dll 2015-08-18 20:03:59 -05:00
shearer12345
d64a75f3cb add post-build event for msvc10/11 to copy SDL2.dll to build folder 2015-08-18 20:02:13 -05:00
shearer12345
1d83dcca3e Update msvc10/11 for SDL2
update AdditionalIncludeDirectories to use SDL2
update AdditionalDependencies to use SDL2
add AdditionalLibraryDirectory to SDL2 libs
set sub-system as console
2015-08-18 19:51:27 -05:00
shearer12345
40e9a31470 Make msvc10/11 use UseOfMfc false and CharacterSet "NotSet" 2015-08-18 19:51:18 -05:00
Zack Middleton
24c7563478 Copy msvc11 build changes to msvc10 2015-08-18 19:27:29 -05:00
Zack Middleton
d021150e04 Fix mscv11 libcurl include path 2015-08-18 19:27:27 -05:00
Zack Middleton
beddd710d2 Fix msvc11 x86_64 runtime 2015-08-18 19:27:26 -05:00
Zack Middleton
af30a0e70a Update msvc10 renderer filenames (copied from msvc11) 2015-08-18 19:27:25 -05:00
Zack Middleton
eaaaf62a16 Remove MSVC user configuation files 2015-08-18 19:27:22 -05:00
Zack Middleton
28ce8404c9 Use lily icon 2015-07-24 23:53:52 -05:00
Zack Middleton
e79af0d1a0 Fix server_compile.sh to exit after completed
Also, convert '\n's to real new lines because the literal '\n's were
printed.
2015-07-06 21:25:06 -05:00
Zachary J. Slater
2758eebbcc server_compile.sh & start_server.sh for Linux ioq3 sysadmins
If your distribution doesn’t include such niceties, these could help a
newbie get started with a compiled build of ioquake3 for servers and a
short script to get started.
2015-07-06 17:14:34 -07:00
Zachary J. Slater
bb64bd7be0 Moved the systemd to /misc/linux 2014-08-27 18:10:27 -07:00
Pan7
16b48b50dd -ffast-math for msvc 2014-07-20 05:22:20 -05:00
Roberto Estrada
adc1b2cbd1 Switched runtime library to Multithreaded DLL to fix build on VS2012. 2014-05-07 10:37:42 +02:00
kungfooman
40985b53d6 Add misc/msvc12/ to support Microsoft Visual Studio 2012 Express Edition 2014-04-01 17:30:57 +02:00
SmileTheory
4c9d39ae6e Fix some file paths for msvc 2008 2013-12-09 17:15:29 -08: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
jeremiah sypult
9c2ce77d98 Added "all game" and "all ioquake3" schemes to Xcode workspace so that they build properly. 2013-07-17 15:54:53 -05:00
jeremiah sypult
90dcf34eee Fix the speex Xcode project since it was missing its header search path. 2013-07-17 14:59:58 -05:00
jeremiah sypult
0f9eca6546 Initial Xcode workspace & project support (4.6.3).
Updated .gitignore and ioquake3fe Xcode project.
Added Retina-enabled QUAKE III logo icon files.
Details in misc/xcode/xcode-readme.txt
2013-07-13 01:06:26 -05:00
SmileTheory
369956eb63 Fix compilation in VS2008. 2013-03-14 21:36:44 -07:00
Tim Angus
f6fb9eb602 renderer -> renderergl1, rend2 -> renderergl2 2013-02-15 23:46:37 +00:00
SmileTheory
af77b93597 #5818 - Modular renderer and Rend2 support for MSVC. 2013-01-07 20:30:49 -08:00
Zack Middleton
8424865879 Have NSIS uninstaller delete rend2. 2012-12-09 01:05:25 +00:00
Zack Middleton
2e99ae093e - Include OpenGL1 and Rend2 renderers in Loki Setup Installer. 2012-12-09 01:01:13 +00:00
Zack Middleton
a1270177c1 Include Rend2 renderer in NSIS installer. 2012-12-09 00:53:52 +00:00