diff options
| author | Pierre Joye <pajoye@php.net> | 2008-07-06 09:55:44 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-07-06 09:55:44 +0000 |
| commit | 21bca5add33a7f74527d8021d99adc953124bcfa (patch) | |
| tree | ac555eab955bb272f9d19c25ae4c4f65b0f7a5d1 | |
| parent | 07ce850026a27a3ed5af83af1c5d3df98ae7135b (diff) | |
| download | php-git-21bca5add33a7f74527d8021d99adc953124bcfa.tar.gz | |
- correctly test the VCVERS (four digits now)
| -rw-r--r-- | win32/build/config.w32 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index aefcabc2a3..764551c847 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -144,7 +144,7 @@ DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)'); DEFINE("CFLAGS", "/nologo /FD $(BASE_INCLUDES) /D _WINDOWS \ /D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS"); -if (VCVERS < 14) { +if (VCVERS < 1400) { // Enable automatic precompiled headers ADD_FLAG('CFLAGS', ' /YX '); @@ -154,7 +154,7 @@ if (VCVERS < 14) { } } -if (VCVERS >= 14) { +if (VCVERS >= 1400) { // fun stuff: MS deprecated ANSI stdio and similar functions // disable annoying warnings. In addition, time_t defaults // to 64-bit. Ask for 32-bit. @@ -301,7 +301,7 @@ function add_extra_dirs() for (i = 0; i < path.length; i++) { f = FSO.GetAbsolutePathName(path[i]); if (FSO.FolderExists(f)) { - if (VCVERS <= 12 && f.indexOf(" ") >= 0) { + if (VCVERS <= 1200 && f.indexOf(" ") >= 0) { ADD_FLAG("LDFLAGS", '/libpath:"\\"' + f + '\\"" '); } else { ADD_FLAG("LDFLAGS", '/libpath:"' + f + '" '); |