mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-28 23:31:56 +00:00
Added build support for the C++ wrappers in pr/src/cplus.
Set USE_CPLUS=1 to recurse into that directory.
This commit is contained in:
parent
4d56c25568
commit
5997c96323
@ -27,6 +27,10 @@ ifeq ($(USE_PTHREADS), 1)
|
|||||||
DIRS += pthreads
|
DIRS += pthreads
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(USE_CPLUS), 1)
|
||||||
|
DIRS += cplus
|
||||||
|
endif
|
||||||
|
|
||||||
#
|
#
|
||||||
# Define platform-dependent OS_LIBS
|
# Define platform-dependent OS_LIBS
|
||||||
#
|
#
|
||||||
@ -203,11 +207,24 @@ OBJS += \
|
|||||||
threads/combined/$(OBJDIR)/pruthr.$(OBJ_SUFFIX)
|
threads/combined/$(OBJDIR)/pruthr.$(OBJ_SUFFIX)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(USE_IPV6), 1)
|
ifeq ($(USE_IPV6), 1)
|
||||||
OBJS += io/$(OBJDIR)/pripv6.$(OBJ_SUFFIX)
|
OBJS += io/$(OBJDIR)/pripv6.$(OBJ_SUFFIX)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(USE_CPLUS), 1)
|
||||||
|
OBJS += \
|
||||||
|
cplus/$(OBJDIR)/rcbase.$(OBJ_SUFFIX) \
|
||||||
|
cplus/$(OBJDIR)/rccv.$(OBJ_SUFFIX) \
|
||||||
|
cplus/$(OBJDIR)/rcfileio.$(OBJ_SUFFIX) \
|
||||||
|
cplus/$(OBJDIR)/rcinrval.$(OBJ_SUFFIX) \
|
||||||
|
cplus/$(OBJDIR)/rcio.$(OBJ_SUFFIX) \
|
||||||
|
cplus/$(OBJDIR)/rclock.$(OBJ_SUFFIX) \
|
||||||
|
cplus/$(OBJDIR)/rcnetdb.$(OBJ_SUFFIX) \
|
||||||
|
cplus/$(OBJDIR)/rcnetio.$(OBJ_SUFFIX) \
|
||||||
|
cplus/$(OBJDIR)/rcthread.$(OBJ_SUFFIX) \
|
||||||
|
cplus/$(OBJDIR)/rctime.$(OBJ_SUFFIX)
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(OS_ARCH), WINNT)
|
ifeq ($(OS_ARCH), WINNT)
|
||||||
ifneq (,$(filter-out WIN16 OS2,$(OS_TARGET)))
|
ifneq (,$(filter-out WIN16 OS2,$(OS_TARGET)))
|
||||||
DLLBASE=/BASE:0x30000000
|
DLLBASE=/BASE:0x30000000
|
||||||
@ -284,15 +301,11 @@ endif
|
|||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
THREAD_DIR=threads/combined/$(OBJDIR)
|
# Unix
|
||||||
|
include md/unix/objs.mk
|
||||||
|
|
||||||
ifeq ($(OS_ARCH), MAC)
|
|
||||||
MD_DIR = md/mac/$(OBJDIR)
|
|
||||||
else
|
|
||||||
MD_DIR = md/unix/$(OBJDIR)
|
|
||||||
include md/unix/objs.mk
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBRARY_NAME = nspr
|
LIBRARY_NAME = nspr
|
||||||
LIBRARY_VERSION = $(MOD_VERSION)
|
LIBRARY_VERSION = $(MOD_VERSION)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user