Updated Actions scripts

DragonJoker · Jun 16, 2024 · 223e720 · 223e720
1 parent 94cda34
commit 223e720
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -97,6 +97,10 @@ jobs:
       with:
         vcpkgDirectory: '${{ github.workspace }}/external/vcpkg'
         vcpkgJsonGlob: 'vcpkg.json'
+    - name: Install necessary packages
+      shell: bash
+      run: |
+        brew install autoconf automake autoconf-archive
     - name: Create Build Environment
       run: |
         cmake -E make_directory ${{runner.workspace}}/build-${{ matrix.buildType }}
@@ -177,7 +181,7 @@ jobs:
     - name: Install necessary packages
       shell: bash
       run: |
-        sudo apt-get install -y --no-install-recommends libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev libxaw7-dev libwayland-dev libxcb1-dev libx11-xcb-dev pkg-config libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev
+        sudo apt-get install -y --no-install-recommends libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev libxaw7-dev libwayland-dev libxcb1-dev libx11-xcb-dev pkg-config libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev autoconf automake autoconf-archive
     - name: Configure CMake
       id: configure
       shell: bash

diff --git a/data/vcpkg/ports/shaderwriter/portfile.cmake b/data/vcpkg/ports/shaderwriter/portfile.cmake
@@ -2,9 +2,9 @@ vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO DragonJoker/ShaderWriter
-    REF 073f111b92467c93eee884309ad52d871c18a33b
+    REF 8732c2d9960fa621650cceb2886cbdf450c5abec
     HEAD_REF development
-    SHA512 42908d0df6826aadf9edbf3a65ca686af677dfa455d6387e6cae59f7d437c5db9c46828e1607d4f10661c8e81740de0dc457bdbbbc16bad8d225481d5d8253a3
+    SHA512 8bfff6b7d0aaa184b9be2f3d98da702efaa5c7485100edaa1536ee546f24bcf809a2e127d2e60c71c2d4e88578fe81aa449dd23b9c11a4e62699073472f40545
 )
 
 vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH

diff --git a/include/Core/Castor3D/Render/Overlays/OverlayVertexBufferPool.inl b/include/Core/Castor3D/Render/Overlays/OverlayVertexBufferPool.inl
@@ -9,6 +9,7 @@ See LICENSE file in root folder
 #include "Castor3D/Shader/ShaderBuffers/TextureAnimationBuffer.hpp"
 #include "Castor3D/Shader/ShaderBuffers/TextureConfigurationBuffer.hpp"
 #include "Castor3D/Shader/Ubos/CameraUbo.hpp"
+#include "Castor3D/Shader/Ubos/FontUbo.hpp"
 #include "Castor3D/Shader/Ubos/HdrConfigUbo.hpp"
 
 #include <ashespp/Descriptor/DescriptorSet.hpp>

diff --git a/include/Core/CastorUtils/Graphics/Font.hpp b/include/Core/CastorUtils/Graphics/Font.hpp
@@ -167,7 +167,7 @@ namespace castor
 		 *\brief		Constructeur de police SDF.
 		 *\param[in]	name	Le nom de la police.
 		 */
-		CU_API Font( String const & name );
+		CU_API explicit Font( String const & name );
 		/**
 		 *\~english
 		 *\brief		SDF font constructor.

diff --git a/source/Core/Castor3D/Overlay/FontTexture.cpp b/source/Core/Castor3D/Overlay/FontTexture.cpp
@@ -233,7 +233,7 @@ namespace castor3d
 					offX += maxWidth;
 					++it;
 
-					m_charIndices.try_emplace( glyph.getCharacter(), uint32_t( m_charIndices.size() ) ).second;
+					m_charIndices.try_emplace( glyph.getCharacter(), uint32_t( m_charIndices.size() ) );
 				}
 
 				offY -= maxHeight;

diff --git a/source/Core/CastorUtils/Graphics/Font.cpp b/source/Core/CastorUtils/Graphics/Font.cpp
@@ -225,7 +225,7 @@ namespace castor
 		struct GlyphLoader
 			: public Font::GlyphLoader
 		{
-			GlyphLoader( Path const & pathFile )
+			explicit GlyphLoader( Path const & pathFile )
 				: m_path{ pathFile }
 			{
 			}