diff options
| author | Jose <jose@zeroc.com> | 2016-03-29 11:18:55 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-03-29 11:18:55 +0200 |
| commit | 9012487f2f6a2374c4938fff67d7145d6fdff446 (patch) | |
| tree | e6d75ea504fa49019b2518785217e6202b4d32ab | |
| parent | Install rules fixes (diff) | |
| download | ice-9012487f2f6a2374c4938fff67d7145d6fdff446.tar.bz2 ice-9012487f2f6a2374c4938fff67d7145d6fdff446.tar.xz ice-9012487f2f6a2374c4938fff67d7145d6fdff446.zip | |
Mingw build fixes
| -rwxr-xr-x | cpp/allTests.py | 2 | ||||
| -rw-r--r-- | cpp/test/Ice/Makefile | 7 | ||||
| -rw-r--r-- | cpp/test/IceDiscovery/simple/Makefile | 8 |
3 files changed, 13 insertions, 4 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py index 4540f054d0b..221b7b6f065 100755 --- a/cpp/allTests.py +++ b/cpp/allTests.py @@ -78,7 +78,7 @@ tests = [ ("Ice/enums", ["once"]), ("Ice/logger", ["once"]), ("Ice/networkProxy", ["core", "noipv6", "nosocks"]), - ("Ice/services", ["once"]), + ("Ice/services", ["once", "nomingw"]), ("IceSSL/configuration", ["once", "novalgrind"]), # valgrind doesn't work well with openssl ("IceBox/configuration", ["core", "noipv6", "novc100", "nomingw", "nomx"]), ("IceBox/admin", ["core", "noipv6", "novc100", "nomingw", "nomx"]), diff --git a/cpp/test/Ice/Makefile b/cpp/test/Ice/Makefile index 73b459f6f69..0e02cd9b376 100644 --- a/cpp/test/Ice/Makefile +++ b/cpp/test/Ice/Makefile @@ -51,8 +51,11 @@ SUBDIRS = proxy \ enums \ echo \ logger \ - networkProxy \ - services + networkProxy + +ifeq ($(findstring MINGW,$(UNAME)),) +SUBDIRS := $(SUBDIRS) services +endif .PHONY: $(EVERYTHING) $(SUBDIRS) diff --git a/cpp/test/IceDiscovery/simple/Makefile b/cpp/test/IceDiscovery/simple/Makefile index aaa46cb42e6..ffff74f3bef 100644 --- a/cpp/test/IceDiscovery/simple/Makefile +++ b/cpp/test/IceDiscovery/simple/Makefile @@ -31,9 +31,15 @@ include $(top_srcdir)/config/Make.rules CPPFLAGS := -I. -I../../include $(CPPFLAGS) +ifneq ($(findstring MINGW,$(UNAME)),) +ICEDISOVERY_LIBS = -licediscovery$(SOVERSION)$(COMPSUFFIX) +else +ICEDISOVERY_LIBS = -lIceDiscovery +endif + $(CLIENT): $(COBJS) rm -f $@ - $(call mktest,$@,$(COBJS), -lIceDiscovery $(LIBS)) + $(call mktest,$@,$(COBJS), $(ICEDISOVERY_LIBS) $(LIBS)) $(SERVER): $(SOBJS) rm -f $@ |