Most linking errors dealt with on compiling on MinGW

This commit is contained in:
wuggy 2026-04-18 13:06:15 -07:00
commit dd7052503e
6 changed files with 27 additions and 7 deletions

View file

@ -842,6 +842,13 @@ WebGLContext::ThrowEvent_WebGLContextCreationError(const nsACString& text)
GenerateWarning("Failed to create WebGL context: %s", text.BeginReading()); GenerateWarning("Failed to create WebGL context: %s", text.BeginReading());
} }
NS_IMETHODIMP
WebGLContext::InitializeWithDrawTarget(nsIDocShell*,
NotNull<gfx::DrawTarget*>)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP NS_IMETHODIMP
WebGLContext::SetDimensions(int32_t signedWidth, int32_t signedHeight) WebGLContext::SetDimensions(int32_t signedWidth, int32_t signedHeight)
{ {

View file

@ -347,10 +347,7 @@ public:
NS_IMETHOD SetDimensions(int32_t width, int32_t height) override; NS_IMETHOD SetDimensions(int32_t width, int32_t height) override;
NS_IMETHOD InitializeWithDrawTarget(nsIDocShell*, NS_IMETHOD InitializeWithDrawTarget(nsIDocShell*,
NotNull<gfx::DrawTarget*>) override NotNull<gfx::DrawTarget*>) override;
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHOD Reset() override { NS_IMETHOD Reset() override {
/* (InitializeWithSurface) */ /* (InitializeWithSurface) */

View file

@ -20,6 +20,8 @@ elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
if CONFIG['MOZ_GL_PROVIDER']: if CONFIG['MOZ_GL_PROVIDER']:
gl_provider = CONFIG['MOZ_GL_PROVIDER'] gl_provider = CONFIG['MOZ_GL_PROVIDER']
DISABLE_STL_WRAPPING = True
EXPORTS += [ EXPORTS += [
'DecomposeIntoNoRepeatTriangles.h', 'DecomposeIntoNoRepeatTriangles.h',
'EGLUtils.h', 'EGLUtils.h',

View file

@ -646,7 +646,10 @@ else:
# We allow warnings for third-party code that can be updated from upstream. # We allow warnings for third-party code that can be updated from upstream.
ALLOW_COMPILER_WARNINGS = True ALLOW_COMPILER_WARNINGS = True
FINAL_LIBRARY = 'gkmedias' if CONFIG['GNU_CC']:
FINAL_LIBRARY = 'xul'
else:
FINAL_LIBRARY = 'gkmedias'
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [
'skia/include/c', 'skia/include/c',
'skia/include/config', 'skia/include/config',
@ -697,6 +700,10 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
DEFINES['SKIA_DLL'] = 1 DEFINES['SKIA_DLL'] = 1
DEFINES['GR_DLL'] = 1 DEFINES['GR_DLL'] = 1
DEFINES['SK_FONT_HOST_USE_SYSTEM_SETTINGS'] = 1 DEFINES['SK_FONT_HOST_USE_SYSTEM_SETTINGS'] = 1
if CONFIG['GKMEDIAS_SHARED_LIBRARY'] and not CONFIG['GNU_CC']:
DEFINES['SKIA_DLL'] = 1
DEFINES['GR_DLL'] = 1
DEFINES['SK_FONT_HOST_USE_SYSTEM_SETTINGS'] = 1
# We should autogenerate these SSE related flags. # We should autogenerate these SSE related flags.

View file

@ -16,7 +16,13 @@
* Note: MOZ_NORETURN seems to break crash stacks on ARM, so we don't * Note: MOZ_NORETURN seems to break crash stacks on ARM, so we don't
* use that annotation there. * use that annotation there.
*/ */
MFBT_API #if defined(__MINGW32__)
# define MOZALLOC_ABORT_API
#else
# define MOZALLOC_ABORT_API MFBT_API
#endif
MOZALLOC_ABORT_API
#if !defined(__arm__) #if !defined(__arm__)
MOZ_NORETURN MOZ_NORETURN
#endif #endif

View file

@ -2,7 +2,8 @@
/* This Source Code Form is subject to the terms of the Mozilla Public /* 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 * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include <stdlib.h>
#include <windows.h> #include <windows.h>
#include "nsToolkit.h" #include "nsToolkit.h"
#include "mozilla/Assertions.h" #include "mozilla/Assertions.h"