mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-04-02 20:42:49 +00:00
- 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:
parent
10c331806e
commit
55378a7495
@ -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
|
||||
|
@ -21,4 +21,8 @@ IGNORE_MANIFEST=1
|
||||
|
||||
DIRS = windows registry
|
||||
|
||||
!ifdef BUILD_XPIDL
|
||||
DIRS += xpidl
|
||||
!endif
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user