diff options
| author | Jose <jose@zeroc.com> | 2015-11-19 23:32:36 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-11-19 23:32:36 +0100 |
| commit | a5ab354af48ae722ac162a010b8154cdceec6dcb (patch) | |
| tree | b9e69c2c05c2d3f018a63adafcf3a844def71a61 /cpp/src | |
| parent | Fix Win32 test env (diff) | |
| download | ice-a5ab354af48ae722ac162a010b8154cdceec6dcb.tar.bz2 ice-a5ab354af48ae722ac162a010b8154cdceec6dcb.tar.xz ice-a5ab354af48ae722ac162a010b8154cdceec6dcb.zip | |
Add missing LMDB dependencies
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Makefile.mak | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index b172d34a999..4d41837681a 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -114,6 +114,8 @@ SDIR = $(slicedir)\IceGrid !include $(top_srcdir)\config\Make.rules.mak +$(OBJS) : $(LMDB_NUPKG) + LINKWITH = $(LIBS) ALINKWITH = $(LIBS) DLINKWITH = $(LIBS) diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak index 50cf03c3e7d..845fc85b6ce 100644 --- a/cpp/src/IceStorm/Makefile.mak +++ b/cpp/src/IceStorm/Makefile.mak @@ -63,12 +63,14 @@ SDIR = $(slicedir)\IceStorm !include $(top_srcdir)\config\Make.rules.mak +$(OBJS) : $(LMDB_NUPKG) + CPPFLAGS = -I.. $(LMDB_CPPFLAGS) $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN ICECPPFLAGS = $(ICECPPFLAGS) -I.. SLICE2CPPFLAGS = --ice --include-dir IceStorm $(SLICE2CPPFLAGS) LINKWITH = $(LIBS) -ALINKWITH = $(LIBS) -DLINKWITH = $(LIBS) +ALINKWITH = $(LIBS) +DLINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) |