Merge pull request #244 from MihailRis/entt-integration

EnTT library integration

.github/workflows/appimage.yml

@@ -24,8 +24,15 @@ jobs:
         run: |
           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 cmake squashfs-tools
+          # 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 https://github.com/skypjack/entt.git
+          cd entt/build
+          cmake -DCMAKE_BUILD_TYPE=Release ..
+          sudo make install
+          cd ../..
       - name: configure
         run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_APPDIR=1
       - name: build

.github/workflows/cmake.yml

@@ -36,8 +36,15 @@ jobs:
       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
+          # 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 https://github.com/skypjack/entt.git
+          cd entt/build
+          cmake -DCMAKE_BUILD_TYPE=Release ..
+          sudo make install
+          cd ../..
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only

.github/workflows/macos.yml

@@ -17,7 +17,7 @@ jobs:
 
       - name: Install dependencies from brew
         run: |
-          brew install glfw3 glew libpng openal-soft luajit libvorbis
+          brew install glfw3 glew libpng openal-soft luajit libvorbis skypjack/entt/entt
 
       - name: Install specific version of GLM
         run: |
@@ -48,4 +48,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: VoxelEngineMacOs
-          path: VoxelEngineMacApp.dmg
+          path: VoxelEngineMacApp.dmg

CMakeLists.txt

@@ -84,6 +84,9 @@ find_package(OpenGL REQUIRED)
 find_package(GLEW REQUIRED)
 find_package(OpenAL REQUIRED)
 find_package(ZLIB REQUIRED)
+if (NOT APPLE)
+    find_package(EnTT REQUIRED)
+endif()
 
 if (WIN32)
     if(VOXELENGINE_BUILD_WINDOWS_VCPKG)

README.md

@@ -29,6 +29,14 @@ cmake --build .
 
 ## Install libs:
 
+#### Install EnTT
+```sh
+git clone https://github.com/skypjack/entt.git
+cd entt/build
+cmake -DCMAKE_BUILD_TYPE=Release ..
+sudo make install
+```
+
 #### Debian-based distro:
 ```sh
 sudo apt install libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev
@@ -59,7 +67,7 @@ sudo pacman -S glfw-wayland glew glm libpng libvorbis openal luajit
 #### macOS:
 
 ```
-brew install glfw3 glew glm libpng libvorbis lua luajit openal-soft
+brew install glfw3 glew glm libpng libvorbis lua luajit openal-soft skypjack/entt/entt
 ```
 
 If homebrew for some reason could not install the necessary packages: ```lua luajit openal-soft```, then download, install and compile them manually (Lua, LuaJIT and OpenAL).

vcpkg.json

@@ -10,6 +10,7 @@
       "libspng",
       "zlib",
       "luajit",
-      "libvorbis"
+      "libvorbis",
+      "entt"
     ]
   }