diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 5a01a6186..21303003a 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -23,7 +23,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get install -y build-essential libglfw3-dev libglfw3 libglew-dev libglew2.2 \ + sudo apt-get install -y build-essential libsdl3-dev libglew-dev libglew2.2 \ libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev \ libcurl4-openssl-dev libgtest-dev cmake squashfs-tools valgrind # fix luajit paths diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index ddaa95f8a..3bc0995bf 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -39,7 +39,7 @@ jobs: # make && make install INSTALL_INC=/usr/include/lua run: | sudo apt-get update - sudo apt-get install libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev + sudo apt-get install libsdl3-dev libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev # fix luajit paths sudo ln -s /usr/lib/x86_64-linux-gnu/libluajit-5.1.a /usr/lib/x86_64-linux-gnu/liblua-5.1.a sudo ln -s /usr/include/luajit-2.1 /usr/include/lua diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index f8fe3dfac..e4ec458bb 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -17,7 +17,7 @@ jobs: - name: Install dependencies from brew run: | - brew install glfw3 glew libpng openal-soft luajit libvorbis skypjack/entt/entt googletest glm + brew install sdl3 glew libpng openal-soft luajit libvorbis skypjack/entt/entt googletest glm - name: Configure run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_TESTS=ON -DVOXELENGINE_BUILD_APPDIR=1 diff --git a/Dockerfile b/Dockerfile index 9d0005f59..ad685f226 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,8 +15,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ xauth \ gdb \ gdbserver \ - libglfw3-dev \ - libglfw3 \ + libsdl3-dev \ libglew-dev \ libglew2.2 \ libglm-dev \ diff --git a/README.md b/README.md index 30925fefd..292cdf44f 100644 --- a/README.md +++ b/README.md @@ -28,13 +28,13 @@ sudo make install ```sh su - -apt-get install entt-devel libglfw3-devel libGLEW-devel libglm-devel libpng-devel libvorbis-devel libopenal-devel libluajit-devel libstdc++13-devel-static libcurl-devel +apt-get install entt-devel SDL3-devel libGLEW-devel libglm-devel libpng-devel libvorbis-devel libopenal-devel libluajit-devel libstdc++13-devel-static libcurl-devel ``` #### Debian based distros ```sh -sudo apt install libglfw3 libglfw3-dev libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libcurl4-openssl-dev +sudo apt install libsdl3-dev libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libcurl4-openssl-dev ``` > [!TIP] @@ -48,21 +48,12 @@ sudo apt install libglfw3 libglfw3-dev libglew-dev libglm-dev libpng-dev libopen #### RHEL based distros ```sh -sudo dnf install glfw-devel glew-devel glm-devel libpng-devel libvorbis-devel openal-soft-devel luajit-devel libcurl-devel +sudo dnf install SDL3-devel glew-devel glm-devel libpng-devel libvorbis-devel openal-soft-devel luajit-devel libcurl-devel ``` #### Arch based distros - -If you use X11: - ```sh -sudo pacman -S glfw-x11 glew glm libpng libvorbis openal luajit libcurl -``` - -If you use Wayland: - -```sh -sudo pacman -S glfw-wayland glew glm libpng libvorbis openal luajit libcurl +sudo pacman -S sdl3 glew glm libpng libvorbis openal luajit libcurl ``` And install EnTT: @@ -92,7 +83,7 @@ cmake --build . --parallel ### Install libraries ```sh -brew install glfw3 glew glm libpng libvorbis lua luajit libcurl openal-soft skypjack/entt/entt +brew install sdl3 glew glm libpng libvorbis lua luajit libcurl openal-soft skypjack/entt/entt ``` > [!TIP] diff --git a/dev/AppImageBuilder.yml b/dev/AppImageBuilder.yml index 16fcf57a7..c924db6d4 100644 --- a/dev/AppImageBuilder.yml +++ b/dev/AppImageBuilder.yml @@ -22,7 +22,7 @@ AppDir: - libexpat1 - libfam0 - libgcrypt20 - - libglfw3 + - libsdl3 - libglew2.2 - libpng16-16 - libopenal1 diff --git a/flake.nix b/flake.nix index bc9ead2b0..1c3daeb04 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ buildInputs = with pkgs; [ glm - glfw + sdl3 glew zlib libpng @@ -42,7 +42,7 @@ ]; # libglvnd packages = with pkgs; [ - glfw + sdl3 mesa freeglut entt diff --git a/vcpkg.json b/vcpkg.json index 17145c4a0..8ac88a6ef 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -4,7 +4,7 @@ "dependencies": [ "opengl", "openal-soft", - "glfw3", + "sdl3", "glew", "glm", "libpng",