mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-04-24 06:53:36 +00:00
refactor: dont depend on libpng and libdl, update docs
This commit is contained in:
parent
bce996a2ef
commit
52ee114f24
|
|
@ -7,31 +7,18 @@ RUN apt-get update \
|
|||
&& apt-get install -y software-properties-common \
|
||||
&& add-apt-repository -y ppa:ubuntu-toolchain-r/test \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y \
|
||||
&& sudo apt-get install -y \
|
||||
build-essential \
|
||||
cmake \
|
||||
libglfw3-dev \
|
||||
python3 \
|
||||
ninja-build \
|
||||
meson \
|
||||
libsdl2-dev \
|
||||
libgl-dev \
|
||||
libglu1-mesa-dev \
|
||||
libopenal-dev \
|
||||
libvorbis-dev \
|
||||
libpng-dev \
|
||||
libpthread-stubs0-dev \
|
||||
clang \
|
||||
lld \
|
||||
meson \
|
||||
ninja-build \
|
||||
gcc-15 \
|
||||
g++-15 \
|
||||
libpthread-stubs0-dev
|
||||
# Clean up lol
|
||||
&& apt-get autoremove -y \
|
||||
&& apt-get clean -y \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Set GCC 15 as default
|
||||
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-15 100 \
|
||||
&& update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-15 100 \
|
||||
&& update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 100 \
|
||||
&& update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 100
|
||||
|
||||
ENV DEBIAN_FRONTEND=dialog
|
||||
10
README.md
10
README.md
|
|
@ -38,23 +38,19 @@ At the moment, we're aiming to support the following platforms:
|
|||
Install the following packages before building (Debian/Ubuntu names shown):
|
||||
|
||||
```bash
|
||||
sudo apt install \
|
||||
build-essential cmake \
|
||||
libsdl2-dev libgl-dev libglu1-mesa-dev \
|
||||
libopenal-dev libvorbis-dev \
|
||||
libpng-dev libpthread-stubs0-dev
|
||||
sudo apt-get install -y build-essential python3 ninja-build meson libsdl2-dev libgl-dev libglu1-mesa-dev libpthread-stubs0-dev
|
||||
```
|
||||
|
||||
#### Arch/Manjaro
|
||||
|
||||
```bash
|
||||
sudo pacman -S base-devel gcc pkgconf cmake sdl2-compat mesa openal libvorbis glu
|
||||
sudo pacman -S base-devel gcc pkgconf cmake sdl2-compat mesa glu
|
||||
```
|
||||
|
||||
#### Fedora/Red Hat/Nobara
|
||||
|
||||
```bash
|
||||
sudo dnf in gcc gcc-c++ make cmake SDL2-devel mesa-libGL-devel mesa-libGLU-devel openal-soft-devel libvorbis-devel libpng-devel openssl-devel
|
||||
sudo dnf in gcc gcc-c++ make cmake SDL2-devel mesa-libGL-devel mesa-libGLU-devel openssl-devel
|
||||
```
|
||||
|
||||
#### Docker
|
||||
|
|
|
|||
|
|
@ -26,13 +26,10 @@
|
|||
libGL
|
||||
libGLU
|
||||
sdl2
|
||||
libpng
|
||||
zlib
|
||||
openal
|
||||
libvorbis
|
||||
];
|
||||
packages = with pkgs; [
|
||||
gcc15
|
||||
clang
|
||||
lld
|
||||
cmake
|
||||
gnumake
|
||||
|
|
|
|||
|
|
@ -18,9 +18,7 @@ gl_dep = dependency('gl')
|
|||
glu_dep = dependency('glu')
|
||||
sdl2_dep = dependency('sdl2') # Yes.. i know sdl3 is out, but there's not point upgrading right now except when
|
||||
# someone is gonna ask me "Hey juicey can you make it SDL3?" and i'd be like fuck you and still do it.
|
||||
png_dep = dependency('libpng')
|
||||
thread_dep = dependency('threads')
|
||||
dl_dep = cc.find_library('dl')
|
||||
|
||||
# compile flags (chagne ts juicey)
|
||||
global_cpp_args = [
|
||||
|
|
|
|||
Loading…
Reference in a new issue