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 937224 - Part b: Move LOCAL_INCLUDES to moz.build in widget/; r=mshal

Browse Source
This commit is contained in:
Ms2ger 2013-11-28 15:17:25 +01:00
parent a88cf8354a
commit 39b966c6c8
22 changed files with 107 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
widget/android/Makefile.in
View File

@ -1,16 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += \
-I$(topsrcdir)/widget/xpwidgets \
-I$(topsrcdir)/widget/shared \
-I$(topsrcdir)/dom/system/android \
-I$(topsrcdir)/docshell/base \
-I$(topsrcdir)/content/events/src \
-I$(topsrcdir)/netwerk/cache \
-I$(topsrcdir)/widget/android/android \
-I$(srcdir) \
$(NULL)

10
widget/android/moz.build
View File

@ -47,4 +47,14 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/content/events/src',
'/docshell/base',
'/dom/system/android',
'/netwerk/cache',
'/widget/android/android',
'/widget/shared',
'/widget/xpwidgets',
]
#DEFINES['DEBUG_WIDGETS'] = True

9
widget/cocoa/Makefile.in
View File

@ -30,11 +30,4 @@ endif
export::
$(INSTALL) $(srcdir)/cursors $(DIST)/bin/res
LOCAL_INCLUDES = \
$(TK_CFLAGS) \
-I$(srcdir)/../xpwidgets \
-I$(srcdir)/../shared \
-I$(topsrcdir)/layout/forms \
-I$(topsrcdir)/layout/generic \
-I$(topsrcdir)/layout/xul/base/src \
$(NULL)
CXXFLAGS += $(TK_CFLAGS)

8
widget/cocoa/moz.build
View File

@ -70,3 +70,11 @@ if CONFIG['TARGET_CPU'] == 'x86_64':
]
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../shared',
'../xpwidgets',
'/layout/forms',
'/layout/generic',
'/layout/xul/base/src',
]

11
widget/gonk/Makefile.in
View File

@ -19,16 +19,9 @@ VPATH = \
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += \
CXXFLAGS += \
-I$(ANDROID_SOURCE)/hardware/libhardware/include \
-I$(ANDROID_SOURCE)/hardware/libhardware_legacy/include \
-I$(ANDROID_SOURCE)/frameworks/native/opengl/include \
-I$(topsrcdir)/widget/xpwidgets \
-I$(topsrcdir)/widget/shared \
-I$(topsrcdir)/dom/system/android \
-I$(topsrcdir)/content/events/src \
-I$(topsrcdir)/gfx/skia/include/core \
-I$(topsrcdir)/gfx/skia/include/config \
-I$(topsrcdir)/content/media/omx/mediaresourcemanager \
-I$(srcdir) \
$(NULL)

7
widget/gonk/libdisplay/Makefile.in
View File

@ -12,19 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
VPATH = \
$(srcdir) \
$(NULL)
STL_FLAGS=
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += \
CXXFLAGS += \
-I$(ANDROID_SOURCE)/hardware/libhardware/include \
-I$(ANDROID_SOURCE)/hardware/libhardware_legacy/include \
-I$(ANDROID_SOURCE)/frameworks/native/include/gui \
-I$(ANDROID_SOURCE)/frameworks/native/opengl/include \
-I$(ANDROID_SOURCE)/system/core/libsuspend/include \
-I$(srcdir) \
$(NULL)

10
widget/gonk/moz.build
View File

@ -64,6 +64,16 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/content/events/src',
'/content/media/omx/mediaresourcemanager',
'/dom/system/android',
'/gfx/skia/include/config',
'/gfx/skia/include/core',
'/widget/shared',
'/widget/xpwidgets',
]
DEFINES['HAVE_OFF64_T'] = True
DEFINES['SK_BUILD_FOR_ANDROID_NDK'] = True

10
widget/gtk/Makefile.in
View File

