mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-15 06:15:43 +00:00
Bug 1325299 - Don't explicitly set PSAPI_VERSION. r=glandium
WINVER=0x0601 implies PSAPI_VERSION=2. We should not mix PSAPI_VERSION. MozReview-Commit-ID: Ckxel4JNW2x --HG-- extra : rebase_source : 932c67a3cae063fe4b0c5fec9048e67ce6286ad3
This commit is contained in:
parent
0bf2578311
commit
9929e7d3d2
@ -12,7 +12,6 @@ LOCAL_INCLUDES += [
|
|||||||
|
|
||||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||||
OS_LIBS += [
|
OS_LIBS += [
|
||||||
'psapi',
|
|
||||||
'shell32',
|
'shell32',
|
||||||
'dbghelp',
|
'dbghelp',
|
||||||
]
|
]
|
||||||
|
@ -40,7 +40,6 @@ fn main() {
|
|||||||
|
|
||||||
if target.contains("windows") {
|
if target.contains("windows") {
|
||||||
println!("cargo:rustc-link-lib=winmm");
|
println!("cargo:rustc-link-lib=winmm");
|
||||||
println!("cargo:rustc-link-lib=psapi");
|
|
||||||
if target.contains("gnu") {
|
if target.contains("gnu") {
|
||||||
println!("cargo:rustc-link-lib=stdc++");
|
println!("cargo:rustc-link-lib=stdc++");
|
||||||
}
|
}
|
||||||
|
@ -659,7 +659,7 @@ case "$target" in
|
|||||||
# Use temp file for windres (bug 213281)
|
# Use temp file for windres (bug 213281)
|
||||||
RCFLAGS='-O coff --use-temp-file'
|
RCFLAGS='-O coff --use-temp-file'
|
||||||
# mingw doesn't require kernel32, user32, and advapi32 explicitly
|
# mingw doesn't require kernel32, user32, and advapi32 explicitly
|
||||||
LIBS="$LIBS -lgdi32 -lwinmm -lwsock32 -lpsapi"
|
LIBS="$LIBS -lgdi32 -lwinmm -lwsock32"
|
||||||
MOZ_FIX_LINK_PATHS=
|
MOZ_FIX_LINK_PATHS=
|
||||||
DLL_PREFIX=
|
DLL_PREFIX=
|
||||||
IMPORT_LIB_SUFFIX=a
|
IMPORT_LIB_SUFFIX=a
|
||||||
@ -796,7 +796,7 @@ case "$target" in
|
|||||||
# make 'foo == bar;' error out
|
# make 'foo == bar;' error out
|
||||||
CFLAGS="$CFLAGS -we4553"
|
CFLAGS="$CFLAGS -we4553"
|
||||||
CXXFLAGS="$CXXFLAGS -we4553"
|
CXXFLAGS="$CXXFLAGS -we4553"
|
||||||
LIBS="$LIBS kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib psapi.lib"
|
LIBS="$LIBS kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib"
|
||||||
MOZ_DEBUG_LDFLAGS='-DEBUG -DEBUGTYPE:CV'
|
MOZ_DEBUG_LDFLAGS='-DEBUG -DEBUGTYPE:CV'
|
||||||
WARNINGS_AS_ERRORS='-WX'
|
WARNINGS_AS_ERRORS='-WX'
|
||||||
MOZ_OPTIMIZE_FLAGS="-O2"
|
MOZ_OPTIMIZE_FLAGS="-O2"
|
||||||
|
@ -3327,7 +3327,6 @@
|
|||||||
'WIN32',
|
'WIN32',
|
||||||
'_WINDOWS',
|
'_WINDOWS',
|
||||||
'NOMINMAX',
|
'NOMINMAX',
|
||||||
'PSAPI_VERSION=1',
|
|
||||||
'_CRT_RAND_S',
|
'_CRT_RAND_S',
|
||||||
'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
|
'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
|
||||||
'WIN32_LEAN_AND_MEAN',
|
'WIN32_LEAN_AND_MEAN',
|
||||||
@ -3455,7 +3454,6 @@
|
|||||||
'msimg32.lib',
|
'msimg32.lib',
|
||||||
'ws2_32.lib',
|
'ws2_32.lib',
|
||||||
'usp10.lib',
|
'usp10.lib',
|
||||||
'psapi.lib',
|
|
||||||
'dbghelp.lib',
|
'dbghelp.lib',
|
||||||
'winmm.lib',
|
'winmm.lib',
|
||||||
'shlwapi.lib',
|
'shlwapi.lib',
|
||||||
|
@ -27,7 +27,6 @@ def Libxul(name):
|
|||||||
'dbghelp.dll',
|
'dbghelp.dll',
|
||||||
'netapi32.dll',
|
'netapi32.dll',
|
||||||
'PowrProf.dll',
|
'PowrProf.dll',
|
||||||
'psapi.dll',
|
|
||||||
'rasapi32.dll',
|
'rasapi32.dll',
|
||||||
'rasdlg.dll',
|
'rasdlg.dll',
|
||||||
'secur32.dll',
|
'secur32.dll',
|
||||||
@ -340,7 +339,6 @@ if CONFIG['OS_ARCH'] == 'WINNT':
|
|||||||
'msimg32',
|
'msimg32',
|
||||||
'netapi32',
|
'netapi32',
|
||||||
'shlwapi',
|
'shlwapi',
|
||||||
'psapi',
|
|
||||||
'ws2_32',
|
'ws2_32',
|
||||||
'dbghelp',
|
'dbghelp',
|
||||||
'rasapi32',
|
'rasapi32',
|
||||||
|
Loading…
Reference in New Issue
Block a user