AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Small fixes to workflows, bintoc/shaderc, CMakePresets

This commit is contained in:
Luke Street 2021-06-11 22:57:38 -04:00
parent 6716bb1c93
commit 7bb6b06e2d
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -42,9 +42,9 @@ jobs:
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main" sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
sudo apt-get -y install curl git cmake ninja-build clang lld libcurl4-openssl-dev intel-oneapi-ipp-devel \ sudo apt-get -y install ninja-build clang lld libcurl4-openssl-dev intel-oneapi-ipp-devel \
zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \ zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \
libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev python3 python-is-python3 qt5-default libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev qt5-default
yarn global add @sentry/cli yarn global add @sentry/cli
echo "$(yarn global bin)" >> $GITHUB_PATH echo "$(yarn global bin)" >> $GITHUB_PATH

4
.github/workflows/release.yml vendored
View File

@ -44,9 +44,9 @@ jobs:
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main" sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
sudo apt-get -y install curl git cmake ninja-build clang lld libcurl4-openssl-dev intel-oneapi-ipp-devel \ sudo apt-get -y install ninja-build clang lld libcurl4-openssl-dev intel-oneapi-ipp-devel \
zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \ zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \
libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev python3 python-is-python3 qt5-default libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev qt5-default
yarn global add @sentry/cli yarn global add @sentry/cli
echo "$(yarn global bin)" >> $GITHUB_PATH echo "$(yarn global bin)" >> $GITHUB_PATH

3
CMakePresets.json
View File

@ -19,7 +19,8 @@
"hidden": true, "hidden": true,
"cacheVariables": { "cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo", "CMAKE_BUILD_TYPE": "RelWithDebInfo",
"CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded" "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded",
"SENTRY_DSN": "$env{SENTRY_DSN}"
} }
}, },
{ {

2
hecl/bintoc/CMakeLists.txt
View File

@ -3,7 +3,7 @@ cmake_policy(VERSION 3.15...3.20)
project(bintoc LANGUAGES C) project(bintoc LANGUAGES C)
add_executable(bintoc bintoc.c) add_executable(bintoc bintoc.c)
add_subdirectory(../../extern/athena/extern/zlib zlib) add_subdirectory(../../extern/athena/extern/zlib zlib EXCLUDE_FROM_ALL)
target_link_libraries(bintoc PRIVATE ${ZLIB_LIBRARIES}) target_link_libraries(bintoc PRIVATE ${ZLIB_LIBRARIES})
target_include_directories(bintoc PRIVATE ${ZLIB_INCLUDE_DIR}) target_include_directories(bintoc PRIVATE ${ZLIB_INCLUDE_DIR})

4
hecl/shaderc/CMakeLists.txt
View File

@ -73,8 +73,8 @@ endif ()
set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true) set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true)
add_custom_target(atdna) # avoid building add_custom_target(atdna) # avoid building
add_subdirectory(../../extern/athena athena) add_subdirectory(../../extern/athena athena EXCLUDE_FROM_ALL)
add_subdirectory(../../extern/boo boo) add_subdirectory(../../extern/boo boo EXCLUDE_FROM_ALL)
add_library(hecl-compilers ../lib/Compilers.cpp ../lib/WideStringConvert.cpp) add_library(hecl-compilers ../lib/Compilers.cpp ../lib/WideStringConvert.cpp)
get_target_property(BOO_INCLUDES boo INTERFACE_INCLUDE_DIRECTORIES) get_target_property(BOO_INCLUDES boo INTERFACE_INCLUDE_DIRECTORIES)