From 13d6f9129e8fbba30329de50803d3e8776af9753 Mon Sep 17 00:00:00 2001 From: v-kaywon Date: Mon, 29 Jan 2018 16:38:09 -0800 Subject: [PATCH] change version.h and config flags for debug mode --- source/pdo_sqlsrv/config.w32 | 3 +-- source/shared/version.h | 4 ++-- source/sqlsrv/config.w32 | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/source/pdo_sqlsrv/config.w32 b/source/pdo_sqlsrv/config.w32 index 29288b41..bd1eaf04 100644 --- a/source/pdo_sqlsrv/config.w32 +++ b/source/pdo_sqlsrv/config.w32 @@ -34,8 +34,7 @@ if( PHP_PDO_SQLSRV != "no" ) { ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/EHsc" ); ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/GS" ); ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/Zi" ); - ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/O2" ); - ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/guard:cf" ); + if (PHP_DEBUG != "yes") ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/guard:cf /O2" ); ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/D ZEND_WIN32_FORCE_INLINE" ); ADD_EXTENSION_DEP('pdo_sqlsrv', 'pdo'); EXTENSION("pdo_sqlsrv", pdo_sqlsrv_src_class, PHP_PDO_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); diff --git a/source/shared/version.h b/source/shared/version.h index cb13a805..a06534ec 100644 --- a/source/shared/version.h +++ b/source/shared/version.h @@ -35,7 +35,7 @@ // for stable releases should be empty // "-RC" for release candidates // "-preview" for ETP -#define SEMVER_PRERELEASE "RC1" +#define SEMVER_PRERELEASE // Semantic versioning build metadata, build meta data is not counted in precedence order. #define SEMVER_BUILDMETA @@ -50,7 +50,7 @@ // For preview release, we want the following: // #define VER_FILEVERSION_STR VER_APIVERSION_STR "-" SEMVER_PRERELEASE SEMVER_BUILDMETA // because pecl doesn't like dashes. However, if SEMVER_PRERELEASE is empty, the "-" must be removed -#define VER_FILEVERSION_STR VER_APIVERSION_STR "-" SEMVER_PRERELEASE SEMVER_BUILDMETA +#define VER_FILEVERSION_STR VER_APIVERSION_STR SEMVER_PRERELEASE SEMVER_BUILDMETA #define _FILEVERSION SQLVERSION_MAJOR,SQLVERSION_MINOR,SQLVERSION_PATCH,SQLVERSION_BUILD // PECL package version macros (can't have '-' or '+') diff --git a/source/sqlsrv/config.w32 b/source/sqlsrv/config.w32 index 6e3df93a..77d8c4d1 100644 --- a/source/sqlsrv/config.w32 +++ b/source/sqlsrv/config.w32 @@ -35,8 +35,7 @@ if( PHP_SQLSRV != "no" ) { ADD_FLAG( "CFLAGS_SQLSRV", "/EHsc" ); ADD_FLAG( "CFLAGS_SQLSRV", "/GS" ); ADD_FLAG( "CFLAGS_SQLSRV", "/Zi" ); - ADD_FLAG( "CFLAGS_SQLSRV", "/O2" ); - ADD_FLAG( "CFLAGS_SQLSRV", "/guard:cf" ); + if (PHP_DEBUG != "yes") ADD_FLAG( "CFLAGS_SQLSRV", "/guard:cf /O2" ); EXTENSION("sqlsrv", sqlsrv_src_class , PHP_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); } else { WARNING("sqlsrv not enabled; libraries and headers not found");