mirror of
https://github.com/jcefmaven/jcefbuild.git
synced 2025-12-02 14:25:59 +08:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
93c173340a | ||
|
|
0bf27250e3 |
@@ -70,9 +70,13 @@ if [ -f "out/buildtools/clang-format" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
#Move jcef_build
|
#Move jcef_build
|
||||||
rm -rf jcef/jcef_build
|
if [ -f "out/jcef_build" ]; then
|
||||||
mv out/jcef_build jcef/jcef_build
|
rm -rf jcef/jcef_build
|
||||||
|
mv out/jcef_build jcef/jcef_build
|
||||||
|
fi
|
||||||
|
|
||||||
#Move target to binary_distrib
|
#Move target to binary_distrib
|
||||||
rm -rf jcef/binary_distrib
|
if [ -f "out/target" ]; then
|
||||||
mv out/target jcef/binary_distrib
|
rm -rf jcef/binary_distrib
|
||||||
|
mv out/target jcef/binary_distrib
|
||||||
|
fi
|
||||||
|
|||||||
@@ -53,6 +53,9 @@ if [ ! -d "jcef_build" ]; then
|
|||||||
fi
|
fi
|
||||||
cd jcef_build
|
cd jcef_build
|
||||||
|
|
||||||
|
# Reinstall "six" python package to fix broken builds on amd64
|
||||||
|
pip install --ignore-installed six
|
||||||
|
|
||||||
# MacOS: Generate amd64/arm64 Makefiles.
|
# MacOS: Generate amd64/arm64 Makefiles.
|
||||||
if [ ${TARGETARCH} == 'amd64' ]; then
|
if [ ${TARGETARCH} == 'amd64' ]; then
|
||||||
cmake -G "Ninja" -DPROJECT_ARCH="x86_64" -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ..
|
cmake -G "Ninja" -DPROJECT_ARCH="x86_64" -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ..
|
||||||
|
|||||||
Reference in New Issue
Block a user