redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-05-17 22:57:46 +00:00
Code Activity

Switch to my personal fork of libcotp, add gpg-error and gcrypt

Browse source
This commit is contained in:
Joshua Goins 2024-04-25 20:31:26 -04:00
parent e4de39d60d
commit 71107f9aae
5 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/main.yml vendored
View file

@ -80,6 +80,12 @@ jobs:
Invoke-WebRequest https://xiv.zone/distrib/dependencies/iconv.zip -OutFile iconv.zip
unzip iconv.zip -d ${{ steps.strings.outputs.prefix-dir }}
Invoke-WebRequest https://xiv.zone/distrib/dependencies/gcrypt.zip -OutFile gcrypt.zip
unzip gcrypt.zip -d ${{ steps.strings.outputs.prefix-dir }}
Invoke-WebRequest https://xiv.zone/distrib/dependencies/gpg-error.zip -OutFile gpg-error.zip
unzip gpg-error.zip -d ${{ steps.strings.outputs.prefix-dir }}
Invoke-WebRequest https://xiv.zone/distrib/dependencies/icoutils.zip -OutFile icoutils.zip
unzip icoutils.zip -d ${{ steps.strings.outputs.prefix-dir }}

2
.gitmodules vendored
View file

@ -1,6 +1,6 @@
[submodule "external/libcotp"]
path = external/libcotp
url = https://github.com/paolostivanin/libcotp.git
url = https://github.com/redstrate/libcotp.git
[submodule "external/libphysis"]
path = external/libphysis
url = ../libphysis

12
external/CMakeLists.txt vendored
View file

@ -16,12 +16,14 @@ corrosion_import_crate(MANIFEST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/libphysis/Cargo
FEATURES game_install visual_data) # FIXME: split visual_data? we only need texture decompression
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libphysis/logger EXCLUDE_FROM_ALL)
find_package(PkgConfig REQUIRED)
pkg_check_modules(UNSHIELD REQUIRED IMPORTED_TARGET libunshield)
target_include_directories(physis INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/libphysis/target/public)
target_link_libraries(physis INTERFACE ${UNSHIELD_LIBRARIES} z)
target_link_directories(physis INTERFACE ${UNSHIELD_LIBRARY_DIRS})
# TODO: enable unshield on Windows
if (NOT WIN32)
find_package(PkgConfig REQUIRED)
pkg_check_modules(UNSHIELD REQUIRED IMPORTED_TARGET libunshield)
target_link_directories(physis INTERFACE ${UNSHIELD_LIBRARY_DIRS})
endif()
set(KDSingleApplication_QT6 ON)
set(KDSingleApplication_STATIC ON)

2
external/libcotp vendored

@ -1 +1 @@
Subproject commit 60461cd28c297eed476ff93d9b1123c3855c7053
Subproject commit 9136e0a94f1b4d9afe2d8aa79bfdaf1d1699f265

6
scripts/windows-setup.ps1
View file

@ -51,6 +51,12 @@ Expand-Archive -Path "$LocalDir/iconv.zip" -DestinationPath $PrefixDir -Force
Invoke-WebRequest https://xiv.zone/distrib/dependencies/icoutils.zip -OutFile "$LocalDir/icoutils.zip"
Expand-Archive -Path "$LocalDir/icoutils.zip" -DestinationPath $PrefixDir -Force
Invoke-WebRequest https://xiv.zone/distrib/dependencies/gcrypt.zip -OutFile "$LocalDir/gcrypt.zip"
Expand-Archive -Path "$LocalDir/gcrypt.zip" -DestinationPath $PrefixDir -Force
Invoke-WebRequest https://xiv.zone/distrib/dependencies/gpg-error.zip -OutFile "$LocalDir/gpg-error.zip"
Expand-Archive -Path "$LocalDir/gpg-error.zip" -DestinationPath $PrefixDir -Force
# Build zlib
Clone "zlib" "https://github.com/madler/zlib.git"
Configure "zlib" "-DBUILD_TESTING=OFF"