Skip to content
Snippets Groups Projects
Commit 629d7b70 authored by chrfranke's avatar chrfranke
Browse files

Makefile.am: Windows: Ensure that advapi32 is linked before kernel32.

This keeps backward compatibility with old versions of Windows if
recent versions of MinGW-w64 are used.

git-svn-id: https://svn.code.sf.net/p/smartmontools/code/trunk@5369 4ea69e1a-61f1-4043-bf83-b5c94c648137
parent 6b39e8fd
Branches
No related tags found
No related merge requests found
...@@ -2,6 +2,10 @@ $Id$ ...@@ -2,6 +2,10 @@ $Id$
2022-04-30 Christian Franke <franke@computer.org> 2022-04-30 Christian Franke <franke@computer.org>
Makefile.am: Windows: Ensure that advapi32 is linked before kernel32.
This keeps backward compatibility with old versions of Windows if
recent versions MinGW-w64 are used.
Makefile.am: config-vc: Remove HAVE___INT128 from generated config.h. Makefile.am: config-vc: Remove HAVE___INT128 from generated config.h.
Makefile.am: Support 'svnversion' with CR/LF instead of LF output. Makefile.am: Support 'svnversion' with CR/LF instead of LF output.
......
...@@ -282,6 +282,12 @@ smartd_SOURCES += \ ...@@ -282,6 +282,12 @@ smartd_SOURCES += \
smartctl_LDADD += -lole32 -loleaut32 smartctl_LDADD += -lole32 -loleaut32
smartd_LDADD += -lole32 -loleaut32 smartd_LDADD += -lole32 -loleaut32
# Some versions of the MinGW-w64 import lib for kernel32.dll include some symbols
# duplicated from advapi32.dll. Older versions of windows provide these symbols
# only in advapi32.dll. Ensure that the advapi32 lib is linked first.
smartctl_LDADD += -ladvapi32
smartd_LDADD += -ladvapi32
endif endif
if OS_SOLARIS if OS_SOLARIS
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment