diff options
author | Jose <jose@zeroc.com> | 2015-03-04 22:21:43 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2015-03-04 22:21:43 +0100 |
commit | 65d01cf9994708f173f50841d28e3a5c74a38ba2 (patch) | |
tree | aeb80adbc72db5735ba8c1210e63493691bfff28 /cpp/demo | |
parent | IceUtil/Atomic.h doesn't build with MINGW (diff) | |
download | ice-65d01cf9994708f173f50841d28e3a5c74a38ba2.tar.bz2 ice-65d01cf9994708f173f50841d28e3a5c74a38ba2.tar.xz ice-65d01cf9994708f173f50841d28e3a5c74a38ba2.zip |
Support to build Ruby MINGW from git
Diffstat (limited to 'cpp/demo')
-rw-r--r-- | cpp/demo/IceDiscovery/Makefile | 4 | ||||
-rw-r--r-- | cpp/demo/Makefile | 6 | ||||
-rw-r--r-- | cpp/demo/Manual/Makefile | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/cpp/demo/IceDiscovery/Makefile b/cpp/demo/IceDiscovery/Makefile index ff8dd6d1c3c..23004986dff 100644 --- a/cpp/demo/IceDiscovery/Makefile +++ b/cpp/demo/IceDiscovery/Makefile @@ -11,8 +11,12 @@ top_srcdir = ../.. include $(top_srcdir)/config/Make.rules +ifneq ($(findstring MINGW,$(UNAME)),) +SUBDIRS = hello +else SUBDIRS = hello \ replication +endif .PHONY: $(EVERYTHING) $(SUBDIRS) diff --git a/cpp/demo/Makefile b/cpp/demo/Makefile index fe00cb95086..f0ef60d7d5d 100644 --- a/cpp/demo/Makefile +++ b/cpp/demo/Makefile @@ -11,6 +11,11 @@ top_srcdir = .. include $(top_srcdir)/config/Make.rules +ifneq ($(findstring MINGW,$(UNAME)),) +SUBDIRS = Ice \ + IceDiscovery \ + Manual +else SUBDIRS = IceUtil \ Ice \ IceDiscovery \ @@ -20,6 +25,7 @@ SUBDIRS = IceUtil \ Glacier2 \ IceGrid \ Manual +endif .PHONY: $(EVERYTHING) $(SUBDIRS) diff --git a/cpp/demo/Manual/Makefile b/cpp/demo/Manual/Makefile index b3fcd2e416f..4da9597015d 100644 --- a/cpp/demo/Manual/Makefile +++ b/cpp/demo/Manual/Makefile @@ -11,11 +11,16 @@ top_srcdir = ../.. include $(top_srcdir)/config/Make.rules +ifneq ($(findstring MINGW,$(UNAME)),) +SUBDIRS = printer \ + simple_filesystem +else SUBDIRS = printer \ simple_filesystem \ lifecycle \ evictor_filesystem \ map_filesystem +endif .PHONY: $(EVERYTHING) $(SUBDIRS) |