From e6ff7cc6689ab6710ccaf7f12551de95de2c78d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C4=81rti=C5=86=C5=A1=20Lazd=C4=81ns?= <marrtins@dqdp.net>
Date: Sun, 2 Mar 2025 22:32:09 +0200
Subject: [PATCH] Tidy up

---
 win_build_scripts/README.md            | 2 +-
 win_build_scripts/php-fb-build.bat     | 4 ++--
 win_build_scripts/php-fb-config.bat    | 4 ++--
 win_build_scripts/php-fb-sdk-build.bat | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/win_build_scripts/README.md b/win_build_scripts/README.md
index 5253401..807d158 100644
--- a/win_build_scripts/README.md
+++ b/win_build_scripts/README.md
@@ -12,7 +12,7 @@ Make sure you got ~20GB free disk space to build for all PHP versions.
 
 Make sure ``git`` is in you PATH
 
-1. Set up Microsoft Visual Studio vc15 and vs16.
+1. Set up Microsoft Visual Studio vc15, vs16 and vs17 (for PHP8.4+).
 2. Set up Firebird 32-bit and 64-bit installations or libraries.
 3. Set up PHP-SDK according to https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2
 4. Clone php-firebird extension source somewhere.
diff --git a/win_build_scripts/php-fb-build.bat b/win_build_scripts/php-fb-build.bat
index ce9a696..accc387 100644
--- a/win_build_scripts/php-fb-build.bat
+++ b/win_build_scripts/php-fb-build.bat
@@ -59,10 +59,10 @@ set pfb_build_root=php%pfb_php_vers%\%pfb_cpp_vers%\
 set check_code="if(!function_exists('ibase_connect'))exit(1);"
 
 set TPATH=%PATH%
-set PATH=%PFB_FB64_DIR%;%TPATH%
+set PATH=%FB64_DIR%;%TPATH%
 "%pfb_build_root%x64\php-src\x64\Release_TS\php.exe" -dextension=.\php_interbase.dll -r %check_code% || goto :error
 "%pfb_build_root%x64\php-src\x64\Release\php.exe" -dextension=.\php_interbase.dll -r %check_code% || goto :error
-set PATH=%PFB_FB32_DIR%;%TPATH%
+set PATH=%FB32_DIR%;%TPATH%
 "%pfb_build_root%x86\php-src\Release_TS\php.exe" -dextension=.\php_interbase.dll -r %check_code% || goto :error
 "%pfb_build_root%x86\php-src\Release\php.exe" -dextension=.\php_interbase.dll -r %check_code% || goto :error
 set PATH=%TPATH%
diff --git a/win_build_scripts/php-fb-config.bat b/win_build_scripts/php-fb-config.bat
index 076ace2..c194371 100644
--- a/win_build_scripts/php-fb-config.bat
+++ b/win_build_scripts/php-fb-config.bat
@@ -14,5 +14,5 @@ set PFB_VERS=3.0.1-%GIT_HASH%
 set PFB_OUTPUT_DIR=D:\php-firebird\releases\
 
 @REM FB 32-bit and 64-bit libraries
-set PFB_FB32_DIR=C:\Program Files\Firebird\Firebird_5_0-x86
-set PFB_FB64_DIR=C:\Program Files\Firebird\Firebird_5_0
+set FB32_DIR=C:\Program Files\Firebird\Firebird_5_0-x86
+set FB64_DIR=C:\Program Files\Firebird\Firebird_5_0
diff --git a/win_build_scripts/php-fb-sdk-build.bat b/win_build_scripts/php-fb-sdk-build.bat
index ef629b5..61c2b73 100644
--- a/win_build_scripts/php-fb-sdk-build.bat
+++ b/win_build_scripts/php-fb-sdk-build.bat
@@ -3,13 +3,13 @@
 @REM Must be called under phpsdk-<php_vers>-<arch>.bat
 @REM
 @REM Calling script should set variables:
-@REM <PFB_FB32_DIR> <PFB_FB64_DIR> <PFB_SOURCE_DIR> <pfb_php_vers> [pfb_nts] [pfb_x86]
+@REM <FB32_DIR> <FB64_DIR> <PFB_SOURCE_DIR> <pfb_php_vers> [pfb_nts] [pfb_x86]
 @REM
 @REM set pfb_php_vers=7.4
 @REM set pfb_nts=1 if nts expected, 0 if ts
 @REM set pfb_x86=1 if linking to x86 fbclient, o if x64
 @REM
-@REM <PFB_FB32_DIR> <PFB_FB64_DIR> <PFB_SOURCE_DIR> all set in php-fb-config.bat
+@REM <FB32_DIR> <FB64_DIR> <PFB_SOURCE_DIR> all set in php-fb-config.bat
 @REM
 
 goto :MAIN
@@ -41,10 +41,10 @@ exit /B
     )
 
     if "%pfb_x86%" gtr "0"  (
-        set with_interbase="shared,%PFB_FB32_DIR%"
+        set with_interbase="shared,%FB32_DIR%"
         set build_msg=%build_msg% x86
     ) else (
-        set with_interbase="shared,%PFB_FB64_DIR%"
+        set with_interbase="shared,%FB64_DIR%"
         set build_msg=%build_msg% x86_64
     )