fix cpp
This commit is contained in:
@@ -2,14 +2,11 @@
|
||||
chcp 65001 > nul
|
||||
|
||||
set "native_path=C:\Program Files\Huawei\DevEco Studio5\sdk\HarmonyOS-NEXT-DB1\openharmony\native\"
|
||||
IF NOT "%~1" == "" (
|
||||
set "native_path=%~1"
|
||||
)
|
||||
::IF NOT "%~1" == "" (
|
||||
:: set "native_path=%~1"
|
||||
::)
|
||||
echo %native_path%
|
||||
|
||||
IF NOT "%~2" == "" (
|
||||
set "arch=%~2"
|
||||
)
|
||||
|
||||
set "toolchain=%native_path%build\cmake\ohos.toolchain.cmake"
|
||||
echo %toolchain%
|
||||
@@ -22,6 +19,9 @@ echo %ninja_path%
|
||||
set "make_path=C:\MinGW\msys\1.0\bin\make.exe"
|
||||
echo %make_path%
|
||||
set "arch=arm64-v8a"
|
||||
IF NOT "%~1" == "" (
|
||||
set "arch=%~1"
|
||||
)
|
||||
echo %arch%
|
||||
|
||||
if exist build (
|
||||
@@ -40,11 +40,10 @@ if exist dist (
|
||||
|
||||
cd build
|
||||
:: 使用 make 构建
|
||||
:: "%cmake_path%" -G"Unix Makefiles" -DCMAKE_MAKE_PROGRAM="%make_path%" -DOHOS_STL=c++_static -DOHOS_ARCH="%arch%" -DOHOS_PLATFORM=OHOS -DCMAKE_TOOLCHAIN_FILE="%toolchain%" ..
|
||||
:: "%cmake_path%" -G "Unix Makefiles" -DCMAKE_MAKE_PROGRAM="%make_path%" -DOHOS_STL=c++_static -DOHOS_ARCH="%arch%" -DOHOS_PLATFORM=OHOS -DCMAKE_TOOLCHAIN_FILE="%toolchain%" ..
|
||||
:: %make_path%
|
||||
|
||||
:: 使用 ninja 构建
|
||||
"%cmake_path%" -GNinja -DCMAKE_MAKE_PROGRAM="%ninja_path%" -DOHOS_STL=c++_static -DOHOS_ARCH="%arch%" -DOHOS_PLATFORM=OHOS -DCMAKE_TOOLCHAIN_FILE="%toolchain%" ..
|
||||
"%cmake_path%" -G "Ninja" -D CMAKE_MAKE_PROGRAM="%ninja_path%" -D OHOS_STL=c++_static -D OHOS_ARCH="%arch%" -D OHOS_PLATFORM=OHOS -D CMAKE_TOOLCHAIN_FILE="%toolchain%" ..
|
||||
"%ninja_path%"
|
||||
cd ../
|
||||
|
||||
|
@@ -3,5 +3,3 @@ chcp 65001 > nul
|
||||
build.bat
|
||||
|
||||
build.bat x86_64
|
||||
|
||||
build.bat
|
BIN
cppLib/dist/lib/x86_64/libcalculate.so
vendored
BIN
cppLib/dist/lib/x86_64/libcalculate.so
vendored
Binary file not shown.
Reference in New Issue
Block a user