@ -12,13 +12,3 @@ CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) \
CFLAGS += $(TK_CFLAGS)
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += \
-I$(srcdir)/../xpwidgets \
-I$(srcdir)/../shared \
-I$(topsrcdir)/layout/generic \
-I$(topsrcdir)/layout/xul/base/src \
-I$(topsrcdir)/other-licenses/atk-1.0 \
$(NULL)
ifdef MOZ_X11
INCLUDES += -I$(srcdir)/../shared/x11
endif

13
widget/gtk/moz.build
View File

@ -81,6 +81,19 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../shared',
'../xpwidgets',
'/layout/generic',
'/layout/xul/base/src',
'/other-licenses/atk-1.0',
]
if CONFIG['MOZ_X11']:
LOCAL_INCLUDES += [
'../shared/x11',
]
DEFINES['CAIRO_GFX'] = True
DEFINES['MOZ_APP_NAME'] = '"%s"' % CONFIG['MOZ_APP_NAME']

3
widget/gtkxtbin/Makefile.in
View File

@ -10,6 +10,3 @@ ifdef MOZ_ENABLE_GTK2
CFLAGS += $(MOZ_GTK2_CFLAGS)
endif
INCLUDES += \
-I$(srcdir) \
$(NULL)

2
widget/os2/Makefile.in
View File

@ -9,8 +9,6 @@ include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS)
LOCAL_INCLUDES = -I. -I$(srcdir)/../xpwidgets -I$(srcdir)
install-readme: README.$(MOZ_APP_NAME)
ifneq (,$(filter-out xulrunner sunbird,$(MOZ_APP_NAME)))
cp -f $^ $(DIST)/bin/README.txt

4
widget/os2/moz.build
View File

@ -28,6 +28,10 @@ SOURCES += [
LIBRARY_NAME = 'wdgtos2'
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../xpwidgets',
]
DEFINES['USE_OS2_TOOLKIT_HEADERS'] = True

11
widget/qt/Makefile.in
View File

@ -9,14 +9,3 @@ CXXFLAGS += $(MOZ_QT_CFLAGS) $(GLIB_CFLAGS) $(MOZ_CAIRO_CFLAGS) \
$(MOZ_PIXMAN_CFLAGS)
CFLAGS += $(MOZ_QT_CFLAGS) $(GLIB_CFLAGS) $(MOZ_CAIRO_CFLAGS) \
$(MOZ_PIXMAN_CFLAGS)
LOCAL_INCLUDES += \
-I$(topsrcdir)/widget/shared \
-I$(topsrcdir)/widget/xpwidgets \
-I$(topsrcdir)/widget/qt/faststartupqt \
-I$(srcdir) \
$(NULL)
ifdef MOZ_X11
INCLUDES += -I$(srcdir)/../shared/x11
endif
INCLUDES += -I$(srcdir)/../shared

9
widget/qt/faststartupqt/Makefile.in
View File

@ -5,11 +5,6 @@
DIST_INSTALL = 1
STL_FLAGS=
LOCAL_INCLUDES += \
-I$(topsrcdir)/xpcom/build \
-I$(topsrcdir)/widget/qt \
$(NULL)
EXPORT_SOURCES = \
$(topsrcdir)/widget/qt/moziqwidget.h \
$(topsrcdir)/toolkit/xre/nsQAppInstance.h \
@ -21,6 +16,8 @@ GARBAGE += $(EXPORT_SOURCES)
export:: $(EXPORT_SOURCES)
$(INSTALL) $^ .
LOCAL_INCLUDES += \
include $(topsrcdir)/config/rules.mk
CXXFLAGS += \
$(MOZ_QT_CFLAGS) \
$(NULL)

6
widget/qt/faststartupqt/moz.build
View File

@ -21,6 +21,12 @@ SOURCES += [
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/widget/qt',
'/xpcom/build',
]
DEFINES['LIBRARY_FILENAME'] = '%s%s%s' % (
CONFIG['DLL_PREFIX'],
LIBRARY_NAME,

12
widget/qt/moz.build
View File

@ -62,6 +62,18 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../shared',
'/widget/qt/faststartupqt',
'/widget/shared',
'/widget/xpwidgets',
]
if CONFIG['MOZ_X11']:
LOCAL_INCLUDES += [
'../shared/x11',
]
#DEFINES['DEBUG_WIDGETS'] = True
if CONFIG['OS_ARCH'] == 'Linux':

