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 - Define os_bsd early so it can be used later in the file. r=jesup

Browse Source
This commit is contained in:
Jan Beich 2013-02-24 09:55:07 +01:00
parent 73dc3f3f6d
commit fc6815bd9c
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
media/webrtc/trunk/build/common.gypi
View File

@ -80,12 +80,21 @@
['use_ash==1', {
'use_aura%': 1,
}],
# A flag for BSD platforms
['OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or \
OS=="openbsd"', {
'os_bsd%': 1,
}, {
'os_bsd%': 0,
}],
],
},
# Copy conditionally-set variables out one scope.
'chromeos%': '<(chromeos)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
'os_bsd%': '<(os_bsd)',
'use_openssl%': '<(use_openssl)',
'use_ibus%': '<(use_ibus)',
'enable_viewport%': '<(enable_viewport)',
@ -119,7 +128,7 @@
}],
# Set toolkit_uses_gtk for the Chromium browser on Linux.
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', {
['(OS=="linux" or OS=="solaris" or os_bsd==1) and use_aura==0', {
'toolkit_uses_gtk%': 1,
}, {
'toolkit_uses_gtk%': 0,
@ -144,6 +153,7 @@
'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
'os_bsd%': '<(os_bsd)',
'use_openssl%': '<(use_openssl)',
'use_ibus%': '<(use_ibus)',
'enable_viewport%': '<(enable_viewport)',
@ -406,15 +416,8 @@
'os_posix%': 1,
}],
# A flag for BSD platforms
['OS=="freebsd" or OS=="openbsd"', {
'os_bsd%': 1,
}, {
'os_bsd%': 0,
}],
# NSS usage.
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_openssl==0', {
['(OS=="linux" or OS=="solaris" or os_bsd==1) and use_openssl==0', {
'use_nss%': 1,
}, {
'use_nss%': 0,