mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
bug 870407: move CMMSRCS to mozbuild (file batch #2) r=mshal
This commit is contained in:
parent
28ecf9df79
commit
f183040ef5
@ -12,7 +12,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
EXPORT_LIBRARY = ..
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
CMMSRCS = \
|
||||
DISABLED_CMMSRCS = \
|
||||
AccessibleWrap.mm \
|
||||
DocAccessibleWrap.mm \
|
||||
mozAccessible.mm \
|
||||
|
@ -17,3 +17,15 @@ EXPORTS.mozilla.a11y += [
|
||||
|
||||
LIBRARY_NAME = 'accessibility_toolkit_s'
|
||||
|
||||
CMMSRCS += [
|
||||
'AccessibleWrap.mm',
|
||||
'DocAccessibleWrap.mm',
|
||||
'MacUtils.mm',
|
||||
'Platform.mm',
|
||||
'RootAccessibleWrap.mm',
|
||||
'mozAccessible.mm',
|
||||
'mozActionElements.mm',
|
||||
'mozDocAccessible.mm',
|
||||
'mozHTMLAccessible.mm',
|
||||
'mozTextAccessible.mm',
|
||||
]
|
||||
|
@ -23,7 +23,7 @@ DEFINES += \
|
||||
endif
|
||||
|
||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||
CMMSRCS += \
|
||||
DISABLED_CMMSRCS += \
|
||||
PluginUtilsOSX.mm \
|
||||
PluginInterposeOSX.mm \
|
||||
$(NULL)
|
||||
|
@ -12,7 +12,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
FORCE_SHARED_LIB = 1
|
||||
DIST_INSTALL = 1
|
||||
|
||||
CMMSRCS = $(LIBRARY_NAME).mm plugin_child_quirks.mm
|
||||
DISABLED_CMMSRCS = $(LIBRARY_NAME).mm plugin_child_quirks.mm
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
-framework Carbon \
|
||||
|
@ -6,3 +6,7 @@
|
||||
|
||||
LIBRARY_NAME = 'plugin_child_interpose'
|
||||
|
||||
CMMSRCS += [
|
||||
"%s.mm" % (LIBRARY_NAME),
|
||||
'plugin_child_quirks.mm',
|
||||
]
|
||||
|
@ -85,3 +85,9 @@ CPP_SOURCES += [
|
||||
'PluginStreamParent.cpp',
|
||||
]
|
||||
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
|
||||
CMMSRCS += [
|
||||
'PluginInterposeOSX.mm',
|
||||
'PluginUtilsOSX.mm',
|
||||
]
|
||||
|
@ -15,7 +15,7 @@ LIBXUL_LIBRARY = 1
|
||||
|
||||
|
||||
|
||||
CMMSRCS = nsPrintingPromptServiceX.mm
|
||||
DISABLED_CMMSRCS = nsPrintingPromptServiceX.mm
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
$(NULL)
|
||||
|
@ -13,3 +13,6 @@ CPP_SOURCES += [
|
||||
|
||||
LIBRARY_NAME = 'printingui_s'
|
||||
|
||||
CMMSRCS += [
|
||||
'nsPrintingPromptServiceX.mm',
|
||||
]
|
||||
|
@ -16,7 +16,7 @@ LIBXUL_LIBRARY = 1
|
||||
EXPORT_LIBRARY = 1
|
||||
|
||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||
CMMSRCS = \
|
||||
DISABLED_CMMSRCS = \
|
||||
QuartzSupport.mm \
|
||||
$(NULL)
|
||||
endif
|
||||
|
@ -95,3 +95,8 @@ CPP_SOURCES += [
|
||||
'SourceSurfaceRawData.cpp',
|
||||
]
|
||||
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
|
||||
CMMSRCS += [
|
||||
'QuartzSupport.mm',
|
||||
]
|
||||
|
@ -70,7 +70,7 @@ endif
|
||||
|
||||
# Mac is a special snowflake
|
||||
ifeq ($(GL_PROVIDER),CGL)
|
||||
CMMSRCS += GLContextProvider$(GL_PROVIDER).mm
|
||||
DISABLED_CMMSRCS += GLContextProvider$(GL_PROVIDER).mm
|
||||
endif
|
||||
|
||||
ifdef MOZ_ANDROID_OMTC
|
||||
|
@ -80,8 +80,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
|
||||
EXPORTS += ['SharedSurfaceGralloc.h']
|
||||
|
||||
if gl_provider == 'CGL':
|
||||
# TODO: CMMSRCS
|
||||
pass
|
||||
CMMSRCS += [
|
||||
"GLContextProvider%s.mm" % (gl_provider),
|
||||
]
|
||||
else:
|
||||
CPP_SOURCES += [
|
||||
'GLContextProvider%s.cpp' % gl_provider,
|
||||
|
@ -56,7 +56,7 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
|
||||
CMMSRCS = \
|
||||
DISABLED_CMMSRCS = \
|
||||
gfxMacPlatformFontList.mm \
|
||||
$(NULL)
|
||||
endif
|
||||
|
@ -260,3 +260,8 @@ CPP_SOURCES += [
|
||||
'nsSurfaceTexture.cpp',
|
||||
]
|
||||
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
|
||||
CMMSRCS += [
|
||||
'gfxMacPlatformFontList.mm',
|
||||
]
|
||||
|
@ -32,7 +32,7 @@ MOCHITEST_BROWSER_FILES += \
|
||||
$(NULL)
|
||||
|
||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||
CMMSRCS += \
|
||||
DISABLED_CMMSRCS += \
|
||||
CocoaSensor.mm \
|
||||
smslib.mm \
|
||||
$(NULL)
|
||||
|
@ -139,3 +139,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
|
||||
CPP_SOURCES += [
|
||||
'FallbackNetwork.cpp'
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
|
||||
CMMSRCS += [
|
||||
'CocoaSensor.mm',
|
||||
'smslib.mm',
|
||||
]
|
||||
|
Loading…
Reference in New Issue
Block a user