Cleanup FB paths

FirebirdSQL · Mar 2, 2025 · 5ff8098 · 5ff8098
1 parent 443e47d
commit 5ff8098
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/config.w32 b/config.w32
@@ -3,12 +3,12 @@
 ARG_WITH("interbase", "InterBase support", "no");
 
 if (PHP_INTERBASE != "no") {
-
-	if (CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_INTERBASE",
-				PHP_PHP_BUILD + "\\include\\interbase;" + PHP_PHP_BUILD + "\\interbase\\include;" + PHP_INTERBASE) &&
-			(CHECK_LIB("fbclient_ms.lib", "interbase", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_INTERBASE) ||
-			 CHECK_LIB("gds32_ms.lib", "interbase", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_INTERBASE))) {
-
+	if (
+		CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_INTERBASE", PHP_INTERBASE + "\\include") && (
+			CHECK_LIB("fbclient_ms.lib", "interbase", PHP_INTERBASE + "\\lib") ||
+			CHECK_LIB("gds32_ms.lib", "interbase", PHP_INTERBASE + "\\lib")
+		)
+	) {
 		EXTENSION("interbase", "interbase.c ibase_query.c ibase_service.c ibase_events.c ibase_blobs.c pdo_firebird_utils.cpp", PHP_INTERBASE_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 		AC_DEFINE('HAVE_IBASE', 1, 'Have interbase library');
 	} else {

diff --git a/win_build_scripts/php-fb-sdk-build.bat b/win_build_scripts/php-fb-sdk-build.bat
@@ -41,10 +41,10 @@ exit /B
     )
 
     if "%pfb_x86%" gtr "0"  (
-        set with_interbase="shared,%PFB_FB32_DIR%lib;%PFB_FB32_DIR%include"
+        set with_interbase="shared,%PFB_FB32_DIR%"
         set build_msg=%build_msg% x86
     ) else (
-        set with_interbase="shared,%PFB_FB64_DIR%lib;%PFB_FB64_DIR%include"
+        set with_interbase="shared,%PFB_FB64_DIR%"
         set build_msg=%build_msg% x86_64
     )