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/mod/quirks/mingw-w64/strtok_r.o Removing src/vcpp/mingw.res From github.com:tpoechtrager/wc-ng f703aa2..a21ee39 master -> origin/master 8ff11f7..829d2ed sdl2 -> origin/sdl2 Updating f703aa2..a21ee39 Fast-forward ChangeLog | 1 + README.md | 7 +- src/TODO | 3 + src/fpsgame/render.cpp | 7 +- src/include/GeoIP/GeoIP.h | 2 +- src/lib/darwin/llvm-lto/libGeoIP.a | Bin 713968 -> 715424 bytes src/lib/darwin/native/libGeoIP.a | Bin 650280 -> 646296 bytes src/lib/freebsd/amd64/llvm-lto/libGeoIP.a | Bin 359634 -> 360314 bytes src/lib/freebsd/amd64/native/libGeoIP.a | Bin 442278 -> 442678 bytes src/lib/linux/i686/llvm-lto/libGeoIP.a | Bin 377970 -> 378822 bytes src/lib/linux/i686/native/libGeoIP.a | Bin 465638 -> 353658 bytes src/lib/linux/x86_64/llvm-lto/libGeoIP.a | Bin 381122 -> 381814 bytes src/lib/linux/x86_64/native/libGeoIP.a | Bin 550070 -> 374190 bytes src/lib/win/i686/llvm-lto/libGeoIP.a | Bin 350056 -> 350988 bytes src/lib/win/i686/native/libGeoIP.a | Bin 300644 -> 250794 bytes src/lib/win/x86_64/llvm-lto/libGeoIP.a | Bin 353376 -> 354232 bytes src/lib/win/x86_64/native/libGeoIP.a | Bin 320412 -> 263966 bytes src/mod/extinfo-playerpreview.cpp | 48 +- src/mod/geoip.cpp | 7 +- src/plugins/hwtemp/hwtemp.cpp | 2 +- src/plugins/hwtemp/linux.cpp | 8 +- src/scripts/lib-build-scripts/README.md | 59 +++ src/scripts/lib-build-scripts/build.sh | 26 + src/scripts/lib-build-scripts/common/build_all.sh | 45 ++ .../lib-build-scripts/common/build_osx_fat.sh | 44 ++ src/scripts/lib-build-scripts/common/common.inc.sh | 590 +++++++++++++++++++++ src/scripts/lib-build-scripts/common/copy-lib.sh | 94 ++++ src/scripts/lib-build-scripts/common/cpucount.c | 81 +++ .../lib-build-scripts/common/get_cpu_count.sh | 16 + src/scripts/lib-build-scripts/curl/build.sh | 42 ++ src/scripts/lib-build-scripts/dlfcn-win32/build.sh | 24 + .../dlfcn-win32/patches/dlfcn.patch | 29 + src/scripts/lib-build-scripts/geoip/build.sh | 27 + .../geoip/patches/geoip-libs_only.patch | 15 + .../geoip/patches/geoip-malloc.patch | 13 + src/scripts/lib-build-scripts/openssl/build.sh | 74 +++ src/scripts/lib-build-scripts/sdl-1.2/build.sh | 214 ++++++++ .../sdl-1.2/patches/ogg-configure.patch | 29 + .../sdl-1.2/patches/ogg-osx-cflags.patch | 13 + .../sdl-1.2/patches/png-warning.patch | 13 + .../sdl-1.2/patches/sdl-xdata32.patch | 58 ++ .../sdl-1.2/patches/vorbis-configure.patch | 54 ++ .../sdl-1.2/patches/vorbis-osx.patch | 13 + src/scripts/lib-build-scripts/sdl-2.0 | 1 + src/scripts/lib-build-scripts/sensors/build.sh | 21 + src/scripts/menu/config/wcmenu.cfg | 18 +- src/shared/tools.cpp | 2 + src/shared/tools.h | 2 + 48 files changed, 1675 insertions(+), 27 deletions(-) create mode 100644 src/scripts/lib-build-scripts/README.md create mode 100755 src/scripts/lib-build-scripts/build.sh create mode 100755 src/scripts/lib-build-scripts/common/build_all.sh create mode 100755 src/scripts/lib-build-scripts/common/build_osx_fat.sh create mode 100644 src/scripts/lib-build-scripts/common/common.inc.sh create mode 100755 src/scripts/lib-build-scripts/common/copy-lib.sh create mode 100644 src/scripts/lib-build-scripts/common/cpucount.c create mode 100755 src/scripts/lib-build-scripts/common/get_cpu_count.sh create mode 100755 src/scripts/lib-build-scripts/curl/build.sh create mode 100755 src/scripts/lib-build-scripts/dlfcn-win32/build.sh create mode 100644 src/scripts/lib-build-scripts/dlfcn-win32/patches/dlfcn.patch create mode 100755 src/scripts/lib-build-scripts/geoip/build.sh create mode 100644 src/scripts/lib-build-scripts/geoip/patches/geoip-libs_only.patch create mode 100644 src/scripts/lib-build-scripts/geoip/patches/geoip-malloc.patch create mode 100755 src/scripts/lib-build-scripts/openssl/build.sh create mode 100755 src/scripts/lib-build-scripts/sdl-1.2/build.sh create mode 100644 src/scripts/lib-build-scripts/sdl-1.2/patches/ogg-configure.patch create mode 100644 src/scripts/lib-build-scripts/sdl-1.2/patches/ogg-osx-cflags.patch create mode 100644 src/scripts/lib-build-scripts/sdl-1.2/patches/png-warning.patch create mode 100644 src/scripts/lib-build-scripts/sdl-1.2/patches/sdl-xdata32.patch create mode 100644 src/scripts/lib-build-scripts/sdl-1.2/patches/vorbis-configure.patch create mode 100644 src/scripts/lib-build-scripts/sdl-1.2/patches/vorbis-osx.patch create mode 120000 src/scripts/lib-build-scripts/sdl-2.0 create mode 100755 src/scripts/lib-build-scripts/sensors/build.sh Already on 'master' Your branch is up-to-date with 'origin/master'. Removing src/build/checklto/test Removing src/build/cpucount Removing src/build/wcversion From github.com:tpoechtrager/wc-ng a21ee39..b2a41db master -> origin/master 829d2ed..feb8948 sdl2 -> origin/sdl2 Updating a21ee39..b2a41db Fast-forward src/fpsgame/render.cpp | 1 + 1 file changed, 1 insertion(+) Switched to branch 'sdl2' Your branch is behind 'origin/sdl2' by 13 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 8ff11f7..feb8948 Fast-forward ChangeLog | 1 + README.md | 7 +- src/TODO | 3 + src/fpsgame/render.cpp | 6 +- src/include/GeoIP/GeoIP.h | 2 +- src/lib/darwin/llvm-lto/libGeoIP.a | Bin 713968 -> 715424 bytes src/lib/darwin/native/libGeoIP.a | Bin 650280 -> 646296 bytes src/lib/freebsd/amd64/llvm-lto/libGeoIP.a | Bin 359634 -> 360314 bytes src/lib/freebsd/amd64/native/libGeoIP.a | Bin 442278 -> 442678 bytes src/lib/linux/i686/llvm-lto/libGeoIP.a | Bin 377970 -> 378822 bytes src/lib/linux/i686/native/libGeoIP.a | Bin 465638 -> 353658 bytes src/lib/linux/x86_64/llvm-lto/libGeoIP.a | Bin 381122 -> 381814 bytes src/lib/linux/x86_64/native/libGeoIP.a | Bin 550070 -> 374190 bytes src/lib/win/i686/llvm-lto/libGeoIP.a | Bin 350056 -> 350988 bytes src/lib/win/i686/native/libGeoIP.a | Bin 300644 -> 250794 bytes src/lib/win/x86_64/llvm-lto/libGeoIP.a | Bin 353376 -> 354232 bytes src/lib/win/x86_64/native/libGeoIP.a | Bin 320412 -> 263966 bytes src/mod/extinfo-playerpreview.cpp | 48 +- src/mod/geoip.cpp | 7 +- src/plugins/hwtemp/hwtemp.cpp | 2 +- src/plugins/hwtemp/linux.cpp | 8 +- src/scripts/lib-build-scripts/README.md | 59 +++ src/scripts/lib-build-scripts/build.sh | 26 + src/scripts/lib-build-scripts/common/build_all.sh | 45 ++ .../lib-build-scripts/common/build_osx_fat.sh | 44 ++ src/scripts/lib-build-scripts/common/common.inc.sh | 590 +++++++++++++++++++++ src/scripts/lib-build-scripts/common/copy-lib.sh | 94 ++++ src/scripts/lib-build-scripts/common/cpucount.c | 81 +++ .../lib-build-scripts/common/get_cpu_count.sh | 16 + src/scripts/lib-build-scripts/curl/build.sh | 42 ++ src/scripts/lib-build-scripts/dlfcn-win32/build.sh | 24 + .../dlfcn-win32/patches/dlfcn.patch | 29 + src/scripts/lib-build-scripts/geoip/build.sh | 27 + .../geoip/patches/geoip-libs_only.patch | 15 + .../geoip/patches/geoip-malloc.patch | 13 + src/scripts/lib-build-scripts/openssl/build.sh | 74 +++ src/scripts/lib-build-scripts/sdl-1.2/build.sh | 214 ++++++++ .../sdl-1.2/patches/ogg-configure.patch | 29 + .../sdl-1.2/patches/ogg-osx-cflags.patch | 13 + .../sdl-1.2/patches/png-warning.patch | 13 + .../sdl-1.2/patches/sdl-xdata32.patch | 58 ++ .../sdl-1.2/patches/vorbis-configure.patch | 54 ++ .../sdl-1.2/patches/vorbis-osx.patch | 13 + src/scripts/lib-build-scripts/sdl-2.0 | 1 + src/scripts/lib-build-scripts/sensors/build.sh | 21 + src/scripts/menu/config/wcmenu.cfg | 18 +- src/shared/tools.cpp | 2 + src/shared/tools.h | 2 + 48 files changed, 1675 insertions(+), 26 deletions(-) create mode 100644 src/scripts/lib-build-scripts/README.md create mode 100755 src/scripts/lib-build-scripts/build.sh create mode 100755 src/scripts/lib-build-scripts/common/build_all.sh create mode 100755 src/scripts/lib-build-scripts/common/build_osx_fat.sh create mode 100644 src/scripts/lib-build-scripts/common/common.inc.sh create mode 100755 src/scripts/lib-build-scripts/common/copy-lib.sh create mode 100644 src/scripts/lib-build-scripts/common/cpucount.c create mode 100755 src/scripts/lib-build-scripts/common/get_cpu_count.sh create mode 100755 src/scripts/lib-build-scripts/curl/build.sh create mode 100755 src/scripts/lib-build-scripts/dlfcn-win32/build.sh create mode 100644 src/scripts/lib-build-scripts/dlfcn-win32/patches/dlfcn.patch create mode 100755 src/scripts/lib-build-scripts/geoip/build.sh create mode 100644 src/scripts/lib-build-scripts/geoip/patches/geoip-libs_only.patch create mode 100644 src/scripts/lib-build-scripts/geoip/patches/geoip-malloc.patch create mode 100755 src/scripts/lib-build-scripts/openssl/build.sh create mode 100755 src/scripts/lib-build-scripts/sdl-1.2/build.sh create mode 100644 src/scripts/lib-build-scripts/sdl-1.2/patches/ogg-configure.patch create mode 100644 src/scripts/lib-build-scripts/sdl-1.2/patches/ogg-osx-cflags.patch create mode 100644 src/scripts/lib-build-scripts/sdl-1.2/patches/png-warning.patch create mode 100644 src/scripts/lib-build-scripts/sdl-1.2/patches/sdl-xdata32.patch create mode 100644 src/scripts/lib-build-scripts/sdl-1.2/patches/vorbis-configure.patch create mode 100644 src/scripts/lib-build-scripts/sdl-1.2/patches/vorbis-osx.patch create mode 120000 src/scripts/lib-build-scripts/sdl-2.0 create mode 100755 src/scripts/lib-build-scripts/sensors/build.sh