Commit graph

144 commits

Author SHA1 Message Date
heinrich5991 d98abf35db Rename WEBSOCKETS to CONF_WEBSOCKETS 2017-03-07 13:03:37 +01:00
Dennis Felsing 2f9f3234a8 Fix mastersrv, twping compilation with libwebsockets 2016-08-12 08:47:17 +02:00
heinrich5991 64ca2cfde9 Add bam 0.5.0 support while retaining 0.4.0 compatiblity 2016-08-03 00:03:50 +02:00
def 3c7a9bc3a4 Link with -lrt for clock_gettime for glibc < 2.17 2016-06-29 02:32:52 +02:00
def ebb5953632 Fix SDL2 in lua 2016-04-29 21:56:38 +02:00
def ad509beab7 Remove -lrt as it doesn't work on OpenBSD and is not required on Linux 2015-12-23 03:50:51 +01:00
H-M-H 8f8053de3d fixed mysql compiling on mac 2015-11-22 15:23:10 +01:00
H-M-H a496bee27c fixed/improved objective-c++ includepath (mac osx only) 2015-11-07 19:29:48 +01:00
def 596ee34173 -ldl for Linux and Mac OSX only 2015-09-23 16:35:50 +02:00
def b3f094bf40 Some systems want -ldl as the end, so let's do that 2015-09-23 16:32:33 +02:00
def 975fbf3702 libwinpthread for new mingw 2015-09-03 11:50:40 +02:00
def d4fe267c58 Make cross-compilation for windows possible using mingw 2015-09-03 07:44:56 +02:00
def fca4c112d4 Better support for cross-compiling by using pkg-config (instead of sdl-config and freetype-config) and trying both static linux libs 2015-09-03 06:28:11 +02:00
H-M-H 0086d19276 added Notifications for osx 2015-08-11 03:14:27 +02:00
def 60d035cf78 Fix mysql arch x86 2015-07-10 17:42:16 +02:00
def 552446b2e5 Apply sql settings at right position 2015-07-10 17:33:28 +02:00
def e163f9f8ea Add support for compiling mysql with dynlibs thanks to mysql_config 2015-07-10 16:55:53 +02:00
def 0df6866036 Enable support to use pkg-config for curl, opusfile, opus and ogg
instead of the bundled libs. This should enable support for building on
more platforms again.

To disable pkg-config detection and use the bundled libraries instead,
you can manually set it like this:
  bam config curl.use_pkgconfig=false opus.use_pkgconfig=false opusfile.use_pkgconfig=false ogg.use_pkgconfig=false

Fixes #172
2015-07-10 15:31:09 +02:00
def e332a43dc5 Add libwinpthread-1.dll for Win64 2015-07-01 14:59:44 +02:00
def 7f8ce3c8dd Rename json.cpp to json.c again 2015-07-01 14:13:06 +02:00
def e503b7def5 First try for Win64 2015-07-01 13:41:15 +02:00
H-M-H 87471f752b fixes this: http://stackoverflow.com/questions/19901934/strange-linking-
error-dso-missing-from-command-line
2015-03-29 23:23:16 +02:00
def f893ed6ec4 Fix and clean up autoupdater 2015-03-13 15:14:00 +01:00
heinrich5991 fa0708b99d Make the secure random stuff platform-independent 2015-03-06 01:35:08 +01:00
fisted 68e30c29b3 added free md5 implementation w/o deps 2015-03-05 00:13:48 -08:00
eeeee 56c42c3c31 websockets support in server 2015-02-08 19:11:34 -08:00
def d4c6141fa2 Fix some bam stuff 2015-02-05 19:52:13 +01:00
def a8b2672739 Minor curl fixes 2015-02-05 18:03:34 +01:00
def 05ae3f41bb Let's try to make curl build 2015-02-05 17:54:42 +01:00
Learath Lea d7771f8f7d Fix debug build on MinGW. Add json_get_boolean. 2015-01-19 22:14:50 +01:00
def 4ccdaf6f1b Only do -static-libgcc and -static-libstdc++ on Windows with gcc 2015-01-19 22:14:49 +01:00
def bf1c7b33dd Revert "No more static linking"
This reverts commit 191dca338a.
2015-01-19 22:14:49 +01:00
def 0696f68212 No more static linking 2015-01-19 22:14:49 +01:00
def c0f309a82e Oops 2015-01-19 22:14:49 +01:00
def 72278a18cb Fix cl_default_zoom bug 2015-01-19 22:14:48 +01:00
fisted 095d172903 Link against libcurl.
Conflicts:
	scripts/make_release.py
2015-01-05 22:43:09 +02:00
def 7e89917ddd Rename ping -> twping 2014-11-24 23:22:37 +01:00
def 7ff73a2ee5 Add ping tool 2014-11-24 21:16:03 +01:00
def 2a44f0cc0f Merge branch 'Sound' into DDRace64
Conflicts:
	bam.lua
	other/opus/include/ogg/ogg.h
	other/opus/include/opus/opus.h
	other/opus/include/opus/opus_custom.h
	other/opus/include/opus/opus_defines.h
	other/opus/include/opus/opus_multistream.h
	other/opus/include/opus/opus_types.h
	other/opus/include/opusfile.h
	src/engine/client/sound.cpp
2014-10-28 22:08:59 +01:00
def bb484c0f58 Opus working with Mac 2014-10-28 17:49:42 +01:00
def 5604629468 Add Mac libraries 2014-10-28 16:59:53 +01:00
def c69f2470d7 Use path to libopusfile-0.lib as suggested by BeaR 2014-10-28 16:47:18 +01:00
def 47e86a0451 Fix compilation on Windows with mingw (hope it works with VS as well) 2014-10-28 16:17:53 +01:00
def 0c41753585 Fix Windows path 2014-10-28 16:07:41 +01:00
def 636f407645 Working compilation on Linux 2014-10-28 16:03:11 +01:00
BeaR 5562fac602 Add opus as external library (windows only) 2014-10-28 14:38:50 +01:00
def 40e589681e Clean up bam.lua a bit 2014-10-28 10:00:46 +01:00
def 7d7b78938e Fix opus compilation 2014-10-28 09:51:15 +01:00
def 24881449b3 Revert "Add OGG"
This reverts commit 28d276cd7e.
2014-10-28 01:34:15 +01:00
def 3b1d23f42c Revert "Add Opus"
This reverts commit a7dafa40c7.
2014-10-28 01:34:09 +01:00