Commit 1acc37c7 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1747756 - Move Windows system libraries from LIBS to moz.build....

Bug 1747756 - Move Windows system libraries from LIBS to moz.build. r=firefox-build-system-reviewers,mhentges

While mingw builds don't require user32 and advapi32 explicitly, it doesn't
hurt for them to be there (and they're required for clang-cl build).
Likewise, while clang-builds don't require uuid and userenv explicitly
because they're pulled in via #pragmas in the source code, mingw doesn't
support those #pragmas and needs them explicitly, which doesn't hurt the
clang-cl builds.

Differential Revision: https://phabricator.services.mozilla.com/D134737
parent 33573e7f
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -92,8 +92,11 @@ USE_LIBS += [
]

OS_LIBS += [
    "advapi32",
    "uuid",
    "rpcrt4",
    "oleacc",
    "user32",
]

RCINCLUDE = "AccessibleHandler.rc"
+7 −0
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ if CONFIG["OS_ARCH"] == "WINNT":
    LOCAL_INCLUDES += [
        "/browser/app/winlauncher",
    ]
    OS_LIBS += [
        "advapi32",
        "uuid",
    ]
    DELAYLOAD_DLLS += [
        "advapi32.dll",
        "oleaut32.dll",
@@ -115,6 +119,9 @@ if CONFIG["MOZ_SANDBOX"] and CONFIG["OS_ARCH"] == "WINNT":
        "sandbox_s",
    ]

    OS_LIBS += [
        "winmm",
    ]
    DELAYLOAD_DLLS += [
        "winmm.dll",
        "user32.dll",
+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ FINAL_TARGET = "_tests/xpcshell/browser/components/migration/tests/unit"
Program("InsertIEHistory")
OS_LIBS += [
    "ole32",
    "uuid",
]
SOURCES += [
    "InsertIEHistory.cpp",
+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ elif CONFIG["OS_TARGET"] == "SunOS":
elif CONFIG["OS_TARGET"] == "WINNT":
    OS_LIBS += [
        "advapi32",
        "wsock32",
        "ws2_32",
        "mswsock",
        "winmm",
+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ SharedLibrary("fake")
if CONFIG["OS_ARCH"] == "WINNT":
    OS_LIBS += [
        "ole32",
        "user32",
    ]

USE_STATIC_LIBS = True
Loading