Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

netcon update #588

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

netcon update #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6457252
Reorganize netcon submodule
winterheart Sep 10, 2024
12d8d31
Introduce HttpClient as replacement for inetgetfile
winterheart Sep 16, 2024
a8de718
Switch Descent3 Online to use new HttpClient
winterheart Sep 16, 2024
a39d2be
Remove old inetgetfile related code
winterheart Sep 16, 2024
9936578
[netcon] Add proxy support, use generic iostream for body content
winterheart Sep 16, 2024
05244f8
Reactivate ability to download custom missions with new httpclient
winterheart Sep 16, 2024
0a997b6
Move _strlwr() to crossplat.h
winterheart Sep 18, 2024
d56cc43
Change some of msn_* functions signature
winterheart Sep 18, 2024
1cfb1d7
Rewrite msn_DownloadWithStatus() to use async http client
winterheart Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions BUILD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ Once CMake finishes, the built files will be put in `builds/mac/Descent3/Debug`
* If you would like to manage the code dependencies yourself:
* APT users
```sh
sudo apt install -y --no-install-recommends libsdl2-dev zlib1g-dev libgtest-dev libglm-dev
sudo apt install -y --no-install-recommends libsdl2-dev zlib1g-dev libcpp-httplib-dev libgtest-dev libglm-dev
```
* DNF users
```sh
sudo dnf install -y SDL2-devel zlib-devel gtest glm-devel
sudo dnf install -y SDL2-devel zlib-devel cpp-httplib-devel gtest glm-devel
```

3. **Clone the Descent3 source code.**
Expand Down
1 change: 1 addition & 0 deletions Brewfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Homebrew dependencies to build Descent3

brew "cpp-httplib"
brew "glm"
brew "plog"

Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
endif()

find_package(glm REQUIRED)
find_package(httplib REQUIRED)
find_package(SDL2 REQUIRED)
# Some versions of the SDL2 find_package set SDL2_INCLUDE_DIR and some set a plural SDL2_INCLUDE_DIRS. Check both.
message("SDL2 Include Dir is ${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS}")
Expand Down
1 change: 1 addition & 0 deletions Descent3/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ target_link_libraries(Descent3 PRIVATE
ddio
fix
grtext
inetfile
libmve
libacm
linux
Expand Down
Loading
Loading