diff options
| author | Fridrich Strba <fridrich.strba@bluewin.ch> | 2012-07-09 01:38:48 -0600 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-07-09 09:44:37 +0200 |
| commit | 4bc7149816e51e6ccca7673876586f8dc9a2c3d0 (patch) | |
| tree | b3a5f20f63aa131728f93955ed1ed9c7b23a64b7 /solenv | |
| parent | 9c8dc01d3a40ec905c9d816c733ceb5d621e0426 (diff) | |
Trying to use Windows LDAP for Windows builds
Change-Id: Ic06bda1393de4da05af01f79b8ba54cf0ee2cb73
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 1 | ||||
| -rw-r--r-- | solenv/inc/libs.mk | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 78dac2561475..81d6226aba13 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -252,6 +252,7 @@ gb_Library_PLAINLIBS_NONE += \ version \ wininet \ winspool \ + wldap32 \ ws2_32 \ gb_Library_LAYER := \ diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index efb000e19cec..41a231e62e40 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -423,6 +423,7 @@ gb_Library_PLAINLIBS_NONE += \ wininet \ winmm \ winspool \ + wldap32 \ ws2_32 \ gb_Library_LAYER := \ diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 67c09fdbe2e3..0ea1cc3bee2f 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -112,7 +112,7 @@ MOZBASELIBST=$(STATIC) -lnspr4 -lxpcombase_s $(DYNAMIC) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" MOZBASELIB=-lnspr4 -lxpcom .IF "$(GUI)$(COM)"=="WNTGCC" -LDAPSDKLIB=-lnsldap32v50 +LDAPSDKLIB=-lwldap32 .ELSE # "$(GUI)$(COM)"=="WNTGCC" .IF "$(WITH_OPENLDAP)" == "YES" LDAPSDKLIB=-lldap @@ -412,7 +412,7 @@ EXTLIB=iext.lib SOTLIB=isot.lib MOZBASELIBST=nspr4_s.lib xpcombase_s.lib MOZBASELIB=nspr4.lib xpcom.lib -LDAPSDKLIB=nsldap32v50.lib +LDAPSDKLIB=wldap32.lib PAPILIB=ipap.lib SFX2LIB=sfx.lib SFXLIB=$(SFX2LIB) |