Compare commits
No commits in common. "b1837571cc3beb7188b3da4ea513a11d0d3c23aa" and "5507e17402985c08cebcf8709c320a3ecf0de572" have entirely different histories.
b1837571cc
...
5507e17402
7
.github/workflows/appimage.yml
vendored
7
.github/workflows/appimage.yml
vendored
@ -31,12 +31,7 @@ jobs:
|
|||||||
sudo apt-get update
|
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 libglfw3-dev libglfw3 libglew-dev libglew2.2 \
|
||||||
libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev \
|
libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev \
|
||||||
libcurl4-openssl-dev libgtest-dev squashfs-tools valgrind wget
|
libcurl4-openssl-dev libgtest-dev cmake squashfs-tools valgrind
|
||||||
# Install CMake >= 3.26
|
|
||||||
wget https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-linux-x86_64.sh
|
|
||||||
chmod +x cmake-3.27.9-linux-x86_64.sh
|
|
||||||
sudo ./cmake-3.27.9-linux-x86_64.sh --skip-license --prefix=/usr/local
|
|
||||||
rm cmake-3.27.9-linux-x86_64.sh
|
|
||||||
# fix luajit paths
|
# 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/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
|
sudo ln -s /usr/include/luajit-2.1 /usr/include/lua
|
||||||
|
|||||||
7
.github/workflows/cmake.yml
vendored
7
.github/workflows/cmake.yml
vendored
@ -39,12 +39,7 @@ jobs:
|
|||||||
# make && make install INSTALL_INC=/usr/include/lua
|
# make && make install INSTALL_INC=/usr/include/lua
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y build-essential libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev wget
|
sudo apt-get install -y cmake build-essential libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev
|
||||||
# Install CMake >= 3.26
|
|
||||||
wget https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-linux-x86_64.sh
|
|
||||||
chmod +x cmake-3.27.9-linux-x86_64.sh
|
|
||||||
sudo ./cmake-3.27.9-linux-x86_64.sh --skip-license --prefix=/usr/local
|
|
||||||
rm cmake-3.27.9-linux-x86_64.sh
|
|
||||||
# fix luajit paths
|
# 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/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
|
sudo ln -s /usr/include/luajit-2.1 /usr/include/lua
|
||||||
|
|||||||
@ -15,7 +15,7 @@ target_link_libraries(VoxelEngineTest PRIVATE VoxelEngineSrc GTest::gtest_main)
|
|||||||
add_custom_command(
|
add_custom_command(
|
||||||
TARGET VoxelEngineTest
|
TARGET VoxelEngineTest
|
||||||
POST_BUILD
|
POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different
|
||||||
${CMAKE_SOURCE_DIR}/res ${CMAKE_CURRENT_BINARY_DIR}/res)
|
${CMAKE_SOURCE_DIR}/res ${CMAKE_CURRENT_BINARY_DIR}/res)
|
||||||
|
|
||||||
include(GoogleTest)
|
include(GoogleTest)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user