From f93947a84a35156820ac6c04a5368c9ca0860b9e Mon Sep 17 00:00:00 2001 From: Naruto TAKAHASHI Date: Mon, 31 Mar 2025 00:05:28 +0900 Subject: [PATCH 1/3] fix --- Scripts/build_converter_win.bat | 6 +++--- Scripts/build_convertergui_win.bat | 6 +++--- Scripts/release_converter_win.bat | 6 +++--- Scripts/release_viewer2_win.bat | 6 +++--- Scripts/release_win.bat | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Scripts/build_converter_win.bat b/Scripts/build_converter_win.bat index ee9f6faf..63147f3d 100644 --- a/Scripts/build_converter_win.bat +++ b/Scripts/build_converter_win.bat @@ -4,11 +4,11 @@ set CURDIR=%~dp0 set BASEDIR=%CURDIR%.. set BUILDDIR=%BASEDIR%\Build set VCDIR=C:\Program Files\Microsoft Visual Studio\2022 -if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" { +if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( set HOST_ARCH="x64" -} else { +) else ( set HOST_ARCH=%PROCESSOR_ARCHITECTURE% -} +) set TARGET_ARCH=%HOST_ARCH% if exist "%VCDIR%\Enterprise" ( diff --git a/Scripts/build_convertergui_win.bat b/Scripts/build_convertergui_win.bat index b876c244..7989478b 100644 --- a/Scripts/build_convertergui_win.bat +++ b/Scripts/build_convertergui_win.bat @@ -5,11 +5,11 @@ set BASEDIR=%CURDIR%.. set BUILDDIR=%BASEDIR%\Build set VCDIR=C:\Program Files\Microsoft Visual Studio\2022 set DEFAULT_QT_PREFIX=C:\Qt\6.8.2 -if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" { +if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( set HOST_ARCH="x64" -} else { +) else ( set HOST_ARCH=%PROCESSOR_ARCHITECTURE% -} +) set TARGET_ARCH=%HOST_ARCH% if exist "%VCDIR%\Enterprise" ( diff --git a/Scripts/release_converter_win.bat b/Scripts/release_converter_win.bat index ecf8ea8e..11b7e36f 100644 --- a/Scripts/release_converter_win.bat +++ b/Scripts/release_converter_win.bat @@ -5,11 +5,11 @@ set BASEDIR=%CURDIR%.. set BUILDDIR=%BASEDIR%\Build set TOOLSDIR=%BASEDIR%\Tools set DEFAULT_QT_PREFIX=C:\Qt\6.8.2 -if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" { +if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( set HOST_ARCH="x64" -} else { +) else ( set HOST_ARCH=%PROCESSOR_ARCHITECTURE% -} +) set TARGET_ARCH=%HOST_ARCH% @echo on diff --git a/Scripts/release_viewer2_win.bat b/Scripts/release_viewer2_win.bat index 5cebe48b..8dd8a310 100644 --- a/Scripts/release_viewer2_win.bat +++ b/Scripts/release_viewer2_win.bat @@ -5,11 +5,11 @@ set BASEDIR=%CURDIR%.. set BUILDDIR=%BASEDIR%\Build set DEPENDDIR=%BUILDDIR%\Depends set TOOLSDIR=%BASEDIR%\Tools -if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" { +if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( set HOST_ARCH="x64" -} else { +) else ( set HOST_ARCH=%PROCESSOR_ARCHITECTURE% -} +) set TARGET_ARCH=%HOST_ARCH% @echo on diff --git a/Scripts/release_win.bat b/Scripts/release_win.bat index dd8fabb7..a3d9c118 100644 --- a/Scripts/release_win.bat +++ b/Scripts/release_win.bat @@ -4,11 +4,11 @@ set CURDIR=%~dp0 set BASEDIR=%CURDIR%.. set BUILDDIR=%BASEDIR%\Build set TOOLSDIR=%BASEDIR%\Tools -if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" { +if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( set HOST_ARCH="x64" -} else { +) else ( set HOST_ARCH=%PROCESSOR_ARCHITECTURE% -} +) set TARGET_ARCH=%HOST_ARCH% @echo on From e2822ace75aef7ebfaacda80c7c7180adbf3e5bc Mon Sep 17 00:00:00 2001 From: Naruto TAKAHASHI Date: Mon, 31 Mar 2025 00:10:56 +0900 Subject: [PATCH 2/3] fix --- Scripts/build_converter_win.bat | 2 +- Scripts/build_convertergui_win.bat | 2 +- Scripts/build_viewer2_win.bat | 2 +- Scripts/release_converter_win.bat | 2 +- Scripts/release_viewer2_win.bat | 2 +- Scripts/release_win.bat | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Scripts/build_converter_win.bat b/Scripts/build_converter_win.bat index 63147f3d..fbecfce6 100644 --- a/Scripts/build_converter_win.bat +++ b/Scripts/build_converter_win.bat @@ -5,7 +5,7 @@ set BASEDIR=%CURDIR%.. set BUILDDIR=%BASEDIR%\Build set VCDIR=C:\Program Files\Microsoft Visual Studio\2022 if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( - set HOST_ARCH="x64" + set HOST_ARCH=x64 ) else ( set HOST_ARCH=%PROCESSOR_ARCHITECTURE% ) diff --git a/Scripts/build_convertergui_win.bat b/Scripts/build_convertergui_win.bat index 7989478b..77201116 100644 --- a/Scripts/build_convertergui_win.bat +++ b/Scripts/build_convertergui_win.bat @@ -6,7 +6,7 @@ set BUILDDIR=%BASEDIR%\Build set VCDIR=C:\Program Files\Microsoft Visual Studio\2022 set DEFAULT_QT_PREFIX=C:\Qt\6.8.2 if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( - set HOST_ARCH="x64" + set HOST_ARCH=x64 ) else ( set HOST_ARCH=%PROCESSOR_ARCHITECTURE% ) diff --git a/Scripts/build_viewer2_win.bat b/Scripts/build_viewer2_win.bat index 2e257e42..70dd3d7b 100755 --- a/Scripts/build_viewer2_win.bat +++ b/Scripts/build_viewer2_win.bat @@ -6,7 +6,7 @@ set BUILDDIR=%BASEDIR%\Build set VCDIR=C:\Program Files\Microsoft Visual Studio\2022 set Jucer2CMake=%BUILDDIR%\Viewer2\FRUT\prefix\FRUT\bin\Jucer2CMake.exe if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" { - set HOST_ARCH="x64" + set HOST_ARCH=x64 } else { set HOST_ARCH=%PROCESSOR_ARCHITECTURE% } diff --git a/Scripts/release_converter_win.bat b/Scripts/release_converter_win.bat index 11b7e36f..3341b90f 100644 --- a/Scripts/release_converter_win.bat +++ b/Scripts/release_converter_win.bat @@ -6,7 +6,7 @@ set BUILDDIR=%BASEDIR%\Build set TOOLSDIR=%BASEDIR%\Tools set DEFAULT_QT_PREFIX=C:\Qt\6.8.2 if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( - set HOST_ARCH="x64" + set HOST_ARCH=x64 ) else ( set HOST_ARCH=%PROCESSOR_ARCHITECTURE% ) diff --git a/Scripts/release_viewer2_win.bat b/Scripts/release_viewer2_win.bat index 8dd8a310..989e7469 100644 --- a/Scripts/release_viewer2_win.bat +++ b/Scripts/release_viewer2_win.bat @@ -6,7 +6,7 @@ set BUILDDIR=%BASEDIR%\Build set DEPENDDIR=%BUILDDIR%\Depends set TOOLSDIR=%BASEDIR%\Tools if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( - set HOST_ARCH="x64" + set HOST_ARCH=x64 ) else ( set HOST_ARCH=%PROCESSOR_ARCHITECTURE% ) diff --git a/Scripts/release_win.bat b/Scripts/release_win.bat index a3d9c118..985296c3 100644 --- a/Scripts/release_win.bat +++ b/Scripts/release_win.bat @@ -5,7 +5,7 @@ set BASEDIR=%CURDIR%.. set BUILDDIR=%BASEDIR%\Build set TOOLSDIR=%BASEDIR%\Tools if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( - set HOST_ARCH="x64" + set HOST_ARCH=x64 ) else ( set HOST_ARCH=%PROCESSOR_ARCHITECTURE% ) From b10e53e50bf0555b6ba66faba7b7ae3a03b1a434 Mon Sep 17 00:00:00 2001 From: Naruto TAKAHASHI Date: Mon, 31 Mar 2025 00:23:54 +0900 Subject: [PATCH 3/3] fix --- Scripts/build_viewer2_win.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Scripts/build_viewer2_win.bat b/Scripts/build_viewer2_win.bat index 70dd3d7b..583d4f42 100755 --- a/Scripts/build_viewer2_win.bat +++ b/Scripts/build_viewer2_win.bat @@ -5,11 +5,11 @@ set BASEDIR=%CURDIR%.. set BUILDDIR=%BASEDIR%\Build set VCDIR=C:\Program Files\Microsoft Visual Studio\2022 set Jucer2CMake=%BUILDDIR%\Viewer2\FRUT\prefix\FRUT\bin\Jucer2CMake.exe -if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" { +if /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( set HOST_ARCH=x64 -} else { +) else ( set HOST_ARCH=%PROCESSOR_ARCHITECTURE% -} +) set TARGET_ARCH=%HOST_ARCH% if exist "%VCDIR%\Enterprise" (