12
widget/windows/Makefile.in
View File

@ -5,18 +5,6 @@
RESFILE = widget.res
LOCAL_INCLUDES = \
-I. \
-I$(srcdir)/../xpwidgets \
-I$(srcdir)/../shared \
-I$(srcdir) \
-I$(topsrcdir)/layout/generic \
-I$(topsrcdir)/layout/xul/base/src \
-I$(topsrcdir)/toolkit/xre \
-I$(topsrcdir)/xpcom/base \
-I$(topsrcdir)/content/events/src \
$(NULL)
include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS)

10
widget/windows/moz.build
View File

@ -89,6 +89,16 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../shared',
'../xpwidgets',
'/content/events/src',
'/layout/generic',
'/layout/xul/base/src',
'/toolkit/xre',
'/xpcom/base',
]
DEFINES['MOZ_UNICODE'] = True
for var in ('MOZ_ENABLE_D3D9_LAYER', 'MOZ_ENABLE_D3D10_LAYER'):

12
widget/windows/winrt/Makefile.in
View File

@ -2,18 +2,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.
LOCAL_INCLUDES = \
-I. \
-I$(srcdir)/../../shared \
-I$(srcdir)/../../xpwidgets \
-I$(srcdir) \
-I$(srcdir)/../ \
-I$(topsrcdir)/layout/generic \
-I$(topsrcdir)/layout/xul/base/src \
-I$(topsrcdir)/toolkit/xre \
-I$(topsrcdir)/xpcom/base \
$(NULL)
MIDL_GENERATED_FILES = \
UIABridge_i.c \
UIABridge_p.c \

10
widget/windows/winrt/moz.build
View File

@ -29,6 +29,16 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../',
'../../shared',
'../../xpwidgets',
'/layout/generic',
'/layout/xul/base/src',
'/toolkit/xre',
'/xpcom/base',
]
DEFINES['MOZ_UNICODE'] = True
for var in ('MOZ_ENABLE_D3D9_LAYER', 'MOZ_ENABLE_D3D10_LAYER'):

21
widget/xpwidgets/Makefile.in
View File

@ -3,27 +3,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
ifneq (,$(filter gtk3 gtk2,$(MOZ_WIDGET_TOOLKIT)))
# gtk3 shares includes with gtk2
LOCAL_INCLUDES += \
-I$(srcdir)/../gtk \
$(NULL)
else
LOCAL_INCLUDES += \
-I$(srcdir)/../$(MOZ_WIDGET_TOOLKIT) \
$(NULL)
endif
LOCAL_INCLUDES += \
-I$(srcdir)/../shared \
-I$(topsrcdir)/layout/base \
-I$(topsrcdir)/layout/forms \
-I$(topsrcdir)/layout/generic \
-I$(topsrcdir)/layout/xul/base/src \
-I$(topsrcdir)/view/src \
-I$(srcdir) \
$(NULL)
include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(TK_CFLAGS)

17
widget/xpwidgets/moz.build
View File

@ -69,6 +69,23 @@ LIBRARY_NAME = 'xpwidgets_s'
include('/ipc/chromium/chromium-config.mozbuild')
LOCAL_INCLUDES += [
'../shared',
'/layout/base',
'/layout/forms',
'/layout/generic',
'/layout/xul/base/src',
'/view/src',
]
widget_dir = CONFIG['MOZ_WIDGET_TOOLKIT']
if widget_dir in ('gtk3', 'gtk2'):
# gtk3 shares includes with gtk2
widget_dir = 'gtk'
LOCAL_INCLUDES += [
'../%s' % widget_dir,
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
FINAL_LIBRARY = 'widget_mac'
elif CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gonk', 'android', 'qt', 'gtk2', 'gtk3'):