Skip to content

Commit

Permalink
- [toolchain] Remove most preloads
Browse files Browse the repository at this point in the history 
 - [asio] Fix issue when SSL is disabled
  • Loading branch information
@hbirchtree
hbirchtree committed Apr 5, 2020
1 parent 4d5b732 commit b967937
Show file tree
Hide file tree
Showing 22 changed files with 107 additions and 85 deletions.
2 changes: 2 additions & 0 deletions src/coffee/asio/include/coffee/asio/tcp_socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ using service_t = std::string;

namespace tcp {

#if defined(ASIO_USE_SSL)
struct ssl_socket
{
using lowest_layer = socket_types::ssl::lowest_layer_type;
Expand Down Expand Up @@ -115,6 +116,7 @@ struct ssl_socket
asio::ip::tcp::resolver& m_resolver;
socket_types::ssl m_socket;
};
#endif

struct raw_socket
{
Expand Down
2 changes: 1 addition & 1 deletion src/libs/asio
Submodule asio updated 982 files
2 changes: 0 additions & 2 deletions toolchain/cmake/Preload/docs-all.cmake
View file

This file was deleted.

4 changes: 0 additions & 4 deletions toolchain/cmake/Preload/gamecube.cmake
View file

This file was deleted.

7 changes: 0 additions & 7 deletions toolchain/cmake/Preload/js-emscripten-wasm.cmake
View file

This file was deleted.

6 changes: 0 additions & 6 deletions toolchain/cmake/Preload/js-emscripten.cmake
View file

This file was deleted.

7 changes: 0 additions & 7 deletions toolchain/cmake/Preload/linux-coverage.cmake
View file

This file was deleted.

2 changes: 0 additions & 2 deletions toolchain/cmake/Preload/linux-fedora.cmake
View file

This file was deleted.

1 change: 0 additions & 1 deletion toolchain/cmake/Preload/linux-generic.cmake
View file

This file was deleted.

1 change: 0 additions & 1 deletion toolchain/cmake/Preload/linux-gles.cmake
View file

This file was deleted.

3 changes: 0 additions & 3 deletions toolchain/cmake/Preload/linux-gles20.cmake
View file

This file was deleted.

4 changes: 0 additions & 4 deletions toolchain/cmake/Preload/linux-maemo.cmake
View file

This file was deleted.

3 changes: 0 additions & 3 deletions toolchain/cmake/Preload/linux-raspberry.cmake
View file

This file was deleted.

1 change: 0 additions & 1 deletion toolchain/cmake/Preload/linux-steam.cmake
View file

This file was deleted.

1 change: 0 additions & 1 deletion toolchain/cmake/Preload/linux-vr.cmake
View file

This file was deleted.

Empty file removed toolchain/cmake/Preload/osx-generic.cmake
View file
Empty file.
Empty file removed toolchain/cmake/Preload/osx-ios.cmake
View file
Empty file.
2 changes: 0 additions & 2 deletions toolchain/cmake/Preload/windows-generic.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
set ( BUILD_OPENVR ON CACHE BOOL "" )

set ( OPENSSL_ROOT_DIR "C:/OpenSSL-Win64" CACHE PATH "" )
set ( OPENSSL_SSL_LIBRARY "C:/OpenSSL-Win64/lib/libssl.lib" CACHE FILEPATH "" )
set ( OPENSSL_CRYPTO_LIBRARY "C:/OpenSSL-Win64/lib/libcrypto.lib" CACHE FILEPATH "" )
2 changes: 0 additions & 2 deletions toolchain/cmake/Preload/windows-mingw64.cmake
View file

This file was deleted.

79 changes: 62 additions & 17 deletions toolchain/makers/Makefile.linux
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1291,15 +1291,20 @@ coverage: FORCE
make -f $(ROOT_DIR)/$(RUNNER) multi.twostage \
-e EXTRA_OPTIONS=" \
$(CMAKE_SOURCE_DIR) \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-coverage.cmake \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_ASAN=ON \
-DBUILD_ASSIMP=ON \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_CPP14=ON \
-DBUILD_COVERAGE=ON \
-DBUILD_EXAMPLES=OFF \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/coverage \
-DCMAKE_TOOLCHAIN_FILE=$(CMAKE_SOURCE_DIR)/toolchain/cmake/Toolchains/linux-generic_linux.toolchain.cmake \
-DGIT_DEP_BUILDVARIANT=ubuntu.amd64 \
-DSKIP_GRAPHIC_TESTS=$(HEADLESS) \
-DSKIP_HIGHMEM_TESTS=ON \
-DSKIP_LINKAGE_TEST=ON \
-DSKIP_OPENVR_TEST=ON \
-G'CodeBlocks - Ninja'" \
-e DOCKER_EXTRA_OPTIONS=" \
\
Expand All @@ -1322,9 +1327,11 @@ docs: FORCE
make -f $(ROOT_DIR)/$(RUNNER) multi \
-e EXTRA_OPTIONS=" \
$(CMAKE_SOURCE_DIR) \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/docs-all.cmake \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_ASSIMP=ON \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_DOCS=ON \
-DBUILD_LIBRARIES=OFF \
-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/docs \
-DCMAKE_TOOLCHAIN_FILE=$(CMAKE_SOURCE_DIR)/toolchain/cmake/Toolchains/linux-generic_linux.toolchain.cmake \
Expand All @@ -1350,18 +1357,24 @@ emscripten.wasm: FORCE
make -f $(ROOT_DIR)/$(RUNNER) multi \
-e EXTRA_OPTIONS=" \
$(CMAKE_SOURCE_DIR) \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/js-emscripten-wasm.cmake \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_ASSIMP=OFF \
-DBUILD_AUDIO=OFF \
-DBUILD_AUDIO=OFF \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_GLES=ON \
-DBUILD_GLES=ON \
-DBUILD_GLES_20=ON \
-DBUILD_GLES_20=ON \
-DBUILD_OPENSSL=OFF \
-DBUILD_OPENSSL=OFF \
-DBUILD_SDL2=ON \
-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/emscripten.wasm \
-DCMAKE_TOOLCHAIN_FILE=/home/coffee/emsdk_portable/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \
-DEMSCRIPTEN_ROOT_PATH=/home/coffee/emsdk_portable/upstream/emscripten \
-DGENERATE_HTML=ON \
-DGENERATE_HTML=ON \
-DGIT_DEP_BUILDVARIANT=emscripten.wasm \
-DSKIP_GRAPHIC_TESTS=$(HEADLESS) \
-G'Ninja'" \
Expand All @@ -1386,18 +1399,24 @@ emscripten.wasm.shell: FORCE
make -f $(ROOT_DIR)/$(RUNNER) shell \
-e EXTRA_OPTIONS=" \
$(CMAKE_SOURCE_DIR) \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/js-emscripten-wasm.cmake \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_ASSIMP=OFF \
-DBUILD_AUDIO=OFF \
-DBUILD_AUDIO=OFF \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_GLES=ON \
-DBUILD_GLES=ON \
-DBUILD_GLES_20=ON \
-DBUILD_GLES_20=ON \
-DBUILD_OPENSSL=OFF \
-DBUILD_OPENSSL=OFF \
-DBUILD_SDL2=ON \
-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/emscripten.wasm \
-DCMAKE_TOOLCHAIN_FILE=/home/coffee/emsdk_portable/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \
-DEMSCRIPTEN_ROOT_PATH=/home/coffee/emsdk_portable/upstream/emscripten \
-DGENERATE_HTML=ON \
-DGENERATE_HTML=ON \
-DGIT_DEP_BUILDVARIANT=emscripten.wasm \
-DSKIP_GRAPHIC_TESTS=$(HEADLESS) \
-G'Ninja'" \
Expand All @@ -1422,12 +1441,14 @@ fedora.amd64: FORCE
make -f $(ROOT_DIR)/$(RUNNER) multi \
-e EXTRA_OPTIONS=" \
$(CMAKE_SOURCE_DIR) \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-fedora.cmake \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_ASSIMP=ON \
-DBUILD_ASSIMP=ON \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/fedora.amd64 \
-DCMAKE_TOOLCHAIN_FILE=$(CMAKE_SOURCE_DIR)/toolchain/cmake/Toolchains/linux-generic_linux.toolchain.cmake \
-DGENERATE_FLATPAK=ON \
-DGIT_DEP_BUILDVARIANT=fedora.amd64 \
-DSKIP_GRAPHIC_TESTS=$(HEADLESS) \
-G'CodeBlocks - Ninja'" \
Expand All @@ -1450,12 +1471,14 @@ fedora.amd64.shell: FORCE
make -f $(ROOT_DIR)/$(RUNNER) shell \
-e EXTRA_OPTIONS=" \
$(CMAKE_SOURCE_DIR) \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-fedora.cmake \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_ASSIMP=ON \
-DBUILD_ASSIMP=ON \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/fedora.amd64 \
-DCMAKE_TOOLCHAIN_FILE=$(CMAKE_SOURCE_DIR)/toolchain/cmake/Toolchains/linux-generic_linux.toolchain.cmake \
-DGENERATE_FLATPAK=ON \
-DGIT_DEP_BUILDVARIANT=fedora.amd64 \
-DSKIP_GRAPHIC_TESTS=$(HEADLESS) \
-G'CodeBlocks - Ninja'" \
Expand Down Expand Up @@ -1552,9 +1575,13 @@ maemo.armel: FORCE
make -f $(ROOT_DIR)/$(RUNNER) multi.make8 \
-e EXTRA_OPTIONS=" \
$(CMAKE_SOURCE_DIR) \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-maemo.cmake \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_ASIO=OFF \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_EGL=ON \
-DBUILD_GLES=ON \
-DBUILD_GLES_20=ON \
-DBUILD_SDL2=OFF \
-DBUILD_SDL2=OFF \
-DBUILD_X11=ON \
-DCMAKE_BUILD_TYPE=Release \
Expand Down Expand Up @@ -1585,9 +1612,13 @@ maemo.armel.shell: FORCE
make -f $(ROOT_DIR)/$(RUNNER) shell \
-e EXTRA_OPTIONS=" \
$(CMAKE_SOURCE_DIR) \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-maemo.cmake \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_ASIO=OFF \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_EGL=ON \
-DBUILD_GLES=ON \
-DBUILD_GLES_20=ON \
-DBUILD_SDL2=OFF \
-DBUILD_SDL2=OFF \
-DBUILD_X11=ON \
-DCMAKE_BUILD_TYPE=Release \
Expand Down Expand Up @@ -1618,8 +1649,10 @@ mingw.w64: FORCE
make -f $(ROOT_DIR)/$(RUNNER) multi \
-e EXTRA_OPTIONS=" \
$(CMAKE_SOURCE_DIR) \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/windows-mingw64.cmake \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_AUDIO=OFF \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_OPENSSL=OFF \
-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/mingw.w64 \
-DCMAKE_TOOLCHAIN_FILE=$(CMAKE_SOURCE_DIR)/toolchain/cmake/Toolchains/windows-mingw64_linux.toolchain.cmake \
Expand All @@ -1645,8 +1678,11 @@ raspberry.armhf: FORCE rpi-sdk
make -f $(ROOT_DIR)/$(RUNNER) multi \
-e EXTRA_OPTIONS=" \
$(CMAKE_SOURCE_DIR) \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-raspberry.cmake \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_GLES=ON \
-DBUILD_GLES_20=ON \
-DBUILD_OPENSSL=ON \
-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/raspberry.armhf \
-DCMAKE_TOOLCHAIN_FILE=$(CMAKE_SOURCE_DIR)/toolchain/cmake/Toolchains/linux-raspberry-armhf_linux.toolchain.cmake \
Expand All @@ -1673,8 +1709,11 @@ raspberry.armhf.shell: FORCE rpi-sdk
make -f $(ROOT_DIR)/$(RUNNER) shell \
-e EXTRA_OPTIONS=" \
$(CMAKE_SOURCE_DIR) \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-raspberry.cmake \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_GLES=ON \
-DBUILD_GLES_20=ON \
-DBUILD_OPENSSL=ON \
-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/raspberry.armhf \
-DCMAKE_TOOLCHAIN_FILE=$(CMAKE_SOURCE_DIR)/toolchain/cmake/Toolchains/linux-raspberry-armhf_linux.toolchain.cmake \
Expand All @@ -1701,7 +1740,8 @@ steam.amd64: FORCE
make -f $(ROOT_DIR)/$(RUNNER) multi \
-e EXTRA_OPTIONS=" \
$(CMAKE_SOURCE_DIR) \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-steam.cmake \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_ASSIMP=ON \
-DBUILD_ASSIMP=ON \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_CPP11=ON \
Expand Down Expand Up @@ -1732,7 +1772,8 @@ steam.amd64.shell: FORCE
make -f $(ROOT_DIR)/$(RUNNER) shell \
-e EXTRA_OPTIONS=" \
$(CMAKE_SOURCE_DIR) \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-steam.cmake \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_ASSIMP=ON \
-DBUILD_ASSIMP=ON \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_CPP11=ON \
Expand Down Expand Up @@ -1861,9 +1902,10 @@ ubuntu.amd64: FORCE
make -f $(ROOT_DIR)/$(RUNNER) multi \
-e EXTRA_OPTIONS=" \
$(CMAKE_SOURCE_DIR) \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-generic.cmake \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DAPPIMAGE_RUNTIME_BINARY=$(NATIVE_LIBRARY_DIR)/Ubuntu/util/x86_64-linux-gnu/runtime \
-DBUILD_ASSIMP=ON \
-DBUILD_ASSIMP=ON \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_DISCORD_RPC=ON \
-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
Expand Down Expand Up @@ -1893,9 +1935,10 @@ ubuntu.amd64.tools: FORCE
make -f $(ROOT_DIR)/$(RUNNER) multi \
-e EXTRA_OPTIONS=" \
$(CMAKE_SOURCE_DIR) \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-generic.cmake \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DAPPIMAGE_RUNTIME_BINARY=$(NATIVE_LIBRARY_DIR)/Ubuntu/util/x86_64-linux-gnu/runtime \
-DBUILD_ASSIMP=ON \
-DBUILD_ASSIMP=ON \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_DISCORD_RPC=ON \
-DBUILD_ETC2COMP=ON \
Expand Down Expand Up @@ -1934,11 +1977,13 @@ ubuntu.amd64.gles3: FORCE
make -f $(ROOT_DIR)/$(RUNNER) multi \
-e EXTRA_OPTIONS=" \
$(CMAKE_SOURCE_DIR) \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-gles.cmake \
-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DAPPIMAGE_RUNTIME_BINARY=$(NATIVE_LIBRARY_DIR)/Ubuntu/util/x86_64-linux-gnu/runtime \
-DBUILD_ASSIMP=ON \
-DBUILD_ASSIMP=ON \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_DISCORD_RPC=ON \
-DBUILD_GLES=ON \
-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/ubuntu.amd64.gles3 \
-DCMAKE_TOOLCHAIN_FILE=$(CMAKE_SOURCE_DIR)/toolchain/cmake/Toolchains/linux-generic_linux.toolchain.cmake \
Expand Down
10 changes: 5 additions & 5 deletions toolchain/makers/Makefile.mac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ios: FORCE
make -f $(ROOT_DIR)/Makefile.mac-base build \
-e EXTRA_OPTIONS=" \
$(SOURCE_DIR) \
-C$(SOURCE_DIR)/toolchain/cmake/Preload/osx-ios.cmake \
-C$(SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_EGL=ON \
-DBUILD_GLES=ON \
Expand All @@ -70,7 +70,7 @@ ios.x86_64: FORCE
make -f $(ROOT_DIR)/Makefile.mac-base build \
-e EXTRA_OPTIONS=" \
$(SOURCE_DIR) \
-C$(SOURCE_DIR)/toolchain/cmake/Preload/osx-ios.cmake \
-C$(SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_EGL=ON \
-DBUILD_GLES=ON \
Expand All @@ -95,7 +95,7 @@ ios.x86: FORCE
make -f $(ROOT_DIR)/Makefile.mac-base build \
-e EXTRA_OPTIONS=" \
$(SOURCE_DIR) \
-C$(SOURCE_DIR)/toolchain/cmake/Preload/osx-ios.cmake \
-C$(SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_EGL=ON \
-DBUILD_GLES=ON \
Expand All @@ -120,7 +120,7 @@ osx: FORCE
make -f $(ROOT_DIR)/Makefile.mac-base build \
-e EXTRA_OPTIONS=" \
$(SOURCE_DIR) \
-C$(SOURCE_DIR)/toolchain/cmake/Preload/osx-generic.cmake \
-C$(SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_ASSIMP=ON \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-DBUILD_DISCORD_RPC=ON \
Expand All @@ -143,7 +143,7 @@ osx.coverage: FORCE
make -f $(ROOT_DIR)/Makefile.mac-base build \
-e EXTRA_OPTIONS=" \
$(SOURCE_DIR) \
-C$(SOURCE_DIR)/toolchain/cmake/Preload/osx-generic.cmake \
-C$(SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
-DBUILD_ASAN=ON \
-DBUILD_ASSIMP=ON \
-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
Expand Down
Loading

0 comments on commit b967937

Please sign in to comment.