Switched to branch 'master' Your branch is up-to-date with 'origin/master'. Removing src/build/.cache/ Removing src/build/checklto/test Removing src/build/cpucount Removing src/build/ld Removing src/build/wcversion Removing src/enet/callbacks.o Removing src/enet/host.o Removing src/enet/list.o Removing src/enet/packet.o Removing src/enet/peer.o Removing src/enet/protocol.o Removing src/enet/unix.o Removing src/enet/win32.o Removing src/engine/3dgui.o Removing src/engine/bih.o Removing src/engine/blend.o Removing src/engine/blob.o Removing src/engine/client.o Removing src/engine/command-standalone.o Removing src/engine/engine.h.gch Removing src/mod/chatserver/chatserver.o Removing src/mod/quirks/glibc/compat.o Removing src/mod/quirks/mingw-w64/strtok_r.o Removing src/mod/strtool-standalone.o Removing src/mod/wcversion.h Removing src/shared/crypto-standalone.o Removing src/shared/crypto.o Removing src/shared/cube.h.gch Removing src/shared/geom.o Removing src/shared/stream-standalone.o Removing src/shared/stream.o Removing src/shared/tools-standalone.o Removing src/shared/tools.o Removing src/shared/zip.o Removing src/vcpp/mingw.res Removing src/wc_chat_server From github.com:tpoechtrager/wc-ng b51b15c..f703aa2 master -> origin/master c56b755..8ff11f7 sdl2 -> origin/sdl2 Updating b51b15c..f703aa2 Fast-forward README.md | 4 +- src/build.sh | 35 ++++++-- src/engine/main.cpp | 2 + src/engine/physics.cpp | 8 +- src/engine/serverbrowser.cpp | 7 +- src/engine/sound.cpp | 2 +- src/fpsgame/ai.cpp | 3 +- src/fpsgame/scoreboard.cpp | 15 ++-- src/last_sauer_svn_rev.h | 2 +- src/lib/darwin/llvm-lto/libGeoIP.a | Bin 711744 -> 713968 bytes src/lib/darwin/llvm-lto/libSDL.a | Bin 2177344 -> 2160704 bytes src/lib/darwin/llvm-lto/libSDL_image.a | Bin 81664 -> 97840 bytes src/lib/darwin/llvm-lto/libSDL_mixer.a | Bin 227552 -> 243280 bytes src/lib/darwin/llvm-lto/libcrypto.a | Bin 8109248 -> 8214136 bytes src/lib/darwin/llvm-lto/libcurl.a | Bin 2567296 -> 2559600 bytes src/lib/darwin/llvm-lto/libjpeg.a | Bin 1233952 -> 1356624 bytes src/lib/darwin/llvm-lto/libogg.a | Bin 71744 -> 81984 bytes src/lib/darwin/llvm-lto/libpng16.a | Bin 1068048 -> 1097824 bytes src/lib/darwin/llvm-lto/libssl.a | Bin 1644272 -> 1623744 bytes src/lib/darwin/llvm-lto/libvorbis.a | Bin 821808 -> 875872 bytes src/lib/darwin/llvm-lto/libvorbisfile.a | Bin 107184 -> 111328 bytes src/lib/darwin/llvm-lto/libz.a | Bin 370144 -> 433152 bytes src/lib/darwin/llvm-lto/smc.a | Bin 12576 -> 15968 bytes src/lib/freebsd/amd64/llvm-lto/libGeoIP.a | Bin 359090 -> 359634 bytes src/lib/freebsd/amd64/llvm-lto/libSDL.a | Bin 930328 -> 1015624 bytes src/lib/freebsd/amd64/llvm-lto/libSDL_image.a | Bin 45352 -> 48988 bytes src/lib/freebsd/amd64/llvm-lto/libSDL_mixer.a | Bin 118122 -> 124930 bytes src/lib/freebsd/amd64/llvm-lto/libcrypto.a | Bin 4111556 -> 4147716 bytes src/lib/freebsd/amd64/llvm-lto/libcurl.a | Bin 1294618 -> 1299458 bytes src/lib/freebsd/amd64/llvm-lto/libjpeg.a | Bin 618168 -> 682452 bytes src/lib/freebsd/amd64/llvm-lto/libogg.a | Bin 35558 -> 40806 bytes src/lib/freebsd/amd64/llvm-lto/libpng16.a | Bin 535078 -> 550278 bytes src/lib/freebsd/amd64/llvm-lto/libssl.a | Bin 820002 -> 812794 bytes src/lib/freebsd/amd64/llvm-lto/libvorbis.a | Bin 334768 -> 449956 bytes src/lib/freebsd/amd64/llvm-lto/libvorbisfile.a | Bin 41056 -> 55008 bytes src/lib/freebsd/amd64/llvm-lto/libz.a | Bin 192126 -> 224750 bytes src/lib/linux/i686/llvm-lto/libGeoIP.a | Bin 420906 -> 377970 bytes src/lib/linux/i686/llvm-lto/libSDL.a | Bin 1071364 -> 1057936 bytes src/lib/linux/i686/llvm-lto/libSDL_image.a | Bin 42380 -> 43988 bytes src/lib/linux/i686/llvm-lto/libSDL_mixer.a | Bin 109586 -> 113434 bytes src/lib/linux/i686/llvm-lto/libcrypto.a | Bin 13903848 -> 12439344 bytes src/lib/linux/i686/llvm-lto/libcurl.a | Bin 1255958 -> 1253642 bytes src/lib/linux/i686/llvm-lto/libjpeg.a | Bin 599088 -> 616704 bytes src/lib/linux/i686/llvm-lto/libogg.a | Bin 34726 -> 35714 bytes src/lib/linux/i686/llvm-lto/libpng16.a | Bin 471166 -> 477506 bytes src/lib/linux/i686/llvm-lto/libsensors.a | Bin 101010 -> 104118 bytes src/lib/linux/i686/llvm-lto/libssl.a | Bin 4189446 -> 3530062 bytes src/lib/linux/i686/llvm-lto/libvorbis.a | Bin 314040 -> 343356 bytes src/lib/linux/i686/llvm-lto/libvorbisfile.a | Bin 39088 -> 46556 bytes src/lib/linux/i686/llvm-lto/libz.a | Bin 183574 -> 200090 bytes src/lib/linux/x86_64/llvm-lto/libGeoIP.a | Bin 425246 -> 381122 bytes src/lib/linux/x86_64/llvm-lto/libSDL.a | Bin 1076992 -> 1106140 bytes src/lib/linux/x86_64/llvm-lto/libSDL_image.a | Bin 44032 -> 47624 bytes src/lib/linux/x86_64/llvm-lto/libSDL_mixer.a | Bin 113966 -> 120966 bytes src/lib/linux/x86_64/llvm-lto/libcrypto.a | Bin 4023212 -> 4068316 bytes src/lib/linux/x86_64/llvm-lto/libcurl.a | Bin 1285950 -> 1292346 bytes src/lib/linux/x86_64/llvm-lto/libjpeg.a | Bin 613580 -> 677972 bytes src/lib/linux/x86_64/llvm-lto/libogg.a | Bin 35226 -> 40474 bytes src/lib/linux/x86_64/llvm-lto/libpng16.a | Bin 532822 -> 548138 bytes src/lib/linux/x86_64/llvm-lto/libsensors.a | Bin 106634 -> 111770 bytes src/lib/linux/x86_64/llvm-lto/libssl.a | Bin 818494 -> 811362 bytes src/lib/linux/x86_64/llvm-lto/libvorbis.a | Bin 333204 -> 451664 bytes src/lib/linux/x86_64/llvm-lto/libvorbisfile.a | Bin 40780 -> 54776 bytes src/lib/linux/x86_64/llvm-lto/libz.a | Bin 191102 -> 223706 bytes src/lib/win/i686/llvm-lto/libGeoIP.a | Bin 352068 -> 350056 bytes src/lib/win/i686/llvm-lto/libSDL.a | Bin 746514 -> 745090 bytes src/lib/win/i686/llvm-lto/libSDL_image.a | Bin 44568 -> 44456 bytes src/lib/win/i686/llvm-lto/libSDL_mixer.a | Bin 111702 -> 113472 bytes src/lib/win/i686/llvm-lto/libcrypto.a | Bin 3819240 -> 3753938 bytes src/lib/win/i686/llvm-lto/libcurl.a | Bin 1209168 -> 1210160 bytes src/lib/win/i686/llvm-lto/libdl.a | Bin 4344 -> 4420 bytes src/lib/win/i686/llvm-lto/libjpeg.a | Bin 604420 -> 616064 bytes src/lib/win/i686/llvm-lto/libogg.a | Bin 34926 -> 34320 bytes src/lib/win/i686/llvm-lto/libpng16.a | Bin 473292 -> 469080 bytes src/lib/win/i686/llvm-lto/libssl.a | Bin 800792 -> 774204 bytes src/lib/win/i686/llvm-lto/libvorbis.a | Bin 315108 -> 338080 bytes src/lib/win/i686/llvm-lto/libvorbisfile.a | Bin 39256 -> 45992 bytes src/lib/win/i686/llvm-lto/libz.a | Bin 183512 -> 199420 bytes src/lib/win/x86_64/llvm-lto/libGeoIP.a | Bin 356922 -> 353376 bytes src/lib/win/x86_64/llvm-lto/libSDL.a | Bin 736640 -> 771390 bytes src/lib/win/x86_64/llvm-lto/libSDL_image.a | Bin 46336 -> 48424 bytes src/lib/win/x86_64/llvm-lto/libSDL_mixer.a | Bin 115934 -> 120880 bytes src/lib/win/x86_64/llvm-lto/libcrypto.a | Bin 4161432 -> 4111214 bytes src/lib/win/x86_64/llvm-lto/libcurl.a | Bin 1218786 -> 1228540 bytes src/lib/win/x86_64/llvm-lto/libdl.a | Bin 4832 -> 4816 bytes src/lib/win/x86_64/llvm-lto/libjpeg.a | Bin 613640 -> 675932 bytes src/lib/win/x86_64/llvm-lto/libogg.a | Bin 35254 -> 39424 bytes src/lib/win/x86_64/llvm-lto/libpng16.a | Bin 534558 -> 540732 bytes src/lib/win/x86_64/llvm-lto/libssl.a | Bin 830050 -> 804304 bytes src/lib/win/x86_64/llvm-lto/libvorbis.a | Bin 336492 -> 446816 bytes src/lib/win/x86_64/llvm-lto/libvorbisfile.a | Bin 41284 -> 54548 bytes src/lib/win/x86_64/llvm-lto/libz.a | Bin 189176 -> 221848 bytes src/mod/chat.cpp | 6 +- src/mod/demorecorder.cpp | 20 +++-- src/mod/extinfo.cpp | 14 +-- src/mod/extinfo.h | 5 +- src/mod/geoip.cpp | 119 ++++++++++++------------- src/mod/geoip.h | 10 +-- src/mod/http.cpp | 5 +- src/mod/mod.h | 83 +++++++++-------- src/mod/thread.h | 5 +- src/scripts/menu/config/wcmenu.cfg | 13 ++- src/shared/command.h | 2 +- src/shared/stream.cpp | 5 ++ src/shared/tools.cpp | 10 +-- src/shared/tools.h | 11 +-- 106 files changed, 203 insertions(+), 183 deletions(-) mode change 100755 => 100644 src/lib/darwin/llvm-lto/libz.a Switched to branch 'sdl2' Your branch is behind 'origin/sdl2' by 10 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Removing src/build/.cache/ Removing src/build/checklto/test Removing src/build/cpucount Removing src/build/ld Removing src/build/wcversion Removing src/mod/quirks/mingw-w64/strtok_r.o Removing src/vcpp/mingw.res From github.com:tpoechtrager/wc-ng * branch sdl2 -> FETCH_HEAD Updating c56b755..8ff11f7 Fast-forward README.md | 4 +- src/build.sh | 35 ++++++-- src/engine/main.cpp | 2 + src/engine/physics.cpp | 8 +- src/engine/serverbrowser.cpp | 7 +- src/engine/sound.cpp | 2 +- src/fpsgame/ai.cpp | 3 +- src/fpsgame/scoreboard.cpp | 15 ++-- src/last_sauer_svn_rev.h | 2 +- src/lib/darwin/llvm-lto/libGeoIP.a | Bin 711744 -> 713968 bytes src/lib/darwin/llvm-lto/libSDL.a | Bin 0 -> 2160704 bytes src/lib/darwin/llvm-lto/libSDL_image.a | Bin 0 -> 97840 bytes src/lib/darwin/llvm-lto/libSDL_mixer.a | Bin 0 -> 243280 bytes src/lib/darwin/llvm-lto/libcrypto.a | Bin 8109248 -> 8214136 bytes src/lib/darwin/llvm-lto/libcurl.a | Bin 2567296 -> 2559600 bytes src/lib/darwin/llvm-lto/libjpeg.a | Bin 1233952 -> 1356624 bytes src/lib/darwin/llvm-lto/libogg.a | Bin 71744 -> 81984 bytes src/lib/darwin/llvm-lto/libpng16.a | Bin 1068048 -> 1097824 bytes src/lib/darwin/llvm-lto/libssl.a | Bin 1644272 -> 1623744 bytes src/lib/darwin/llvm-lto/libvorbis.a | Bin 821808 -> 875872 bytes src/lib/darwin/llvm-lto/libvorbisfile.a | Bin 107184 -> 111328 bytes src/lib/darwin/llvm-lto/libz.a | Bin 370144 -> 433152 bytes src/lib/darwin/llvm-lto/smc.a | Bin 12576 -> 15968 bytes src/lib/darwin/native/libSDL2.a | Bin 2376184 -> 2368336 bytes src/lib/darwin/native/libSDL2_image.a | Bin 128752 -> 130600 bytes src/lib/darwin/native/libSDL2_mixer.a | Bin 160440 -> 156376 bytes src/lib/freebsd/amd64/llvm-lto/libGeoIP.a | Bin 359090 -> 359634 bytes src/lib/freebsd/amd64/llvm-lto/libSDL.a | Bin 0 -> 1015624 bytes src/lib/freebsd/amd64/llvm-lto/libSDL2.a | Bin 1829298 -> 1914106 bytes src/lib/freebsd/amd64/llvm-lto/libSDL2_image.a | Bin 130474 -> 158058 bytes src/lib/freebsd/amd64/llvm-lto/libSDL2_mixer.a | Bin 114986 -> 121842 bytes src/lib/freebsd/amd64/llvm-lto/libSDL_image.a | Bin 0 -> 48988 bytes src/lib/freebsd/amd64/llvm-lto/libSDL_mixer.a | Bin 0 -> 124930 bytes src/lib/freebsd/amd64/llvm-lto/libcrypto.a | Bin 4111556 -> 4147716 bytes src/lib/freebsd/amd64/llvm-lto/libcurl.a | Bin 1294618 -> 1299458 bytes src/lib/freebsd/amd64/llvm-lto/libjpeg.a | Bin 618168 -> 682452 bytes src/lib/freebsd/amd64/llvm-lto/libogg.a | Bin 35558 -> 40806 bytes src/lib/freebsd/amd64/llvm-lto/libpng16.a | Bin 535078 -> 550278 bytes src/lib/freebsd/amd64/llvm-lto/libssl.a | Bin 820002 -> 812794 bytes src/lib/freebsd/amd64/llvm-lto/libvorbis.a | Bin 334768 -> 449956 bytes src/lib/freebsd/amd64/llvm-lto/libvorbisfile.a | Bin 41056 -> 55008 bytes src/lib/freebsd/amd64/llvm-lto/libz.a | Bin 192126 -> 224750 bytes src/lib/linux/i686/llvm-lto/libGeoIP.a | Bin 420906 -> 377970 bytes src/lib/linux/i686/llvm-lto/libSDL.a | Bin 0 -> 1057936 bytes src/lib/linux/i686/llvm-lto/libSDL2.a | Bin 1843774 -> 1875198 bytes src/lib/linux/i686/llvm-lto/libSDL2_image.a | Bin 128826 -> 135890 bytes src/lib/linux/i686/llvm-lto/libSDL2_mixer.a | Bin 109274 -> 113234 bytes src/lib/linux/i686/llvm-lto/libSDL_image.a | Bin 0 -> 43988 bytes src/lib/linux/i686/llvm-lto/libSDL_mixer.a | Bin 0 -> 113434 bytes src/lib/linux/i686/llvm-lto/libcrypto.a | Bin 13903848 -> 12439344 bytes src/lib/linux/i686/llvm-lto/libcurl.a | Bin 1255958 -> 1253642 bytes src/lib/linux/i686/llvm-lto/libjpeg.a | Bin 599088 -> 616704 bytes src/lib/linux/i686/llvm-lto/libogg.a | Bin 34726 -> 35714 bytes src/lib/linux/i686/llvm-lto/libpng16.a | Bin 471166 -> 477506 bytes src/lib/linux/i686/llvm-lto/libsensors.a | Bin 101010 -> 104118 bytes src/lib/linux/i686/llvm-lto/libssl.a | Bin 4189446 -> 3530062 bytes src/lib/linux/i686/llvm-lto/libvorbis.a | Bin 314040 -> 343356 bytes src/lib/linux/i686/llvm-lto/libvorbisfile.a | Bin 39088 -> 46556 bytes src/lib/linux/i686/llvm-lto/libz.a | Bin 183574 -> 200090 bytes src/lib/linux/x86_64/llvm-lto/libGeoIP.a | Bin 425246 -> 381122 bytes src/lib/linux/x86_64/llvm-lto/libSDL.a | Bin 0 -> 1106140 bytes src/lib/linux/x86_64/llvm-lto/libSDL2.a | Bin 1876610 -> 1968046 bytes src/lib/linux/x86_64/llvm-lto/libSDL2_image.a | Bin 129334 -> 156898 bytes src/lib/linux/x86_64/llvm-lto/libSDL2_mixer.a | Bin 111290 -> 118338 bytes src/lib/linux/x86_64/llvm-lto/libSDL_image.a | Bin 0 -> 47624 bytes src/lib/linux/x86_64/llvm-lto/libSDL_mixer.a | Bin 0 -> 120966 bytes src/lib/linux/x86_64/llvm-lto/libcrypto.a | Bin 4023212 -> 4068316 bytes src/lib/linux/x86_64/llvm-lto/libcurl.a | Bin 1285950 -> 1292346 bytes src/lib/linux/x86_64/llvm-lto/libjpeg.a | Bin 613580 -> 677972 bytes src/lib/linux/x86_64/llvm-lto/libogg.a | Bin 35226 -> 40474 bytes src/lib/linux/x86_64/llvm-lto/libpng16.a | Bin 532822 -> 548138 bytes src/lib/linux/x86_64/llvm-lto/libsensors.a | Bin 106634 -> 111770 bytes src/lib/linux/x86_64/llvm-lto/libssl.a | Bin 818494 -> 811362 bytes src/lib/linux/x86_64/llvm-lto/libvorbis.a | Bin 333204 -> 451664 bytes src/lib/linux/x86_64/llvm-lto/libvorbisfile.a | Bin 40780 -> 54776 bytes src/lib/linux/x86_64/llvm-lto/libz.a | Bin 191102 -> 223706 bytes src/lib/win/i686/llvm-lto/libGeoIP.a | Bin 352068 -> 350056 bytes src/lib/win/i686/llvm-lto/libSDL.a | Bin 0 -> 745090 bytes src/lib/win/i686/llvm-lto/libSDL2.a | Bin 1691016 -> 1722832 bytes src/lib/win/i686/llvm-lto/libSDL2_image.a | Bin 130750 -> 135468 bytes src/lib/win/i686/llvm-lto/libSDL2_mixer.a | Bin 111654 -> 113532 bytes src/lib/win/i686/llvm-lto/libSDL_image.a | Bin 0 -> 44456 bytes src/lib/win/i686/llvm-lto/libSDL_mixer.a | Bin 0 -> 113472 bytes src/lib/win/i686/llvm-lto/libcrypto.a | Bin 3819240 -> 3753938 bytes src/lib/win/i686/llvm-lto/libcurl.a | Bin 1209168 -> 1210160 bytes src/lib/win/i686/llvm-lto/libdl.a | Bin 4344 -> 4420 bytes src/lib/win/i686/llvm-lto/libjpeg.a | Bin 604420 -> 616064 bytes src/lib/win/i686/llvm-lto/libogg.a | Bin 34926 -> 34320 bytes src/lib/win/i686/llvm-lto/libpng16.a | Bin 473292 -> 469080 bytes src/lib/win/i686/llvm-lto/libssl.a | Bin 800792 -> 774204 bytes src/lib/win/i686/llvm-lto/libvorbis.a | Bin 315108 -> 338080 bytes src/lib/win/i686/llvm-lto/libvorbisfile.a | Bin 39256 -> 45992 bytes src/lib/win/i686/llvm-lto/libz.a | Bin 183512 -> 199420 bytes src/lib/win/x86_64/llvm-lto/libGeoIP.a | Bin 356922 -> 353376 bytes src/lib/win/x86_64/llvm-lto/libSDL.a | Bin 0 -> 771390 bytes src/lib/win/x86_64/llvm-lto/libSDL2.a | Bin 1707924 -> 1795152 bytes src/lib/win/x86_64/llvm-lto/libSDL2_image.a | Bin 131714 -> 157204 bytes src/lib/win/x86_64/llvm-lto/libSDL2_mixer.a | Bin 113230 -> 118292 bytes src/lib/win/x86_64/llvm-lto/libSDL_image.a | Bin 0 -> 48424 bytes src/lib/win/x86_64/llvm-lto/libSDL_mixer.a | Bin 0 -> 120880 bytes src/lib/win/x86_64/llvm-lto/libcrypto.a | Bin 4161432 -> 4111214 bytes src/lib/win/x86_64/llvm-lto/libcurl.a | Bin 1218786 -> 1228540 bytes src/lib/win/x86_64/llvm-lto/libdl.a | Bin 4832 -> 4816 bytes src/lib/win/x86_64/llvm-lto/libjpeg.a | Bin 613640 -> 675932 bytes src/lib/win/x86_64/llvm-lto/libogg.a | Bin 35254 -> 39424 bytes src/lib/win/x86_64/llvm-lto/libpng16.a | Bin 534558 -> 540732 bytes src/lib/win/x86_64/llvm-lto/libssl.a | Bin 830050 -> 804304 bytes src/lib/win/x86_64/llvm-lto/libvorbis.a | Bin 336492 -> 446816 bytes src/lib/win/x86_64/llvm-lto/libvorbisfile.a | Bin 41284 -> 54548 bytes src/lib/win/x86_64/llvm-lto/libz.a | Bin 189176 -> 221848 bytes src/mod/chat.cpp | 6 +- src/mod/demorecorder.cpp | 20 +++-- src/mod/extinfo.cpp | 14 +-- src/mod/extinfo.h | 5 +- src/mod/geoip.cpp | 119 ++++++++++++------------- src/mod/geoip.h | 10 +-- src/mod/http.cpp | 5 +- src/mod/mod.h | 83 +++++++++-------- src/mod/thread.h | 5 +- src/scripts/menu/config/wcmenu.cfg | 13 ++- src/shared/command.h | 2 +- src/shared/stream.cpp | 5 ++ src/shared/tools.cpp | 10 +-- src/shared/tools.h | 11 +-- 124 files changed, 203 insertions(+), 183 deletions(-) create mode 100644 src/lib/darwin/llvm-lto/libSDL.a create mode 100644 src/lib/darwin/llvm-lto/libSDL_image.a create mode 100644 src/lib/darwin/llvm-lto/libSDL_mixer.a mode change 100755 => 100644 src/lib/darwin/llvm-lto/libz.a create mode 100644 src/lib/freebsd/amd64/llvm-lto/libSDL.a create mode 100644 src/lib/freebsd/amd64/llvm-lto/libSDL_image.a create mode 100644 src/lib/freebsd/amd64/llvm-lto/libSDL_mixer.a create mode 100644 src/lib/linux/i686/llvm-lto/libSDL.a create mode 100644 src/lib/linux/i686/llvm-lto/libSDL_image.a create mode 100644 src/lib/linux/i686/llvm-lto/libSDL_mixer.a create mode 100644 src/lib/linux/x86_64/llvm-lto/libSDL.a create mode 100644 src/lib/linux/x86_64/llvm-lto/libSDL_image.a create mode 100644 src/lib/linux/x86_64/llvm-lto/libSDL_mixer.a create mode 100644 src/lib/win/i686/llvm-lto/libSDL.a create mode 100644 src/lib/win/i686/llvm-lto/libSDL_image.a create mode 100644 src/lib/win/i686/llvm-lto/libSDL_mixer.a create mode 100644 src/lib/win/x86_64/llvm-lto/libSDL.a create mode 100644 src/lib/win/x86_64/llvm-lto/libSDL_image.a create mode 100644 src/lib/win/x86_64/llvm-lto/libSDL_mixer.a