mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-11-21 09:59:44 +00:00
Fix the issues found while reviewing the build files
Install the Wayland development packages in both workflows and bundle the runtime libraries in the AppImage: the release build had no native Wayland backend at all, and the engine silently fell back to GLFW there. Build the window backends on every platform that is not Windows and not Apple, glob the wayland sources with CONFIGURE_DEPENDS, and report a missing Wayland dependency with the list of what is missing. Also drop the dead nested project() calls and the duplicate -no-pie option, make .dirIcon the file appimagetool expects, and describe the real Linux dependencies in the README.
This commit is contained in:
parent
3a574ade8c
commit
b6f6235249
10 changed files with 46 additions and 26 deletions
|
|
@ -32,6 +32,10 @@ AppDir:
|
|||
- libvorbisfile3
|
||||
- libluajit-5.1-2
|
||||
- libfreetype6
|
||||
- libwayland-client0
|
||||
- libwayland-cursor0
|
||||
- libwayland-egl1
|
||||
- libxkbcommon0
|
||||
exclude:
|
||||
- hicolor-icon-theme
|
||||
- sound-theme-freedesktop
|
||||
|
|
|
|||
|
|
@ -6,7 +6,10 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/share/VoxelCore)
|
|||
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/share/VoxelCore)
|
||||
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/dev/VoxelCore.png DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/share/icons/hicolor/256x256)
|
||||
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/dev/VoxelCore.png DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir)
|
||||
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/dev/VoxelCore.png DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/.dirIcon)
|
||||
# .dirIcon is the icon of the AppDir itself and has to be a file, not a directory
|
||||
file(REMOVE_RECURSE ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/.dirIcon)
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dev/VoxelCore.png
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/AppDir/.dirIcon COPYONLY)
|
||||
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/dev/VoxelCore.desktop DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/share/applications)
|
||||
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/dev/VoxelCore.desktop DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/)
|
||||
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/lib)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue