Skip to content

Commit

Permalink
Actually use enet..
Browse files Browse the repository at this point in the history
And now unfortunately for me my sleep deprived self made an inexcusable mistake..
  • Loading branch information
ProjectSynchro committed Apr 22, 2023
1 parent 03b9552 commit daba204
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

### v1.7
- Add `naev-steamfrankenruntime`
- This is Valve's 'scout' runtime with Python 3.6, OpenBLAS compiled from source, and a 'new-ish' version of git installed.
- This is Valve's 'scout' runtime with Python 3.6, OpenBLAS, libenet, physfs, libunibreak compiled from source, and a 'new-ish' version of git installed.
- Update `naev-steamruntime` to 'sniper' runtime.
- In the future this will be the image used to build binaries for Steam, as the `soldier` runtime is not a supported environment on Steam.
- Deprecate `naev-linux-archaic`, `naev-linux-latest`, `naev-linux-lts` in favour of `naev-steamruntime`, and `naev-steamfrankenruntime`.
Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
This repository contains Dockerfiles for all of the [Naev Project](https://github.com/naev/naev)'s CI and CD build images, and Github Actions workflows.

### Overview:
- `naev-artwork` (Used to render naev artwork.)
- `naev-docs` (Used for building website and docs.)
- `naev-linux-archaic` (Used for old release builds)
- `naev-linux-latest` (Used for CI, testing and soundtrack builds.)
- `naev-linux-lts` (Used for release builds. oldest targetted glibc platform)
- `naev-linux-archaic` (Used for old release builds) ***DEPRECATED***
- `naev-linux-latest` (Used for CI, testing and soundtrack builds.) ***DEPRECATED***
- `naev-linux-lts` (Used for release builds. oldest targetted glibc platform) ***DEPRECATED***
- `naev-macos` (Used to cross compile for macOS.)
- `naev-release` (Used for packaging releases)
- `naev-steamruntime` (Used for linux steam builds in the steamruntime (soldier) environment)
- `naev-steamruntime` (Used for testing linux steam builds in the steamruntime (sniper) environment with extra dependencies installed.)
- `naev-steamfrankenruntime` (Used for building linux builds in the steamruntime (scout) environment with tools and extra dependencies installed.)
- `naev-windows` (Used to cross compile for Windows.)


Expand Down
8 changes: 4 additions & 4 deletions naev-steamfrankenruntime/Dockerfile.amd64
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ RUN curl -L -O https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.
make PREFIX=/opt install

# Due to age of the image base, build libenet from source..
RUN curl -L -O https://github.com/libnet/libnet/releases/download/v1.2/libnet-1.2.tar.gz && \
tar zxpf libnet-1.2.tar.gz && \
cd libnet-1.2 && \
RUN curl -L -O http://enet.bespin.org/download/enet-1.3.17.tar.gz && \
tar zxpf enet-1.3.17.tar.gz && \
cd enet-1.3.17 && \
./configure --prefix=/opt && \
make -j"$(nproc --all)" && \
make PREFIX=/opt install
make PREFIX=/opt install

# Due to age of the image base, build libphyfsfs from source..
RUN curl -L -O https://github.com/icculus/physfs/archive/refs/tags/release-3.2.0.tar.gz && \
Expand Down

0 comments on commit daba204

Please sign in to comment.