summaryrefslogtreecommitdiff
path: root/cpp/src/slice2rb
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-07-26 17:13:54 +0200
committerJose <jose@zeroc.com>2012-07-26 17:13:54 +0200
commitad088c09c2a5022eb12dbea4523242e05c5d7bdd (patch)
treecc69971ee6374439033067c698c5589f978864a7 /cpp/src/slice2rb
parentvsadding - fix for update reverse dependencies (diff)
downloadice-ad088c09c2a5022eb12dbea4523242e05c5d7bdd.tar.bz2
ice-ad088c09c2a5022eb12dbea4523242e05c5d7bdd.tar.xz
ice-ad088c09c2a5022eb12dbea4523242e05c5d7bdd.zip
MinGW & Ruby-1.9 updates
Diffstat (limited to 'cpp/src/slice2rb')
-rw-r--r--cpp/src/slice2rb/Makefile14
1 files changed, 13 insertions, 1 deletions
diff --git a/cpp/src/slice2rb/Makefile b/cpp/src/slice2rb/Makefile
index 7e014004b32..1e4df68e074 100644
--- a/cpp/src/slice2rb/Makefile
+++ b/cpp/src/slice2rb/Makefile
@@ -9,7 +9,13 @@
top_srcdir = ../..
-NAME = $(top_srcdir)/bin/slice2rb
+include $(top_srcdir)/config/Make.rules.common
+
+ifeq ($(MinGW), yes)
+ NAME = $(top_srcdir)/bin/slice2rb.exe
+else
+ NAME = $(top_srcdir)/bin/slice2rb
+endif
TARGETS = $(NAME)
@@ -21,9 +27,15 @@ include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. $(CPPFLAGS)
+ifeq ($(MinGW), yes)
+$(NAME): $(OBJS)
+ rm -f $@
+ $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lslice$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX) $(BASELIBS) $(MCPP_RPATH_LINK)
+else
$(NAME): $(OBJS)
rm -f $@
$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK)
+endif
install:: all
$(call installprogram,$(NAME),$(install_bindir))