From: Dmitry Kovalev Date: Thu, 16 Mar 2000 19:58:36 +0000 (+0000) Subject: update Win32 build environment to support back-sql X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~3138 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f28e0c19673a59088edd6bc3e54820507e9eca25;p=openldap update Win32 build environment to support back-sql --- diff --git a/build/main.dsw b/build/main.dsw index 0183427447..e666a012d3 100644 --- a/build/main.dsw +++ b/build/main.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 5.00 ############################################################################### -Project: "apitest"=..\libraries\libldap\apitest.dsp - Package Owner=<4> +Project: "apitest"="..\libraries\libldap\apitest.dsp" - Package Owner=<4> Package=<5> {{{ @@ -21,7 +21,7 @@ Package=<4> ############################################################################### -Project: "apitest_r"=..\libraries\libldap_r\apitest_r.dsp - Package Owner=<4> +Project: "apitest_r"="..\libraries\libldap_r\apitest_r.dsp" - Package Owner=<4> Package=<5> {{{ @@ -51,7 +51,19 @@ Package=<4> ############################################################################### -Project: "build"=.\build.dsp - Package Owner=<4> +Project: "backsql"="..\servers\slapd\back-sql\backsql.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "build"=".\build.dsp" - Package Owner=<4> Package=<5> {{{ @@ -135,7 +147,7 @@ Package=<4> ############################################################################### -Project: "dtest"=..\libraries\liblber\dtest.dsp - Package Owner=<4> +Project: "dtest"="..\libraries\liblber\dtest.dsp" - Package Owner=<4> Package=<5> {{{ @@ -150,7 +162,7 @@ Package=<4> ############################################################################### -Project: "etest"=..\libraries\liblber\etest.dsp - Package Owner=<4> +Project: "etest"="..\libraries\liblber\etest.dsp" - Package Owner=<4> Package=<5> {{{ @@ -165,7 +177,7 @@ Package=<4> ############################################################################### -Project: "ldapdelete"=..\clients\tools\ldapdelete.dsp - Package Owner=<4> +Project: "ldapdelete"="..\clients\tools\ldapdelete.dsp" - Package Owner=<4> Package=<5> {{{ @@ -186,7 +198,7 @@ Package=<4> ############################################################################### -Project: "ldapmodify"=..\clients\tools\ldapmodify.dsp - Package Owner=<4> +Project: "ldapmodify"="..\clients\tools\ldapmodify.dsp" - Package Owner=<4> Package=<5> {{{ @@ -210,7 +222,7 @@ Package=<4> ############################################################################### -Project: "ldapmodrdn"=..\clients\tools\ldapmodrdn.dsp - Package Owner=<4> +Project: "ldapmodrdn"="..\clients\tools\ldapmodrdn.dsp" - Package Owner=<4> Package=<5> {{{ @@ -231,7 +243,7 @@ Package=<4> ############################################################################### -Project: "ldappasswd"=..\clients\tools\ldappasswd.dsp - Package Owner=<4> +Project: "ldappasswd"="..\clients\tools\ldappasswd.dsp" - Package Owner=<4> Package=<5> {{{ @@ -252,7 +264,7 @@ Package=<4> ############################################################################### -Project: "ldapsearch"=..\clients\tools\ldapsearch.dsp - Package Owner=<4> +Project: "ldapsearch"="..\clients\tools\ldapsearch.dsp" - Package Owner=<4> Package=<5> {{{ @@ -276,7 +288,7 @@ Package=<4> ############################################################################### -Project: "ldbmtest"=..\servers\slapd\tools\ldbmtest.dsp - Package Owner=<4> +Project: "ldbmtest"="..\servers\slapd\tools\ldbmtest.dsp" - Package Owner=<4> Package=<5> {{{ @@ -308,11 +320,14 @@ Package=<4> Begin Project Dependency Project_Dep_Name libldif End Project Dependency + Begin Project Dependency + Project_Dep_Name backsql + End Project Dependency }}} ############################################################################### -Project: "ldif"=..\servers\slapd\tools\ldif.dsp - Package Owner=<4> +Project: "ldif"="..\servers\slapd\tools\ldif.dsp" - Package Owner=<4> Package=<5> {{{ @@ -336,7 +351,7 @@ Package=<4> ############################################################################### -Project: "libavl"=..\libraries\libavl\libavl.dsp - Package Owner=<4> +Project: "libavl"="..\libraries\libavl\libavl.dsp" - Package Owner=<4> Package=<5> {{{ @@ -351,7 +366,7 @@ Package=<4> ############################################################################### -Project: "liblber"=..\libraries\liblber\liblber.dsp - Package Owner=<4> +Project: "liblber"="..\libraries\liblber\liblber.dsp" - Package Owner=<4> Package=<5> {{{ @@ -366,7 +381,7 @@ Package=<4> ############################################################################### -Project: "libldap"=..\libraries\libldap\libldap.dsp - Package Owner=<4> +Project: "libldap"="..\libraries\libldap\libldap.dsp" - Package Owner=<4> Package=<5> {{{ @@ -381,7 +396,7 @@ Package=<4> ############################################################################### -Project: "libldap_r"=..\libraries\libldap_r\libldap_r.dsp - Package Owner=<4> +Project: "libldap_r"="..\libraries\libldap_r\libldap_r.dsp" - Package Owner=<4> Package=<5> {{{ @@ -396,7 +411,7 @@ Package=<4> ############################################################################### -Project: "libldbm"=..\libraries\libldbm\libldbm.dsp - Package Owner=<4> +Project: "libldbm"="..\libraries\libldbm\libldbm.dsp" - Package Owner=<4> Package=<5> {{{ @@ -411,7 +426,7 @@ Package=<4> ############################################################################### -Project: "libldif"=..\libraries\libldif\libldif.dsp - Package Owner=<4> +Project: "libldif"="..\libraries\libldif\libldif.dsp" - Package Owner=<4> Package=<5> {{{ @@ -456,7 +471,7 @@ Package=<4> ############################################################################### -Project: "libslapd"=..\servers\slapd\libslapd.dsp - Package Owner=<4> +Project: "libslapd"="..\servers\slapd\libslapd.dsp" - Package Owner=<4> Package=<5> {{{ @@ -471,7 +486,7 @@ Package=<4> ############################################################################### -Project: "ltest"=..\libraries\libldap\ltest.dsp - Package Owner=<4> +Project: "ltest"="..\libraries\libldap\ltest.dsp" - Package Owner=<4> Package=<5> {{{ @@ -492,7 +507,7 @@ Package=<4> ############################################################################### -Project: "ltest_r"=..\libraries\libldap_r\ltest_r.dsp - Package Owner=<4> +Project: "ltest_r"="..\libraries\libldap_r\ltest_r.dsp" - Package Owner=<4> Package=<5> {{{ @@ -543,7 +558,7 @@ Package=<4> ############################################################################### -Project: "slapadd"=..\servers\slapd\tools\slapadd.dsp - Package Owner=<4> +Project: "slapadd"="..\servers\slapd\tools\slapadd.dsp" - Package Owner=<4> Package=<5> {{{ @@ -575,11 +590,14 @@ Package=<4> Begin Project Dependency Project_Dep_Name libslapd End Project Dependency + Begin Project Dependency + Project_Dep_Name backsql + End Project Dependency }}} ############################################################################### -Project: "slapcat"=..\servers\slapd\tools\slapcat.dsp - Package Owner=<4> +Project: "slapcat"="..\servers\slapd\tools\slapcat.dsp" - Package Owner=<4> Package=<5> {{{ @@ -611,11 +629,14 @@ Package=<4> Begin Project Dependency Project_Dep_Name backldbm End Project Dependency + Begin Project Dependency + Project_Dep_Name backsql + End Project Dependency }}} ############################################################################### -Project: "slapd"=..\servers\slapd\slapd.dsp - Package Owner=<4> +Project: "slapd"="..\servers\slapd\slapd.dsp" - Package Owner=<4> Package=<5> {{{ @@ -650,11 +671,14 @@ Package=<4> Begin Project Dependency Project_Dep_Name libslapd End Project Dependency + Begin Project Dependency + Project_Dep_Name backsql + End Project Dependency }}} ############################################################################### -Project: "slapindex"=..\servers\slapd\tools\slapindex.dsp - Package Owner=<4> +Project: "slapindex"="..\servers\slapd\tools\slapindex.dsp" - Package Owner=<4> Package=<5> {{{ @@ -686,11 +710,14 @@ Package=<4> Begin Project Dependency Project_Dep_Name libslapd End Project Dependency + Begin Project Dependency + Project_Dep_Name backsql + End Project Dependency }}} ############################################################################### -Project: "testavl"=..\libraries\libavl\testavl.dsp - Package Owner=<4> +Project: "testavl"="..\libraries\libavl\testavl.dsp" - Package Owner=<4> Package=<5> {{{ @@ -705,7 +732,7 @@ Package=<4> ############################################################################### -Project: "ud"=..\clients\ud\ud.dsp - Package Owner=<4> +Project: "ud"="..\clients\ud\ud.dsp" - Package Owner=<4> Package=<5> {{{ diff --git a/include/portable.nt b/include/portable.nt index a3dc83aced..c4ef47c67e 100644 --- a/include/portable.nt +++ b/include/portable.nt @@ -270,6 +270,9 @@ typedef signed int ssize_t; /* define this to use SLAPD LDBM backend */ #define SLAPD_LDBM 1 +/* define this to use SLAPD SQL backend */ +#define SLAPD_SQL 1 + /* define this to use SLAPD passwd backend */ /* #undef SLAPD_PASSWD */ @@ -285,6 +288,9 @@ typedef signed int ssize_t; /* define this for per-object ACIs */ /* #undef SLAPD_ACI_ENABLED */ +/* define this for discrete rights in ACIs */ +/* #undef SLAPD_ACI_DISCRETE_RIGHTS */ + /* define this to use SLAPD shell backend */ /* #undef SLAPD_SHELL */ diff --git a/servers/slapd/slapd.dsp b/servers/slapd/slapd.dsp index d179a08cf0..04a1f2fe0d 100644 --- a/servers/slapd/slapd.dsp +++ b/servers/slapd/slapd.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\Release" +# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib advapi32.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\Release" !ELSEIF "$(CFG)" == "slapd - Win32 Debug" @@ -77,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\Debug" +# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib advapi32.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\Debug" !ELSEIF "$(CFG)" == "slapd - Win32 Single Debug" @@ -102,7 +102,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 hs_regexd.lib libdbs.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\SDebug" +# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\SDebug" !ELSEIF "$(CFG)" == "slapd - Win32 Single Release" @@ -127,7 +127,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 hs_regex.lib libdb.lib wsock32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\SRelease" +# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\SRelease" !ENDIF diff --git a/servers/slapd/tools/ldbmtest.dsp b/servers/slapd/tools/ldbmtest.dsp index d0e20d54ea..f67df7c2fd 100644 --- a/servers/slapd/tools/ldbmtest.dsp +++ b/servers/slapd/tools/ldbmtest.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 libdb.lib hs_regex.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release" +# ADD LINK32 libdb.lib hs_regex.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release" !ELSEIF "$(CFG)" == "ldbmtest - Win32 Debug" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libdb.lib hs_regex.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug" +# ADD LINK32 libdb.lib hs_regex.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug" !ELSEIF "$(CFG)" == "ldbmtest - Win32 Single Debug" @@ -102,7 +102,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libdb.lib hs_regex.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\SDebug" +# ADD LINK32 libdb.lib hs_regex.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\SDebug" !ELSEIF "$(CFG)" == "ldbmtest - Win32 Single Release" @@ -126,7 +126,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 libdbs.lib hs_regex.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\SRelease" +# ADD LINK32 libdbs.lib hs_regex.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\SRelease" !ENDIF diff --git a/servers/slapd/tools/slapadd.dsp b/servers/slapd/tools/slapadd.dsp index 4e4f56de6c..5c681944eb 100644 --- a/servers/slapd/tools/slapadd.dsp +++ b/servers/slapd/tools/slapadd.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release" +# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release" !ELSEIF "$(CFG)" == "slapadd - Win32 Debug" @@ -77,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug" +# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug" !ELSEIF "$(CFG)" == "slapadd - Win32 Single Debug" @@ -102,7 +102,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hs_regexd.lib libdbs.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\SDebug" +# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\SDebug" !ELSEIF "$(CFG)" == "slapadd - Win32 Single Release" @@ -127,7 +127,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 hs_regex.lib libdb.lib ws2_32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 hs_regex.lib libdbs.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\SRelease" +# ADD LINK32 hs_regex.lib libdbs.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\SRelease" !ENDIF diff --git a/servers/slapd/tools/slapcat.dsp b/servers/slapd/tools/slapcat.dsp index ce556d27fd..4d0e2ecd82 100644 --- a/servers/slapd/tools/slapcat.dsp +++ b/servers/slapd/tools/slapcat.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release" +# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release" !ELSEIF "$(CFG)" == "slapcat - Win32 Debug" @@ -77,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug" +# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug" !ELSEIF "$(CFG)" == "slapcat - Win32 Single Debug" @@ -102,7 +102,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 oldbm32.lib libdb.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libraries\Debug" -# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\SDebug" +# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\SDebug" !ELSEIF "$(CFG)" == "slapcat - Win32 Single Release" @@ -126,7 +126,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libdb.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\libraries\Release" -# ADD LINK32 hs_regex.lib libdbs.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\SRelease" +# ADD LINK32 hs_regex.lib libdbs.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\SRelease" !ENDIF diff --git a/servers/slapd/tools/slapindex.dsp b/servers/slapd/tools/slapindex.dsp index d347ee7a9b..e79fa2f466 100644 --- a/servers/slapd/tools/slapindex.dsp +++ b/servers/slapd/tools/slapindex.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release" +# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release" !ELSEIF "$(CFG)" == "slapindex - Win32 Debug" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug" +# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug" !ELSEIF "$(CFG)" == "slapindex - Win32 Single Debug" @@ -103,7 +103,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib shell32.lib hs_regexd.lib libdbs.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\SDebug" +# ADD LINK32 hs_regex.lib libdb.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\SDebug" !ELSEIF "$(CFG)" == "slapindex - Win32 Single Release" @@ -128,7 +128,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 hs_regex.lib libdb.lib ws2_32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 hs_regex.lib libdbs.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\SRelease" +# ADD LINK32 hs_regex.lib libdbs.lib ws2_32.lib odbc32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\SRelease" !ENDIF