diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-10-02 10:11:14 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-10-02 10:11:14 -0230 |
| commit | 947d00b70b92f82fe32c403b95a2be3217b13907 (patch) | |
| tree | d8960b290eb10c7ea9ac803e0163357070587cd5 /cpp | |
| parent | C++Builder 2010 support (diff) | |
| download | ice-947d00b70b92f82fe32c403b95a2be3217b13907.tar.bz2 ice-947d00b70b92f82fe32c403b95a2be3217b13907.tar.xz ice-947d00b70b92f82fe32c403b95a2be3217b13907.zip | |
Update to DB 48 for windows
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules.msvc | 2 | ||||
| -rw-r--r-- | cpp/demo/Makefile | 6 | ||||
| -rw-r--r-- | cpp/include/Glacier2/Application.h | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc index 5b1d87eb51c..b958182d388 100644 --- a/cpp/config/Make.rules.msvc +++ b/cpp/config/Make.rules.msvc @@ -78,6 +78,6 @@ BASELIBS = iceutil$(LIBSUFFIX).lib $(ICE_OS_LIBS) LIBS = ice$(LIBSUFFIX).lib $(BASELIBS)
BZIP2_LIBS = libbz2$(LIBSUFFIX).lib
-DB_LIBS = libdb47$(LIBSUFFIX).lib
+DB_LIBS = libdb48$(LIBSUFFIX).lib
MCPP_LIBS = mcpp$(LIBSUFFIX).lib
ICONV_LIB = libiconv.lib
diff --git a/cpp/demo/Makefile b/cpp/demo/Makefile index 8e82c743f2b..f5279049ab2 100644 --- a/cpp/demo/Makefile +++ b/cpp/demo/Makefile @@ -14,17 +14,13 @@ include $(top_srcdir)/config/Make.rules SUBDIRS = IceUtil \ Ice \ Freeze \ + IceBox \ IceStorm \ Glacier2 \ IceGrid \ book \ cookbook -!if "$(BCPLUSPLUS)" != "yes" && "$(CPP_COMPILER)" != "VC60" -SUBDIRS = $(SUBDIRS) \ - IceBox -!endif - $(EVERYTHING):: @for subdir in $(SUBDIRS); \ do \ diff --git a/cpp/include/Glacier2/Application.h b/cpp/include/Glacier2/Application.h index fa5a985cb6a..cba6a450448 100644 --- a/cpp/include/Glacier2/Application.h +++ b/cpp/include/Glacier2/Application.h @@ -7,8 +7,6 @@ // // ********************************************************************** -#include <exception> - #include <Ice/Application.h> #include <Glacier2/Session.h> |