Skip to content

Update libraries #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Update libraries #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d42e2c
Try boost 1.89.0
rocka Aug 16, 2025
f768677
revert to exclude
rocka Aug 16, 2025
2f2edb7
try CMAKE_MAKE_PROGRAM
rocka Aug 16, 2025
098d981
fixup
rocka Aug 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ py_table_sha256 = 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c

## https://github.com/boostorg/boost/releases boost-<boost_version>-cmake.tar.xz
# boost
boost_version = 1.87.0
boost_sha256 = 7da75f171837577a52bbf217e17f8ea576c7c246e4594d617bfde7fafd408be5
boost_version = 1.89.0
boost_sha256 = 67acec02d0d118b5de9eb441f5fb707b3a1cdd884be00ca24b9a73c995511f74

## https://github.com/fcitx/libime-jyutping/blob/master/data/CMakeLists.txt
# jyutping dict
Expand Down
2 changes: 1 addition & 1 deletion src/Base.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ getSdkCMake :: AndroidEnv -> FilePath
getSdkCMake AndroidEnv {..} = sdkRoot </> "cmake" </> sdkCMakeVersion </> "bin" </> "cmake"

getSdkNinja :: AndroidEnv -> FilePath
getSdkNinja AndroidEnv {..} = sdkRoot </> "cmake" </> sdkCMakeVersion </> "bin"
getSdkNinja AndroidEnv {..} = sdkRoot </> "cmake" </> sdkCMakeVersion </> "bin" </> "ninja"

getABIList :: AndroidEnv -> [String]
getABIList AndroidEnv {..} = split (== ',') abi
Expand Down
5 changes: 3 additions & 2 deletions src/CMakeBuilder.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,14 @@ useCMake CmakeBuilder {..} = addOracle $ \(WithAndroidEnv q env) -> do
let cmakeEnvOptions = [AddEnv k v | (k, v) <- cmakeEnv bEnv]
cmd_
(Cwd src)
(AddPath [] [ninja])
cmakeEnvOptions
cmake
"-B"
buildEnvBuildDir
"-GNinja"
"-G"
"Ninja"
( [ "-DCMAKE_TOOLCHAIN_FILE=" <> toolchain,
"-DCMAKE_MAKE_PROGRAM=" <> ninja,
"-DANDROID_ABI=" <> a,
"-DANDROID_PLATFORM=" <> show (platform env),
"-DANDROID_STL=c++_shared",
Expand Down