build: provide cpp-httplib to client projects.

.gitmodules

@@ -2,23 +2,26 @@
 	path = external
 	url = ../../lolengine/ext-binaries.git
 	branch = master
-[submodule "src/3rdparty/imgui"]
+[submodule "imgui"]
 	path = src/3rdparty/imgui
 	url = ../../lolengine/ext-imgui.git
 	branch = master
-[submodule "src/3rdparty/bullet3"]
+[submodule "bullet3"]
 	path = src/3rdparty/bullet3
 	url = ../../lolengine/ext-bullet3.git
 	branch = lol
-[submodule "src/3rdparty/lua"]
+[submodule "lua"]
 	path = src/3rdparty/lua
 	url = ../../lolengine/ext-lua.git
 	branch = lol
-[submodule "src/3rdparty/pegtl"]
+[submodule "pegtl"]
 	path = src/3rdparty/pegtl
 	url = ../../lolengine/ext-pegtl.git
 	branch = lol
-[submodule "src/3rdparty/mingw-std-threads"]
+[submodule "mingw-std-threads"]
 	path = src/3rdparty/mingw-std-threads
 	url = ../../lolengine/ext-mingw-std-threads.git
 	branch = master
+[submodule "cpp-httplib"]
+	path = src/3rdparty/cpp-httplib
+	url = ../../lolengine/ext-cpp-httplib.git

build/autotools/m4/lol-conf.m4

@@ -67,6 +67,7 @@ dnl
 dnl  Activate some header-only libraries
 dnl
 
+LOL_CFLAGS="$LOL_CFLAGS -I\$(lol_srcdir)/src/3rdparty/cpp-httplib"
 LOL_CFLAGS="$LOL_CFLAGS -I\$(lol_srcdir)/src/3rdparty/pegtl/include"
 LOL_CFLAGS="$LOL_CFLAGS -I\$(lol_srcdir)/src/3rdparty/imgui"
 

build/msbuild/lol.rules.props

@@ -38,6 +38,7 @@
 
       <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">
           $(SdlIncludes);
+          $(CppHttpIncludes);
           $(FfmpegIncludes);
           $(AssimpIncludes);
           $(XinputIncludes);
@@ -83,9 +84,10 @@
 
     <Link Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">
       <!-- FIXME: not for the static library! -->
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(FfmpegDeps);$(AssimpDeps);$(LibGccDeps);$(GdiDeps);$(XinputDeps);$(GlDeps);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(FfmpegDeps);$(AssimpDeps);$(LibGccDeps);$(GdiDeps);$(XinputDeps);$(GlDeps);$(CppHttpDeps);%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(LibGccLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalLibraryDirectories>$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CppHttpLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalLibraryDirectories>$(FfmpegLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalLibraryDirectories>$(AssimpLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalLibraryDirectories>$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

build/msbuild/lol.vars.props

@@ -16,6 +16,16 @@
     <ImguiDir>$(LolDir)\src\3rdparty\imgui</ImguiDir>
     <ImguiIncludes>$(ImguiDir)</ImguiIncludes>
 
+    <!-- OpenSSL -->
+    <OpenSslDir>$(ExternalDir)\openssl-1.1.1d</OpenSslDir>
+
+    <!-- cpp-httplib (depends on OpenSSL) -->
+    <CppHttpDir>$(LolDir)\src/3rdparty\cpp-httplib</CppHttpDir>
+    <CppHttpIncludes>$(CppHttpDir);$(OpenSslDir)\include</CppHttpIncludes>
+    <CppHttpLibs>$(OpenSslDir)\lib\$(PlatformCode)-msvc</CppHttpLibs>
+    <CppHttpDeps>libssl.lib;libcrypto.lib;crypt32.lib</CppHttpDeps>
+    <Win32Defines>CPPHTTPLIB_OPENSSL_SUPPORT;$(Win32Defines)</Win32Defines>
+
     <!-- GTK+ & GtkGl -->
     <GtkDir>$(ExternalDir)\gtk-2.22.1</GtkDir>
     <GtkGlDir>$(ExternalDir)\gtkglarea-2.0.1</GtkGlDir>
@@ -104,6 +114,8 @@
   <ItemGroup>
     <BuildMacro Include="PegtlDir"><Value>$(PegtlDir)</Value></BuildMacro>
     <BuildMacro Include="PegtlIncludes"><Value>$(PegtlIncludes)</Value></BuildMacro>
+    <BuildMacro Include="CppHttpDir"><Value>$(CppHttpDir)</Value></BuildMacro>
+    <BuildMacro Include="CppHttpIncludes"><Value>$(CppHttpIncludes)</Value></BuildMacro>
     <BuildMacro Include="ImguiDir"><Value>$(ImguiDir)</Value></BuildMacro>
     <BuildMacro Include="ImguiIncludes"><Value>$(ImguiIncludes)</Value></BuildMacro>
     <BuildMacro Include="LibGccDir"><Value>$(LibGccDir)</Value></BuildMacro>

external

@@ -1 +1 @@
-Subproject commit da196cecaf1af6f04a271df97a5013c7c8a8a102
+Subproject commit 88125fdc0132803a30255837ac8beaa7d8c14ae5

src/3rdparty/Makefile.am

@@ -13,9 +13,11 @@ liblol_lua_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUA_ANSI $(disable_cflags_lua)
 
 include lol-lua.am
 
-EXTRA_DIST += $(imgui_sources) $(mingw_std_threads_sources) $(pegtl_sources)
+EXTRA_DIST += $(imgui_sources) $(mingw_std_threads_sources) $(pegtl_sources) \
+              $(cpp_httplib_sources)
 EXTRA_DIST += lol-lua.vcxproj lol-lua.vcxproj.filters
 
+include lol-cpp-httplib.am
 include lol-mingw-std-threads.am
 include lol-pegtl.am
 

src/3rdparty/cpp-httplib

@@ -0,0 +1 @@
+Subproject commit b251668522dd459d2c6a75c10390a11b640be708

src/3rdparty/lol-cpp-httplib.am

@@ -0,0 +1,5 @@
+
+cpp_httplib_sources = \
+    cpp-httplib/httplib.h \
+    $(NULL)
+