Skip to content

Commit 294a087

Browse files
authored
Merge pull request #662 from Lgt2x/netcon-update-update
Netcon update
2 parents 10a20d7 + 4093088 commit 294a087

30 files changed

Lines changed: 527 additions & 2979 deletions

BUILD.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,11 @@ Once CMake finishes, the built files will be put in `builds/mac/build/Debug` or
132132
* If you would like to manage the code dependencies yourself:
133133
* APT users
134134
```sh
135-
sudo apt install -y --no-install-recommends libsdl2-dev zlib1g-dev libgtest-dev libglm-dev
135+
sudo apt install -y --no-install-recommends libsdl2-dev zlib1g-dev libcpp-httplib-dev libgtest-dev libglm-dev
136136
```
137137
* DNF users
138138
```sh
139-
sudo dnf install -y SDL2-devel zlib-devel gtest glm-devel
139+
sudo dnf install -y SDL2-devel zlib-devel cpp-httplib-devel gtest glm-devel
140140
```
141141
142142
3. **Clone the Descent3 source code.**

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
160160
endif()
161161

162162
find_package(glm REQUIRED)
163+
find_package(httplib REQUIRED)
163164
find_package(SDL2 REQUIRED)
164165
# Some versions of the SDL2 find_package set SDL2_INCLUDE_DIR and some set a plural SDL2_INCLUDE_DIRS. Check both.
165166
message("SDL2 Include Dir is ${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS}")

Descent3/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ target_link_libraries(Descent3 PRIVATE
321321
ddio
322322
fix
323323
grtext
324+
inetfile
324325
libmve
325326
libacm
326327
linux

0 commit comments

Comments
 (0)