wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 807492 Part 1.1 - Allow to build media/mtransport on BSD, build bits r=jesup

Browse Source
This commit is contained in:
Landry Breuil 2013-08-13 23:58:42 +02:00
parent ad31fbf603
commit ca8279c646
4 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
media/mtransport/objs.mk
View File

@ -23,12 +23,16 @@ LOCAL_INCLUDES += \
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/event \
$(NULL)
ifeq ($(OS_TARGET), Darwin)
ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
LOCAL_INCLUDES += \
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include \
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \
$(NULL)
ifeq ($(OS_TARGET), Darwin)
DEFINES += -DDARWIN
else
DEFINES += -DBSD
endif
endif
ifeq ($(OS_TARGET), Linux)

7
media/mtransport/test/Makefile.in
View File

@ -77,12 +77,17 @@ endif
endif
endif
ifeq ($(OS_TARGET), Darwin)
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
ifeq ($(OS_TARGET), Darwin)
DEFINES += \
-DGTEST_USE_OWN_TR1_TUPLE=1 \
$(NULL)
endif
endif
ifeq ($(OS_TARGET), Linux)
LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include

14
media/mtransport/third_party/nICEr/nicer.gyp vendored
View File

@ -134,8 +134,19 @@
],
'conditions' : [
## Mac
## Mac and BSDs
[ 'OS == "mac"', {
'defines' : [
'DARWIN',
'HAVE_XLOCALE',
],
}],
[ 'os_bsd == 1', {
'defines' : [
'BSD',
],
}],
[ 'OS == "mac" or os_bsd == 1', {
'cflags_mozilla': [
'-Wall',
'-Wno-parentheses',
@ -143,7 +154,6 @@
'-Wmissing-prototypes',
],
'defines' : [
'DARWIN',
'HAVE_LIBM=1',
'HAVE_STRDUP=1',
'HAVE_STRLCPY=1',

13
media/mtransport/third_party/nrappkit/nrappkit.gyp vendored
View File

@ -147,8 +147,18 @@
],
'conditions' : [
## Mac
## Mac and BSDs
[ 'OS == "mac"', {
'defines' : [
'DARWIN',
],
}],
[ 'os_bsd == 1', {
'defines' : [
'BSD',
],
}],
[ 'OS == "mac" or os_bsd == 1', {
'cflags_mozilla': [
'-Wall',
'-Wno-parentheses',
@ -156,7 +166,6 @@
'-Wmissing-prototypes',
],
'defines' : [
'DARWIN',
'HAVE_LIBM=1',
'HAVE_STRDUP=1',
'HAVE_STRLCPY=1',