updated sqlsrv and pdo_sqlsrv config.w32 to get the dir name dynamically
This commit is contained in:
parent
4fb02c3533
commit
86dd9ef420
|
@ -21,23 +21,23 @@ ARG_WITH("pdo-sqlsrv", "enable Microsoft Drivers for PHP for SQL Server (PDO dri
|
||||||
|
|
||||||
if( PHP_PDO_SQLSRV != "no" ) {
|
if( PHP_PDO_SQLSRV != "no" ) {
|
||||||
|
|
||||||
pdo_sqlsrv_src_class = "pdo_dbh.cpp pdo_init.cpp pdo_stmt.cpp pdo_util.cpp pdo_parser.cpp ";
|
pdo_sqlsrv_src_class = " pdo_dbh.cpp pdo_init.cpp pdo_stmt.cpp pdo_util.cpp pdo_parser.cpp ";
|
||||||
shared_src_class = "shared\core_init.cpp shared\core_conn.cpp shared\core_stmt.cpp shared\core_util.cpp shared\core_stream.cpp shared\core_results.cpp"
|
shared_src_class = " core_init.cpp core_conn.cpp core_stmt.cpp core_util.cpp core_stream.cpp core_results.cpp ";
|
||||||
|
|
||||||
if (CHECK_LIB("odbc32.lib", "pdo_sqlsrv") && CHECK_LIB("odbccp32.lib", "pdo_sqlsrv") &&
|
if (CHECK_LIB("odbc32.lib", "pdo_sqlsrv") && CHECK_LIB("odbccp32.lib", "pdo_sqlsrv") &&
|
||||||
CHECK_LIB("version.lib", "pdo_sqlsrv") && CHECK_LIB("psapi.lib", "pdo_sqlsrv")) {
|
CHECK_LIB("version.lib", "pdo_sqlsrv") && CHECK_LIB("psapi.lib", "pdo_sqlsrv")&&
|
||||||
|
CHECK_HEADER_ADD_INCLUDE( "core_sqlsrv.h", "CFLAGS_PDO_SQLSRV", configure_module_dirname + "\\shared")) {
|
||||||
EXTENSION("pdo_sqlsrv", pdo_sqlsrv_src_clas shared_src_class, PHP_PDO_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1")
|
CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_PDO_SQLSRV_ODBC");
|
||||||
|
CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_PDO_SQLSRV_ODBC");
|
||||||
CHECK_HEADER_ADD_INCLUDE( 'core_sqlsrv.h',CFLAGS_PDO_SQLSRV, PHP_PDO_SQLSRV_SHARED, "ext\\pdo_sqlsrv\\shared" )
|
ADD_SOURCES( configure_module_dirname + "\\shared", shared_src_class, "pdo_sqlsrv" );
|
||||||
CHECK_HEADER_ADD_INCLUDE('sql.h', 'CFLAGS_PDO_SQLSRV_ODBC');
|
ADD_FLAG( "LDFLAGS_PDO_SQLSRV", "/NXCOMPAT /DYNAMICBASE /debug" );
|
||||||
CHECK_HEADER_ADD_INCLUDE('sqlext.h', 'CFLAGS_PDO_SQLSRV_ODBC');
|
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/EHsc" );
|
||||||
ADD_FLAG( 'LDFLAGS_PDO_SQLSRV', '/NXCOMPAT /DYNAMICBASE /debug' );
|
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/GS" );
|
||||||
ADD_FLAG( 'CFLAGS_PDO_SQLSRV', '/EHsc' );
|
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/Zi" );
|
||||||
ADD_FLAG( 'CFLAGS_PDO_SQLSRV', '/GS' );
|
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/D ZEND_WIN32_FORCE_INLINE" );
|
||||||
ADD_FLAG( 'CFLAGS_PDO_SQLSRV', '/Zi' );
|
|
||||||
ADD_FLAG( 'CFLAGS_PDO_SQLSRV', '/D ZEND_WIN32_FORCE_INLINE' );
|
|
||||||
ADD_EXTENSION_DEP('pdo_sqlsrv', 'pdo');
|
ADD_EXTENSION_DEP('pdo_sqlsrv', 'pdo');
|
||||||
|
EXTENSION("pdo_sqlsrv", pdo_sqlsrv_src_class, PHP_PDO_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
|
||||||
|
} else {
|
||||||
|
WARNING("pdo-sqlsrv not enabled; libraries and headers not found");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
//
|
//
|
||||||
// Contents: JScript build configuration used by buildconf.bat
|
// Contents: JScript build configuration used by buildconf.bat
|
||||||
//
|
//
|
||||||
// Microsoft Drivers 4.0 for PHP for SQL Server
|
// Microsoft Drivers 4.1 for PHP for SQL Server
|
||||||
// Copyright(c) Microsoft Corporation
|
// Copyright(c) Microsoft Corporation
|
||||||
// All rights reserved.
|
// All rights reserved.
|
||||||
// MIT License
|
// MIT License
|
||||||
|
@ -21,19 +21,22 @@ ARG_ENABLE("sqlsrv", "enable Microsoft Drivers for PHP for SQL Server (SQLSRV dr
|
||||||
|
|
||||||
if( PHP_SQLSRV != "no" ) {
|
if( PHP_SQLSRV != "no" ) {
|
||||||
|
|
||||||
sqlsrv_src = "conn.cpp init.cpp stmt.cpp util.cpp core_init.cpp core_conn.cpp core_stmt.cpp core_util.cpp core_stream.cpp core_results.cpp";
|
sqlsrv_src_class = " conn.cpp init.cpp stmt.cpp util.cpp ";
|
||||||
|
shared_src_class = " core_init.cpp core_conn.cpp core_stmt.cpp core_util.cpp core_stream.cpp core_results.cpp ";
|
||||||
|
|
||||||
if (CHECK_LIB("odbc32.lib", "sqlsrv") && CHECK_LIB("odbccp32.lib", "sqlsrv") &&
|
if (CHECK_LIB("odbc32.lib", "sqlsrv") && CHECK_LIB("odbccp32.lib", "sqlsrv") &&
|
||||||
CHECK_LIB("version.lib", "sqlsrv") && CHECK_LIB("psapi.lib", "sqlsrv")) {
|
CHECK_LIB("version.lib", "sqlsrv") && CHECK_LIB("psapi.lib", "sqlsrv")&&
|
||||||
|
CHECK_HEADER_ADD_INCLUDE( "core_sqlsrv.h", "CFLAGS_SQLSRV", configure_module_dirname + "\\shared")) {
|
||||||
EXTENSION("sqlsrv", sqlsrv_src, PHP_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1")
|
ADD_SOURCES( configure_module_dirname + "\\shared", shared_src_class, "sqlsrv" );
|
||||||
|
CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_SQLSRV_ODBC");
|
||||||
CHECK_HEADER_ADD_INCLUDE('sql.h', 'CFLAGS_SQLSRV_ODBC');
|
CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_SQLSRV_ODBC");
|
||||||
CHECK_HEADER_ADD_INCLUDE('sqlext.h', 'CFLAGS_SQLSRV_ODBC');
|
ADD_FLAG( "LDFLAGS_SQLSRV", "/NXCOMPAT /DYNAMICBASE /debug" );
|
||||||
ADD_FLAG( 'LDFLAGS_SQLSRV', '/NXCOMPAT /DYNAMICBASE /debug' );
|
ADD_FLAG( "CFLAGS_SQLSRV", "/D ZEND_WIN32_FORCE_INLINE" );
|
||||||
ADD_FLAG( 'CFLAGS_SQLSRV', '/D ZEND_WIN32_FORCE_INLINE' );
|
ADD_FLAG( "CFLAGS_SQLSRV", "/EHsc" );
|
||||||
ADD_FLAG( 'CFLAGS_SQLSRV', '/EHsc' );
|
ADD_FLAG( "CFLAGS_SQLSRV", "/GS" );
|
||||||
ADD_FLAG( 'CFLAGS_SQLSRV', '/GS' );
|
ADD_FLAG( "CFLAGS_SQLSRV", "/Zi" );
|
||||||
ADD_FLAG( 'CFLAGS_SQLSRV', '/Zi' );
|
EXTENSION("sqlsrv", sqlsrv_src_class , PHP_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
|
||||||
|
} else {
|
||||||
|
WARNING("sqlsrv not enabled; libraries and headers not found");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue