summaryrefslogtreecommitdiff
path: root/php/src/php5
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2016-05-11 15:58:33 -0400
committerJoe George <joe@zeroc.com>2016-05-11 15:58:33 -0400
commite834b20b79447b8208b989608fd4c9fde3807b28 (patch)
tree656ca452d2ff57d1ac9a5eb55cafe0b69d9ddf86 /php/src/php5
parentBackport PHP7 support (diff)
downloadice-e834b20b79447b8208b989608fd4c9fde3807b28.tar.bz2
ice-e834b20b79447b8208b989608fd4c9fde3807b28.tar.xz
ice-e834b20b79447b8208b989608fd4c9fde3807b28.zip
Fix PHP 7 build on Windows
Diffstat (limited to 'php/src/php5')
-rw-r--r--php/src/php5/Makefile.mak16
1 files changed, 1 insertions, 15 deletions
diff --git a/php/src/php5/Makefile.mak b/php/src/php5/Makefile.mak
index 2362a1d4b31..1698a2b901c 100644
--- a/php/src/php5/Makefile.mak
+++ b/php/src/php5/Makefile.mak
@@ -10,7 +10,7 @@
top_srcdir = ..\..
LIBNAME = php_ice$(LIBSUFFIX).lib
-DLLNAME = $(libdir)\php_ice$(LIBSUFFIX).dll
+DLLNAME = $(libdir)\php_ice$(LIBSUFFIX).dll
TARGETS = $(LIBNAME) $(DLLNAME)
@@ -25,22 +25,8 @@ OBJS = .\Communicator.obj \
.\Types.obj \
.\Util.obj
-
-#
-# Get Make.common.rules.mak to figure out CPP_COMPILER by setting it
-# to "auto"
-#
-CPP_COMPILER=auto
-
!include $(top_srcdir)\config\Make.rules.mak.php
-#
-# Ensure we're using VC110
-#
-!if "$(CPP_COMPILER)" != "VC110"
-!error Invalid CPP_COMPILER setting: $(CPP_COMPILER). Must be set to VC110.
-!endif
-
CPPFLAGS = -I. -I.. $(CPPFLAGS) $(ICE_CPPFLAGS) $(PHP_CPPFLAGS)
!if "$(ARCH)" == "x86"