diff options
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 4 | ||||
| -rw-r--r-- | solenv/inc/libs.mk | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 3304e3ed6ec6..f7ed5904e033 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -242,9 +242,9 @@ File gid_File_Lib_Db Styles = (PACKED); Dir = gid_Dir_Program; #ifdef UNX - Name = STRING(CONCAT2(libdb-4.2,UNXSUFFIX)); + Name = STRING(CONCAT2(libdb-4.7,UNXSUFFIX)); #else - Name = "libdb42.dll"; + Name = "libdb47.dll"; #endif End diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 200ea5b54462..a0a318230255 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -233,10 +233,8 @@ NEON3RDLIB=$(STATIC) -lneon $(DYNAMIC) .ENDIF .IF "$(SYSTEM_DB)" == "YES" BERKELEYLIB=-ldb -BERKELEYCPPLIB=-ldb_cxx .ELSE -BERKELEYLIB=-ldb-4.2 -BERKELEYCPPLIB=-ldb_cxx-4.2 +BERKELEYLIB=-ldb-4.7 .ENDIF CURLLIB=-lcurl SFX2LIB=-lsfx$(DLLPOSTFIX) @@ -446,8 +444,7 @@ EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib ZLIB3RDLIB=zlib.lib JPEG3RDLIB=jpeglib.lib NEON3RDLIB=neon.lib -BERKELEYLIB=libdb42.lib -BERKELEYCPPLIB= +BERKELEYLIB=libdb47.lib CURLLIB=libcurl.lib CHAOSLIB=ichaos.lib UUILIB=iuui.lib |