diff options
| author | Anatol Belski <ab@php.net> | 2014-09-20 19:46:44 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-20 19:46:44 +0200 |
| commit | 132cd8be0d13eaeee200cfa09b0596f6619c6a7e (patch) | |
| tree | 7a928718769260e60252c0e048d2f10d0cd94f8c /ext/xmlreader/xmlreader.dsp | |
| parent | 763bfb4f3b0e66d5a961f9f367aa86e9f9da262e (diff) | |
| parent | 268bcdc1cb668f76b85a84bc4d32194548cc185a (diff) | |
| download | php-git-132cd8be0d13eaeee200cfa09b0596f6619c6a7e.tar.gz | |
Merge branch 'pull-request/805'
* pull-request/805:
Removes accidentally added files.
Reverts some unwanted changes
Deletes patch leftovers
Replaces php5 with php7, without whitespace changes.
Diffstat (limited to 'ext/xmlreader/xmlreader.dsp')
| -rw-r--r-- | ext/xmlreader/xmlreader.dsp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/xmlreader/xmlreader.dsp b/ext/xmlreader/xmlreader.dsp index 7b21518ba3..a2a6c39460 100644 --- a/ext/xmlreader/xmlreader.dsp +++ b/ext/xmlreader/xmlreader.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php5ts_debug.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\Debug_TS/php_xmlreader.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release"
+# ADD LINK32 php7ts_debug.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\Debug_TS/php_xmlreader.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release"
!ELSEIF "$(CFG)" == "xmlreader - Win32 Release_TS"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php5ts_debug.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\Debug_TS/php_xmlreader.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release"
-# ADD LINK32 php5ts.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /incremental:no /machine:I386 /out:"..\..\Release_TS/php_xmlreader.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release"
+# ADD BASE LINK32 php7ts_debug.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\Debug_TS/php_xmlreader.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release"
+# ADD LINK32 php7ts.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /incremental:no /machine:I386 /out:"..\..\Release_TS/php_xmlreader.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release"
# SUBTRACT LINK32 /debug
!ENDIF
|