include libcaps library for OJI also. Fix to make OJI to build.

git-svn-id: svn://10.0.0.236/trunk@3361 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
raman
1998-06-05 19:34:23 +00:00
parent 9ad7e28ab6
commit b2e264c1b7
2 changed files with 8 additions and 3 deletions

View File

@@ -387,8 +387,10 @@ LINK_LIBS= \
$(DIST)\lib\secfreenav32.lib \
!endif
$(DIST)\lib\htmldg32.lib \
!ifdef MOZ_JAVA
!ifdef JAVA_OR_OJI
$(DIST)\lib\libcaps.lib \
!endif
!ifdef MOZ_JAVA
$(DIST)\lib\libnsc32.lib \
!endif
$(DIST)\lib\img32.lib \
@@ -2406,8 +2408,10 @@ BUILD_SOURCE: $(OBJ_FILES)
!ifdef MOZ_LDAP
$(DIST)\lib\nsldap.lib +
!endif
!if defined(MOZ_JAVA)
!ifdef JAVA_OR_OJI
$(DIST)\lib\libcaps.lib +
!endif
!if defined(MOZ_JAVA)
$(DIST)\lib\jrt16$(VERSION_NUMBER).lib +
$(DIST)\lib\libapp~1.lib +
$(DIST)\lib\jsj16$(VERSION_NUMBER).lib +

View File

@@ -325,11 +325,12 @@ BASIC_LIBS += $(DIST)/lib/libxpcom.a
ifdef JAVA_OR_OJI
BASIC_LIBS += $(DIST)/lib/libcaps.a
ifdef MOZ_JAVA
# Monolithic Java
BASIC_LIBS += \
$(DIST)/lib/libcaps.a \
$(DIST)/lib/lib$(LITE_PREFIX)applet.a \
$(DIST)/lib/libjrt.a \
$(DIST)/lib/libjmd.a \