mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-11-20 09:29:44 +00:00
remove entt from build configs and workflows
This commit is contained in:
parent
dbc6a52132
commit
3bc521c916
6 changed files with 1 additions and 36 deletions
6
.github/workflows/appimage.yml
vendored
6
.github/workflows/appimage.yml
vendored
|
|
@ -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
|
||||
|
|
|
|||
6
.github/workflows/cmake.yml
vendored
6
.github/workflows/cmake.yml
vendored
|
|
@ -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
|
||||
|
|
|
|||
2
.github/workflows/macos.yml
vendored
2
.github/workflows/macos.yml
vendored
|
|
@ -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: |
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -11,17 +11,9 @@
|
|||
"zlib",
|
||||
"luajit",
|
||||
"libvorbis",
|
||||
"entt",
|
||||
"gtest",
|
||||
"curl",
|
||||
"freetype",
|
||||
"openssl"
|
||||
],
|
||||
"builtin-baseline": "802d61d714db2714e3fefcfc59447431166b8367",
|
||||
"overrides": [
|
||||
{
|
||||
"name": "entt",
|
||||
"version": "3.16.0"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue