mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Back out ed6e04e6fc0c (bug 968642) for breaking Windows plugin tests
CLOSED TREE
This commit is contained in:
Phil Ringnalda
parent
7f51437bfe
commit
ef3a438040
@ -82,6 +82,7 @@ endif
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
RESFILE=splashos2.res
|
||||
RCFLAGS += -DMOZ_PHOENIX
|
||||
RCFLAGS += -DFIREFOX_ICO='"$(DIST)/branding/firefox-os2.ico"' -DDOCUMENT_ICO='"$(DIST)/branding/document-os2.ico"'
|
||||
endif
|
||||
|
||||
@ -7,6 +7,8 @@ LIB_IS_C_ONLY = 1
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
DEFFILE = $(CURDIR)/sqlite-processed.def
|
||||
RCFILE = sqlite.rc
|
||||
RESFILE = sqlite.res
|
||||
|
||||
GARBAGE += \
|
||||
sqlite-version.h \
|
||||
|
||||
@ -66,7 +66,3 @@ if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['MOZ_MEMORY']:
|
||||
# disable PGO for Sun Studio
|
||||
if CONFIG['SOLARIS_SUNPRO_CC']:
|
||||
NO_PGO = True
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
RCFILE = 'sqlite.rc'
|
||||
RESFILE = 'sqlite.res'
|
||||
|
||||
@ -12,7 +12,3 @@ FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
|
||||
|
||||
relative_path = '.'
|
||||
include('testplugin.mozbuild')
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||
RCFILE = 'nptest.rc'
|
||||
RESFILE = 'nptest.res'
|
||||
|
||||
@ -20,6 +20,8 @@ EXTRA_DSO_LDOPTS = \
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
|
||||
RCFILE = nptest.rc
|
||||
RESFILE = nptest.res
|
||||
DEFFILE = $(win_srcdir)/nptest.def
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,msimg32)
|
||||
|
||||
|
||||
@ -27,6 +27,8 @@
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
RESFILE = winEmbed.res
|
||||
|
||||
LIBS = \
|
||||
$(DEPTH)/profile/dirserviceprovider/standalone/$(LIB_PREFIX)profdirserviceprovidersa_s.$(LIB_SUFFIX) \
|
||||
$(XPCOM_STANDALONE_GLUE_LDOPTS) \
|
||||
|
||||
@ -15,5 +15,3 @@ SOURCES += [
|
||||
XPI_NAME = 'winembed'
|
||||
|
||||
DEFINES['XPCOM_GLUE'] = True
|
||||
|
||||
RESFILE = 'winEmbed.res'
|
||||
|
||||
@ -14,6 +14,7 @@ endif
|
||||
# Target: 'libEGL'
|
||||
# Links with: 'libGLESv2'
|
||||
DEFFILE = $(srcdir)/libEGL.def
|
||||
RCFILE = $(srcdir)/libEGL.rc
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -42,5 +42,3 @@ if not CONFIG['MOZ_DEBUG']:
|
||||
DEFINES['_SECURE_SCL'] = 0
|
||||
|
||||
DEFINES['ANGLE_COMPILE_OPTIMIZATION_LEVEL'] = 'D3DCOMPILE_OPTIMIZATION_LEVEL1'
|
||||
|
||||
RCFILE = SRCDIR + '/libEGL.rc'
|
||||
|
||||
@ -11,6 +11,7 @@ OS_CPPFLAGS += -EHsc
|
||||
endif
|
||||
|
||||
DEFFILE = $(srcdir)/libGLESv2.def
|
||||
RCFILE = $(srcdir)/libGLESv2.rc
|
||||
|
||||
# End build_angle.gypi transcription.
|
||||
|
||||
|
||||
@ -193,5 +193,3 @@ if not CONFIG['MOZ_DEBUG']:
|
||||
DEFINES['_SECURE_SCL'] = 0
|
||||
|
||||
DEFINES['ANGLE_COMPILE_OPTIMIZATION_LEVEL'] = 'D3DCOMPILE_OPTIMIZATION_LEVEL1'
|
||||
|
||||
RCFILE = SRCDIR + '/libGLESv2.rc'
|
||||
|
||||
@ -222,6 +222,11 @@ else
|
||||
NSPR_STATIC_PATH = $(DIST)/lib
|
||||
endif
|
||||
|
||||
ifdef MOZ_ETW
|
||||
# This will get the ETW provider resources into the library mozjs.dll
|
||||
RESFILE = ETWProvider.res
|
||||
endif
|
||||
|
||||
# HP-UX does not require the extra linking of "-lm"
|
||||
ifeq (,$(filter HP-UX WINNT OS2,$(OS_ARCH)))
|
||||
EXTRA_LIBS += -lm
|
||||
|
||||
@ -409,8 +409,6 @@ if CONFIG['MOZ_ETW']:
|
||||
GENERATED_FILES = [
|
||||
'ETWProvider.h',
|
||||
]
|
||||
# This will get the ETW provider resources into the library mozjs.dll
|
||||
RESFILE = 'ETWProvider.res'
|
||||
|
||||
if CONFIG['NIGHTLY_BUILD']:
|
||||
DEFINES['ENABLE_PARALLEL_JS'] = True
|
||||
|
||||
@ -236,8 +236,6 @@ class TreeMetadataEmitter(LoggingMixin):
|
||||
'MSVC_ENABLE_PGO',
|
||||
'NO_DIST_INSTALL',
|
||||
'OS_LIBS',
|
||||
'RCFILE',
|
||||
'RESFILE',
|
||||
'SDK_LIBRARY',
|
||||
]
|
||||
for v in varlist:
|
||||
|
||||
@ -322,18 +322,6 @@ VARIABLES = {
|
||||
This variable contains a list of system libaries to link against.
|
||||
""", None),
|
||||
|
||||
'RCFILE': (unicode, unicode,
|
||||
"""The program .rc file.
|
||||
|
||||
This variable can only be used on Windows (and OS/2).
|
||||
""", None),
|
||||
|
||||
'RESFILE': (unicode, unicode,
|
||||
"""The program .res file.
|
||||
|
||||
This variable can only be used on Windows (and OS/2).
|
||||
""", None),
|
||||
|
||||
'SDK_LIBRARY': (StrictOrderingOnAppendList, list,
|
||||
"""Elements of the distributed SDK.
|
||||
|
||||
|
||||
@ -35,6 +35,3 @@ MSVC_ENABLE_PGO = True
|
||||
NO_VISIBILITY_FLAGS = True
|
||||
|
||||
DELAYLOAD_DLLS = ['foo.dll', 'bar.dll']
|
||||
|
||||
RCFILE = 'foo.rc'
|
||||
RESFILE = 'bar.res'
|
||||
|
||||
@ -328,12 +328,6 @@ class TestRecursiveMakeBackend(BackendTester):
|
||||
'USE_DELAYIMP': [
|
||||
'USE_DELAYIMP := 1',
|
||||
],
|
||||
'RCFILE': [
|
||||
'RCFILE := foo.rc',
|
||||
],
|
||||
'RESFILE': [
|
||||
'RESFILE := bar.res',
|
||||
],
|
||||
}
|
||||
|
||||
for var, val in expected.items():
|
||||
|
||||
@ -41,6 +41,3 @@ IS_COMPONENT = True
|
||||
NO_VISIBILITY_FLAGS = True
|
||||
|
||||
DELAYLOAD_DLLS = ['foo.dll', 'bar.dll']
|
||||
|
||||
RCFILE = 'foo.rc'
|
||||
RESFILE = 'bar.res'
|
||||
|
||||
@ -171,8 +171,6 @@ class TestEmitterBasic(unittest.TestCase):
|
||||
VISIBILITY_FLAGS='',
|
||||
DELAYLOAD_LDFLAGS=['-DELAYLOAD:foo.dll', '-DELAYLOAD:bar.dll'],
|
||||
USE_DELAYIMP=True,
|
||||
RCFILE='foo.rc',
|
||||
RESFILE='bar.res',
|
||||
)
|
||||
|
||||
variables = objs[0].variables
|
||||
|
||||
@ -35,6 +35,7 @@ LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
RESFILE = xulrunos2.res
|
||||
RCFLAGS += -i $(topsrcdir)/widget/os2
|
||||
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/widget/os2
|
||||
|
||||
@ -44,17 +44,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'os2', 'mac', 'cocoa',
|
||||
'gtk2', 'gtk3', 'qt', 'android'):
|
||||
DEFINES['ICON_DECODER'] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/config',
|
||||
# need widget/windows for resource.h (included from widget.rc)
|
||||
'/widget/windows',
|
||||
]
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']:
|
||||
LOCAL_INCLUDES += [
|
||||
'/xpcom/base',
|
||||
]
|
||||
|
||||
FAIL_ON_WARNINGS = True
|
||||
|
||||
MSVC_ENABLE_PGO = True
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
# 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/.
|
||||
|
||||
RESFILE = widget.res
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
|
||||
|
||||
@ -36,5 +36,3 @@ LOCAL_INCLUDES += [
|
||||
DEFINES['USE_OS2_TOOLKIT_HEADERS'] = True
|
||||
|
||||
DEFINES['MOZ_APP_DISPLAYNAME'] = '"%s"' % CONFIG['MOZ_APP_DISPLAYNAME']
|
||||
|
||||
RESFILE = 'widget.res'
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
# 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/.
|
||||
|
||||
RESFILE = widget.res
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
|
||||
|
||||
@ -112,5 +112,3 @@ DEFINES['MOZ_UNICODE'] = True
|
||||
for var in ('MOZ_ENABLE_D3D9_LAYER', 'MOZ_ENABLE_D3D10_LAYER'):
|
||||
if CONFIG[var]:
|
||||
DEFINES[var] = True
|
||||
|
||||
RESFILE = 'widget.res'
|
||||
|
||||
@ -59,6 +59,7 @@ endif
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
RESFILE=splashos2.res
|
||||
RCFLAGS += -DMOZ_XULRUNNER
|
||||
ifdef DEBUG
|
||||
RCFLAGS += -DDEBUG
|
||||
|
||||
Loading…
Reference in New Issue
Block a user