Skip to content

Commit 5ff8098

Browse files
committed
Cleanup FB paths
1 parent 443e47d commit 5ff8098

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

config.w32

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
ARG_WITH("interbase", "InterBase support", "no");
44

55
if (PHP_INTERBASE != "no") {
6-
7-
if (CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_INTERBASE",
8-
PHP_PHP_BUILD + "\\include\\interbase;" + PHP_PHP_BUILD + "\\interbase\\include;" + PHP_INTERBASE) &&
9-
(CHECK_LIB("fbclient_ms.lib", "interbase", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_INTERBASE) ||
10-
CHECK_LIB("gds32_ms.lib", "interbase", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_INTERBASE))) {
11-
6+
if (
7+
CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_INTERBASE", PHP_INTERBASE + "\\include") && (
8+
CHECK_LIB("fbclient_ms.lib", "interbase", PHP_INTERBASE + "\\lib") ||
9+
CHECK_LIB("gds32_ms.lib", "interbase", PHP_INTERBASE + "\\lib")
10+
)
11+
) {
1212
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");
1313
AC_DEFINE('HAVE_IBASE', 1, 'Have interbase library');
1414
} else {

win_build_scripts/php-fb-sdk-build.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ exit /B
4141
)
4242

4343
if "%pfb_x86%" gtr "0" (
44-
set with_interbase="shared,%PFB_FB32_DIR%lib;%PFB_FB32_DIR%include"
44+
set with_interbase="shared,%PFB_FB32_DIR%"
4545
set build_msg=%build_msg% x86
4646
) else (
47-
set with_interbase="shared,%PFB_FB64_DIR%lib;%PFB_FB64_DIR%include"
47+
set with_interbase="shared,%PFB_FB64_DIR%"
4848
set build_msg=%build_msg% x86_64
4949
)
5050

0 commit comments

Comments
 (0)