diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-12-05 09:51:54 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-12-05 09:51:54 +0100 |
| commit | 12c0424d42a1f63eac78fb889e47b6d05d9498a5 (patch) | |
| tree | adefc49637cd6344679d88c68092d80c4a010afd /php/src | |
| parent | Don't cleanup on timeout some tests expect timeout (diff) | |
| download | ice-12c0424d42a1f63eac78fb889e47b6d05d9498a5.tar.bz2 ice-12c0424d42a1f63eac78fb889e47b6d05d9498a5.tar.xz ice-12c0424d42a1f63eac78fb889e47b6d05d9498a5.zip | |
Fixed testicedist.py and checks for VC100/VC110 when building IcePHP/IcePy
Diffstat (limited to 'php/src')
| -rw-r--r-- | php/src/IcePHP/Makefile.mak | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/php/src/IcePHP/Makefile.mak b/php/src/IcePHP/Makefile.mak index 977dbc0a866..4470f53a872 100644 --- a/php/src/IcePHP/Makefile.mak +++ b/php/src/IcePHP/Makefile.mak @@ -25,8 +25,22 @@ 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" |