From 16546698454927ca14a66ba2daf3b0ce72564aa0 Mon Sep 17 00:00:00 2001
From: DevWiki <devwiki@qq.com>
Date: Mon, 15 Jul 2024 15:09:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC,=E6=94=AF=E6=8C=81=E7=BC=96=E8=AF=91=20x86=20?=
 =?UTF-8?q?=E5=92=8C=20arm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cppLib/build.bat     | 22 +++++++++++-----------
 cppLib/build_all.bat |  5 -----
 cppLib/build_x86.bat |  1 +
 3 files changed, 12 insertions(+), 16 deletions(-)
 delete mode 100644 cppLib/build_all.bat
 create mode 100644 cppLib/build_x86.bat

diff --git a/cppLib/build.bat b/cppLib/build.bat
index 5ab660e..ea14748 100644
--- a/cppLib/build.bat
+++ b/cppLib/build.bat
@@ -2,27 +2,27 @@
 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"
-::)
-echo %native_path%
-
+:: IF NOT "%~2" == "" (
+::     set "native_path=%~2"
+:: )
+echo native_path: "%native_path%"
 
 set "toolchain=%native_path%build\cmake\ohos.toolchain.cmake"
-echo %toolchain%
+echo toolchain: "%toolchain%"
 set "cmake_root=%native_path%build-tools\cmake\"
-echo %cmake_root%
+echo cmake_root: "%cmake_root%"
 set "cmake_path=%cmake_root%bin\cmake.exe"
-echo %cmake_path%
+echo cmake_path: "%cmake_path%"
 set "ninja_path=%cmake_root%bin\ninja.exe"
-echo %ninja_path%
+echo ninja_path: "%ninja_path%"
 set "make_path=C:\MinGW\msys\1.0\bin\make.exe"
-echo %make_path%
+echo make_path: %make_path%
 set "arch=arm64-v8a"
+
 IF NOT "%~1" == "" (
     set "arch=%~1"
 )
-echo %arch%
+echo arch: "%arch%"
 
 if exist build (
     del /q /s build
diff --git a/cppLib/build_all.bat b/cppLib/build_all.bat
deleted file mode 100644
index 8c8f94e..0000000
--- a/cppLib/build_all.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-chcp 65001 > nul
-build.bat
-
-build.bat x86_64
diff --git a/cppLib/build_x86.bat b/cppLib/build_x86.bat
new file mode 100644
index 0000000..2a7c3f2
--- /dev/null
+++ b/cppLib/build_x86.bat
@@ -0,0 +1 @@
+build.bat "x86_64"