mirror of
https://github.com/php/php-src.git
synced 2024-09-23 02:47:26 +00:00
move more common ldflags into function
This commit is contained in:
parent
af7e3064f3
commit
12cf41ca35
@ -90,12 +90,6 @@ if (VS_TOOLSET && VCVERS >= 1500 && PHP_MP != 'disable') {
|
|||||||
// General link flags
|
// General link flags
|
||||||
toolset_setup_common_ldlags();
|
toolset_setup_common_ldlags();
|
||||||
|
|
||||||
// General DLL link flags
|
|
||||||
DEFINE("DLL_LDFLAGS", "/dll ");
|
|
||||||
|
|
||||||
// PHP DLL link flags
|
|
||||||
DEFINE("PHP_LDFLAGS", "$(DLL_LDFLAGS)");
|
|
||||||
|
|
||||||
// General libs
|
// General libs
|
||||||
// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib comdlg32.lib
|
// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib comdlg32.lib
|
||||||
DEFINE("LIBS", "kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib Dnsapi.lib");
|
DEFINE("LIBS", "kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib Dnsapi.lib");
|
||||||
|
@ -77,11 +77,8 @@ if (VS_TOOLSET && VCVERS >= 1500 && PHP_MP != 'disable') {
|
|||||||
* files that make up the snapshot template? */
|
* files that make up the snapshot template? */
|
||||||
ARG_WITH("snapshot-template", "Path to snapshot builder template dir", "no");
|
ARG_WITH("snapshot-template", "Path to snapshot builder template dir", "no");
|
||||||
|
|
||||||
// General DLL link flags
|
// General link flags
|
||||||
DEFINE("DLL_LDFLAGS", "/dll ");
|
toolset_setup_common_ldlags();
|
||||||
|
|
||||||
// PHP DLL link flags
|
|
||||||
DEFINE("PHP_LDFLAGS", "$(DLL_LDFLAGS)");
|
|
||||||
|
|
||||||
// General libs
|
// General libs
|
||||||
// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib comdlg32.lib
|
// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib comdlg32.lib
|
||||||
|
@ -2567,6 +2567,12 @@ function toolset_setup_common_cflags()
|
|||||||
|
|
||||||
function toolset_setup_common_ldlags()
|
function toolset_setup_common_ldlags()
|
||||||
{
|
{
|
||||||
|
// General DLL link flags
|
||||||
|
DEFINE("DLL_LDFLAGS", "/dll ");
|
||||||
|
|
||||||
|
// PHP DLL link flags
|
||||||
|
DEFINE("PHP_LDFLAGS", "$(DLL_LDFLAGS)");
|
||||||
|
|
||||||
if (VS_TOOLSET) {
|
if (VS_TOOLSET) {
|
||||||
if (VCVERS >= 1700) {
|
if (VCVERS >= 1700) {
|
||||||
DEFINE("LDFLAGS", "/nologo ");
|
DEFINE("LDFLAGS", "/nologo ");
|
||||||
|
Loading…
Reference in New Issue
Block a user