diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 7b53b3fbf..d38d39b23 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -35,12 +35,6 @@ jobs: # fix luajit paths sudo ln -s /usr/lib/x86_64-linux-gnu/libluajit-5.1.a /usr/lib/x86_64-linux-gnu/liblua5.1.a sudo ln -s /usr/include/luajit-2.1 /usr/include/lua - # install EnTT - git clone --branch v3.16.0 https://github.com/skypjack/entt.git - cd entt/build - cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE=Release -DENTT_INSTALL=on .. - sudo make install - cd ../.. - name: Configure run: cmake -S . -B build -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_APPDIR=1 -DVOXELENGINE_BUILD_TESTS=ON -DVC_BUILD_NAME="${{ inputs.build_name }}" - name: Build diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 6956a1f3d..dc0438164 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -43,12 +43,6 @@ jobs: # 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 - # install EnTT - git clone --branch v3.16.0 https://github.com/skypjack/entt.git - cd entt/build - cmake -DCMAKE_BUILD_TYPE=Release -DENTT_INSTALL=on .. - sudo make install - cd ../.. - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 22d5291da..081ba662a 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -23,7 +23,7 @@ jobs: - name: Install dependencies from brew run: | - brew install glfw glew libpng openal-soft luajit libvorbis skypjack/entt/entt googletest glm freetype + brew install glfw glew libpng openal-soft luajit libvorbis googletest glm freetype - name: Configure run: | diff --git a/Dockerfile b/Dockerfile index fb1a628c4..c4c691d92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,15 +38,6 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cm ./cmake-${CMAKE_VERSION}-linux-x86_64.sh --skip-license --prefix=/usr/local && \ rm cmake-${CMAKE_VERSION}-linux-x86_64.sh - -# Install specific EnTT version (the latest version that supports C++17). -RUN git clone --branch v3.16.0 https://github.com/skypjack/entt.git && \ - cd entt/build && \ - cmake -DCMAKE_BUILD_TYPE=Release -DENTT_INSTALL=on .. && \ - make install && \ - cd ../.. && rm -rf entt - - # CMake missing LUA_INCLUDE_DIR and LUA_LIBRARIES fix: RUN ln -s /usr/lib/x86_64-linux-gnu/libluajit-5.1.a /usr/lib/x86_64-linux-gnu/liblua5.1.a \ && ln -s /usr/include/luajit-2.1 /usr/include/lua diff --git a/flake.nix b/flake.nix index cb6bfe6ca..3bde39be4 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,6 @@ luajit curl openssl - entt mesa freeglut ]; @@ -47,11 +46,6 @@ glfw mesa freeglut - entt - ]; - cmakeFlags = [ - "-DCMAKE_PREFIX_PATH=${pkgs.entt}" - "-DCMAKE_INCLUDE_PATH=${pkgs.entt}/include" ]; installPhase = '' diff --git a/vcpkg.json b/vcpkg.json index 89e0bd844..e6bff2329 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -11,17 +11,9 @@ "zlib", "luajit", "libvorbis", - "entt", "gtest", "curl", "freetype", "openssl" - ], - "builtin-baseline": "802d61d714db2714e3fefcfc59447431166b8367", - "overrides": [ - { - "name": "entt", - "version": "3.16.0" - } ] }