Skip to content

Commit

Permalink
修正
Browse files Browse the repository at this point in the history
  • Loading branch information
melpon committed Jun 23, 2024
1 parent 2977038 commit cf5bbda
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ find_package(Blend2D REQUIRED)
find_package(CLI11 REQUIRED)
find_package(yaml-cpp REQUIRED)

if (ZAKURO_PLATFORM STREQUAL "ubuntu-20.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-22.04_x86_64")
if (ZAKURO_PLATFORM STREQUAL "ubuntu-20.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-22.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-24.04_x86_64")
find_package(Libva REQUIRED)
find_package(Libdrm REQUIRED)
endif()
Expand Down Expand Up @@ -148,7 +148,7 @@ foreach(n RANGE ${RESOURCE_FILES_LENGTH_MINUS_ONE})
# バイナリの組み込み
if (ZAKURO_PLATFORM STREQUAL "macos_arm64")
target_link_options(zakuro PRIVATE "SHELL:-sectcreate __DATA ${file_name_macos} ${CMAKE_CURRENT_SOURCE_DIR}/resource/${file}")
elseif (ZAKURO_PLATFORM STREQUAL "ubuntu-20.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-22.04_x86_64")
elseif (ZAKURO_PLATFORM STREQUAL "ubuntu-20.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-22.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-24.04_x86_64")
set(objfile ${file}.o)
add_custom_command(OUTPUT ${objfile}
COMMAND ld
Expand Down Expand Up @@ -185,5 +185,5 @@ if (ZAKURO_PLATFORM STREQUAL "macos_arm64")
target_link_options(zakuro PRIVATE -ObjC)
set_target_properties(zakuro PROPERTIES CXX_VISIBILITY_PRESET hidden)

elseif (ZAKURO_PLATFORM STREQUAL "ubuntu-20.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-22.04_x86_64")
elseif (ZAKURO_PLATFORM STREQUAL "ubuntu-20.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-22.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-24.04_x86_64")
endif()

0 comments on commit cf5bbda

Please sign in to comment.