- Made xpidl build conditional on BUILD_XPIDL for win32 and unix

- Made win32 xpidl use glib-1.2 (instead of 1.1.)
This commit is contained in:
mccabe%netscape.com 1999-04-06 08:33:40 +00:00
parent 10c331806e
commit 55378a7495
4 changed files with 12 additions and 7 deletions

View File

@ -21,7 +21,10 @@ srcdir = @srcdir@
include $(DEPTH)/config/autoconf.mk
# DIRS = xpidl
DIRS = registry
ifdef BUILD_XPIDL
DIRS += xpidl
endif
include $(topsrcdir)/config/rules.mk

View File

@ -21,4 +21,8 @@ IGNORE_MANIFEST=1
DIRS = windows registry
!ifdef BUILD_XPIDL
DIRS += xpidl
!endif
include <$(DEPTH)\config\rules.mak>

View File

@ -38,13 +38,12 @@ LINCS=-I$(PUBLIC)\xpcom \
-I$(MOZ_TOOLS)\include \
$(NULL)
MYDIR=C:\USR\LOCAL
MYLIBS= \
$(DIST)\lib\libxpt32.lib \
$(MOZ_TOOLS)\lib\glib-1.1.lib \
$(MOZ_TOOLS)\lib\libidl-0.6.lib \
$(MOZ_TOOLS)\lib\glib-1.2.lib \
$(MOZ_TOOLS)\lib\libidl-0.6.lib \
$(LIBNSPR) \
$(NULL)

View File

@ -38,13 +38,12 @@ LINCS=-I$(PUBLIC)\xpcom \
-I$(MOZ_TOOLS)\include \
$(NULL)
MYDIR=C:\USR\LOCAL
MYLIBS= \
$(DIST)\lib\libxpt32.lib \
$(MOZ_TOOLS)\lib\glib-1.1.lib \
$(MOZ_TOOLS)\lib\libidl-0.6.lib \
$(MOZ_TOOLS)\lib\glib-1.2.lib \
$(MOZ_TOOLS)\lib\libidl-0.6.lib \
$(LIBNSPR) \
$(NULL)