diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-11-08 10:25:32 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-11-08 10:25:32 +0100 |
| commit | 7310ad264e17f639fb58dd947ef1c31295e4501c (patch) | |
| tree | 3cb77562f0c445da903c1ae09ee2b6d80c139a6a /cpp/src/slice2cpp | |
| parent | Updated GUI online help to use doc.zeroc.com, in a web browser (diff) | |
| download | ice-7310ad264e17f639fb58dd947ef1c31295e4501c.tar.bz2 ice-7310ad264e17f639fb58dd947ef1c31295e4501c.tar.xz ice-7310ad264e17f639fb58dd947ef1c31295e4501c.zip | |
Fixed MinGW port
- The build no longer requires Cygwin
- Running the tests no longer requires setting CPP_COMPILER, TestUtil.py che
for RI_DEVKIT in the environment to figure out if running with MinGW devki
- DynamicLibrary no longer appends the "d" suffix when compiling with debug
- COMPSUFFIX is now defined when compiling Ice
- Much simplified the build system by removing all the checks for MinGW
in makefiles, MinGW settings are now located to Make.rules.MINGW only.
- Fixed allTests.py to skip plugin and metrics tests.
- Fixed build instructions.
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Makefile | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile index 167f35e7dc8..573f53d96d0 100644 --- a/cpp/src/slice2cpp/Makefile +++ b/cpp/src/slice2cpp/Makefile @@ -9,13 +9,7 @@ top_srcdir = ../.. -include $(top_srcdir)/config/Make.rules.common - -ifeq ($(MinGW), yes) - NAME = $(top_srcdir)/bin/slice2cpp.exe -else - NAME = $(top_srcdir)/bin/slice2cpp -endif +NAME = $(top_srcdir)/bin/slice2cpp TARGETS = $(NAME) @@ -28,15 +22,10 @@ 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 + $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) + install:: all $(call installprogram,$(NAME),$(install_bindir)) |