diff options
| author | Joe George <joe@zeroc.com> | 2016-08-04 11:24:37 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-08-04 11:24:37 -0400 |
| commit | dce0693f91b71b2917a26ca168f5be54d5243bb1 (patch) | |
| tree | 0014f4e8797fb083333530df1d24c535cb90edc3 | |
| parent | Fixed (ICE-7216) IceStorm test icedb lock files not being deleted (diff) | |
| download | ice-dce0693f91b71b2917a26ca168f5be54d5243bb1.tar.bz2 ice-dce0693f91b71b2917a26ca168f5be54d5243bb1.tar.xz ice-dce0693f91b71b2917a26ca168f5be54d5243bb1.zip | |
Fix ICE-7247
Disabled the new Visual Studio 2015 Update 3 optimizer for icegrid
and the metrics test.
| -rw-r--r-- | cpp/src/IceGrid/Makefile.mak | 6 | ||||
| -rw-r--r-- | cpp/test/Ice/metrics/Makefile.mak | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index 316fd0371c7..636fef61a74 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -135,6 +135,12 @@ NLINKWITH = $(LIBS) advapi32.lib pdh.lib ws2_32.lib SLICE2CPPFLAGS = --checksum --ice --include-dir IceGrid $(SLICE2CPPFLAGS) CPPFLAGS = -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -Zm200 +!if "$(OPTIMIZE)" == "yes" +!if "$(CPP_COMPILER)" == "VC140" +CPPFLAGS = $(CPPFLAGS) -d2SSAOptimizer- +!endif +!endif + !if "$(GENERATE_PDB)" == "yes" APDBFLAGS = /pdb:$(ADMIN:.exe=.pdb) DBPDBFLAGS = /pdb:$(DB:.exe=.pdb) diff --git a/cpp/test/Ice/metrics/Makefile.mak b/cpp/test/Ice/metrics/Makefile.mak index 7a410c37ec0..a8b573ea22c 100644 --- a/cpp/test/Ice/metrics/Makefile.mak +++ b/cpp/test/Ice/metrics/Makefile.mak @@ -54,6 +54,12 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN +!if "$(OPTIMIZE)" == "yes" +!if "$(CPP_COMPILER)" == "VC140" +CPPFLAGS = $(CPPFLAGS) -d2SSAOptimizer- +!endif +!endif + !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb |