GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix linux build

Browse Source
This commit is contained in:
ohyzha
2024-08-03 13:54:00 +03:00
parent 9589b4d39f
commit 3c39a2e267
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/build_pc.yml
View File

@@ -32,7 +32,7 @@ jobs:
- name: Install Dev Packages - name: Install Dev Packages
if: matrix.os == 'ubuntu-latest' if: matrix.os == 'ubuntu-latest'
run: > run: >
sudo apt update && sudo apt install -y extra-cmake-modules libwayland-dev libxkbcommon-dev xorg-dev libarchive-dev libassimp-dev ninja-build glslang-tools glslang-dev unzip sudo apt update && sudo apt install -y extra-cmake-modules libwayland-dev libxkbcommon-dev xorg-dev libarchive-dev libassimp-dev ninja-build glslang-tools glslang-dev unzip zip
&& sudo wget https://sourceforge.net/projects/bin2c/files/1.1/bin2c-1.1.zip && sudo unzip bin2c-1.1.zip && cd bin2c && sudo gcc -o bin2c bin2c.c && sudo mv bin2c /usr/bin && sudo wget https://sourceforge.net/projects/bin2c/files/1.1/bin2c-1.1.zip && sudo unzip bin2c-1.1.zip && cd bin2c && sudo gcc -o bin2c bin2c.c && sudo mv bin2c /usr/bin
- name: Configure CMake - name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DDEPENDENCY_MIRROR_FILE="${{github.workspace}}/.gitea/workflows/DependencyMirrors.txt" run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DDEPENDENCY_MIRROR_FILE="${{github.workspace}}/.gitea/workflows/DependencyMirrors.txt"

8
3rdParty/msdf/CMakeLists.txt vendored
View File

@@ -76,12 +76,20 @@ FetchContent_MakeAvailable(msdfgen_atlas)
function(LinkMsdf TARGET) function(LinkMsdf TARGET)
if(WIN32) if(WIN32)
set(STATIC_LIB_EXT "lib") set(STATIC_LIB_EXT "lib")
set(freetype_lib_name "freetype")
else() else()
set(STATIC_LIB_EXT "a") set(STATIC_LIB_EXT "a")
set(freetype_lib_name "libfreetype")
endif() endif()
# link freetype first to fix linkage issues on linux
target_link_libraries(${TARGET} PUBLIC "${VCPKG_SRC_DIR}/installed/${TRIPLET}/lib/${freetype_lib_name}.${STATIC_LIB_EXT}")
file(GLOB installed_libs "${VCPKG_SRC_DIR}/installed/${TRIPLET}/lib/*.${STATIC_LIB_EXT}") file(GLOB installed_libs "${VCPKG_SRC_DIR}/installed/${TRIPLET}/lib/*.${STATIC_LIB_EXT}")
foreach(lib ${installed_libs}) foreach(lib ${installed_libs})
get_filename_component(libname ${lib} NAME_WE)
if (NOT ${libname} STREQUAL ${freetype_lib_name})
target_link_libraries(${TARGET} PUBLIC ${lib}) target_link_libraries(${TARGET} PUBLIC ${lib})
endif()
endforeach() endforeach()
endfunction() endfunction()