mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 973395 - Move the LOCAL_INCLUDES in media to moz.build; r=glandium
This commit is contained in:
Ehsan Akhgari
parent
6ad303f035
commit
ddc6613b8e
@ -26,5 +26,3 @@ endif
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
LOCAL_INCLUDES = -I$(srcdir)
|
|
||||||
|
|||||||
@ -17,20 +17,7 @@ ifdef MOZ_SCTP
|
|||||||
LIBS += $(DEPTH)/netwerk/sctp/src/$(LIB_PREFIX)nksctp_s.$(LIB_SUFFIX)
|
LIBS += $(DEPTH)/netwerk/sctp/src/$(LIB_PREFIX)nksctp_s.$(LIB_SUFFIX)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
|
|
||||||
LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include
|
|
||||||
ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
|
|
||||||
LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(OS_TARGET), Linux)
|
|
||||||
LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(OS_TARGET), Android)
|
ifeq ($(OS_TARGET), Android)
|
||||||
LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/android/include
|
|
||||||
|
|
||||||
LIBS += \
|
LIBS += \
|
||||||
$(STLPORT_LDFLAGS) \
|
$(STLPORT_LDFLAGS) \
|
||||||
$(STLPORT_LIBS) \
|
$(STLPORT_LIBS) \
|
||||||
|
|||||||
@ -28,9 +28,29 @@ FAIL_ON_WARNINGS = True
|
|||||||
for var in ('HAVE_STRDUP', 'NR_SOCKET_IS_VOID_PTR', 'SCTP_DEBUG', 'INET'):
|
for var in ('HAVE_STRDUP', 'NR_SOCKET_IS_VOID_PTR', 'SCTP_DEBUG', 'INET'):
|
||||||
DEFINES[var] = True
|
DEFINES[var] = True
|
||||||
|
|
||||||
if CONFIG['OS_TARGET'] != 'Android':
|
if CONFIG['OS_TARGET'] == 'Android':
|
||||||
|
LOCAL_INCLUDES += [
|
||||||
|
'/media/mtransport/third_party/nrappkit/src/port/android/include',
|
||||||
|
]
|
||||||
|
else:
|
||||||
DEFINES['INET6'] = True
|
DEFINES['INET6'] = True
|
||||||
|
|
||||||
|
if CONFIG['OS_TARGET'] == 'Linux':
|
||||||
|
LOCAL_INCLUDES += [
|
||||||
|
'/media/mtransport/third_party/nrappkit/src/port/linux/include',
|
||||||
|
]
|
||||||
|
|
||||||
|
if CONFIG['OS_TARGET'] == 'Darwin':
|
||||||
|
LOCAL_INCLUDES += [
|
||||||
|
'/media/mtransport/third_party/nrappkit/src/port/darwin/include',
|
||||||
|
]
|
||||||
|
|
||||||
|
if CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD'):
|
||||||
|
LOCAL_INCLUDES += [
|
||||||
|
'/media/mtransport/third_party/nrappkit/src/port/darwin/include',
|
||||||
|
'/media/mtransport/third_party/nrappkit/src/port/generic/include',
|
||||||
|
]
|
||||||
|
|
||||||
# SCTP DEFINES
|
# SCTP DEFINES
|
||||||
if CONFIG['OS_TARGET'] == 'WINNT':
|
if CONFIG['OS_TARGET'] == 'WINNT':
|
||||||
DEFINES['__Userspace_os_Windows'] = 1
|
DEFINES['__Userspace_os_Windows'] = 1
|
||||||
|
|||||||
@ -112,54 +112,6 @@ LIBS += \
|
|||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LOCAL_INCLUDES += \
|
|
||||||
-I. \
|
|
||||||
-I$(topsrcdir)/media/webrtc/trunk/testing/gtest/include \
|
|
||||||
-I$(topsrcdir)/ipc/chromium/src \
|
|
||||||
-I$(topsrcdir)/media/mtransport \
|
|
||||||
-I$(topsrcdir)/media/mtransport/test \
|
|
||||||
-I$(topsrcdir)/media/webrtc/signaling/include \
|
|
||||||
-I$(topsrcdir)/media/webrtc/signaling/src/sipcc/core/sdp \
|
|
||||||
-I$(topsrcdir)/media/webrtc/signaling/src/sipcc/cpr/include \
|
|
||||||
-I$(topsrcdir)/media/webrtc/signaling/src/sipcc/core/includes \
|
|
||||||
-I$(topsrcdir)/media/webrtc/signaling/src/common/browser_logging \
|
|
||||||
-I$(topsrcdir)/media/webrtc/signaling/src/common/time_profiling \
|
|
||||||
-I$(topsrcdir)/media/webrtc/signaling/src/media \
|
|
||||||
-I$(topsrcdir)/media/webrtc/signaling/src/media-conduit \
|
|
||||||
-I$(topsrcdir)/media/webrtc/signaling/src/mediapipeline \
|
|
||||||
-I$(topsrcdir)/media/webrtc/signaling/src/sipcc/include \
|
|
||||||
-I$(topsrcdir)/media/webrtc/signaling/src/peerconnection \
|
|
||||||
-I$(topsrcdir)/media/webrtc/signaling/media-conduit\
|
|
||||||
-I$(topsrcdir)/media/webrtc/trunk/third_party/libjingle/source/ \
|
|
||||||
-I$(topsrcdir)/media/mtransport/third_party/nICEr/src/ice \
|
|
||||||
-I$(topsrcdir)/media/mtransport/third_party/nICEr/src/net \
|
|
||||||
-I$(topsrcdir)/media/mtransport/third_party/nICEr/src/stun \
|
|
||||||
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/share \
|
|
||||||
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/util/libekr \
|
|
||||||
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/log \
|
|
||||||
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/registry \
|
|
||||||
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/stats \
|
|
||||||
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/plugin \
|
|
||||||
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/event \
|
|
||||||
-I$(topsrcdir)/xpcom/base/ \
|
|
||||||
-I$(DEPTH)/dom/bindings/ \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
|
|
||||||
LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include
|
|
||||||
ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
|
|
||||||
LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(OS_TARGET), Linux)
|
|
||||||
LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(OS_TARGET), Android)
|
|
||||||
LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/android/include
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifndef ZLIB_IN_MOZGLUE
|
ifndef ZLIB_IN_MOZGLUE
|
||||||
LIBS += $(MOZ_ZLIB_LIBS)
|
LIBS += $(MOZ_ZLIB_LIBS)
|
||||||
endif
|
endif
|
||||||
|
|||||||
@ -19,3 +19,58 @@ if CONFIG['OS_TARGET'] in ('Darwin', 'Android'):
|
|||||||
for var in ('USE_FAKE_MEDIA_STREAMS', 'USE_FAKE_PCOBSERVER',
|
for var in ('USE_FAKE_MEDIA_STREAMS', 'USE_FAKE_PCOBSERVER',
|
||||||
'NR_SOCKET_IS_VOID_PTR', 'HAVE_STRDUP'):
|
'NR_SOCKET_IS_VOID_PTR', 'HAVE_STRDUP'):
|
||||||
DEFINES[var] = True
|
DEFINES[var] = True
|
||||||
|
|
||||||
|
GENERATED_INCLUDES += [
|
||||||
|
'/dom/bindings',
|
||||||
|
]
|
||||||
|
LOCAL_INCLUDES += [
|
||||||
|
'/ipc/chromium/src',
|
||||||
|
'/media/mtransport',
|
||||||
|
'/media/mtransport/test',
|
||||||
|
'/media/mtransport/third_party/nICEr/src/ice',
|
||||||
|
'/media/mtransport/third_party/nICEr/src/net',
|
||||||
|
'/media/mtransport/third_party/nICEr/src/stun',
|
||||||
|
'/media/mtransport/third_party/nrappkit/src/event',
|
||||||
|
'/media/mtransport/third_party/nrappkit/src/log',
|
||||||
|
'/media/mtransport/third_party/nrappkit/src/plugin',
|
||||||
|
'/media/mtransport/third_party/nrappkit/src/registry',
|
||||||
|
'/media/mtransport/third_party/nrappkit/src/share',
|
||||||
|
'/media/mtransport/third_party/nrappkit/src/stats',
|
||||||
|
'/media/mtransport/third_party/nrappkit/src/util/libekr',
|
||||||
|
'/media/webrtc/signaling/include',
|
||||||
|
'/media/webrtc/signaling/media-conduit',
|
||||||
|
'/media/webrtc/signaling/src/common/browser_logging',
|
||||||
|
'/media/webrtc/signaling/src/common/time_profiling',
|
||||||
|
'/media/webrtc/signaling/src/media',
|
||||||
|
'/media/webrtc/signaling/src/media-conduit',
|
||||||
|
'/media/webrtc/signaling/src/mediapipeline',
|
||||||
|
'/media/webrtc/signaling/src/peerconnection',
|
||||||
|
'/media/webrtc/signaling/src/sipcc/core/includes',
|
||||||
|
'/media/webrtc/signaling/src/sipcc/core/sdp',
|
||||||
|
'/media/webrtc/signaling/src/sipcc/cpr/include',
|
||||||
|
'/media/webrtc/signaling/src/sipcc/include',
|
||||||
|
'/media/webrtc/trunk/testing/gtest/include',
|
||||||
|
'/media/webrtc/trunk/third_party/libjingle/source',
|
||||||
|
'/xpcom/base',
|
||||||
|
]
|
||||||
|
|
||||||
|
if CONFIG['OS_TARGET'] == 'Android':
|
||||||
|
LOCAL_INCLUDES += [
|
||||||
|
'/media/mtransport/third_party/nrappkit/src/port/android/include',
|
||||||
|
]
|
||||||
|
|
||||||
|
if CONFIG['OS_TARGET'] == 'Linux':
|
||||||
|
LOCAL_INCLUDES += [
|
||||||
|
'/media/mtransport/third_party/nrappkit/src/port/linux/include',
|
||||||
|
]
|
||||||
|
|
||||||
|
if CONFIG['OS_TARGET'] == 'Darwin':
|
||||||
|
LOCAL_INCLUDES += [
|
||||||
|
'/media/mtransport/third_party/nrappkit/src/port/darwin/include',
|
||||||
|
]
|
||||||
|
|
||||||
|
if CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD'):
|
||||||
|
LOCAL_INCLUDES += [
|
||||||
|
'/media/mtransport/third_party/nrappkit/src/port/darwin/include',
|
||||||
|
'/media/mtransport/third_party/nrappkit/src/port/generic/include',
|
||||||
|
]
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user