Skip to content

Commit

Permalink
adapted iphlpapi linker fix for mingw builds
Browse files Browse the repository at this point in the history
  • Loading branch information
chcg committed Dec 19, 2023
1 parent 016e426 commit 69c5ad2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@ if (MINGW)
#remove the lib from the generated target lib
SET(CMAKE_SHARED_LIBRARY_PREFIX "")

target_link_libraries (NppFTP comctl32 shlwapi ssh ssl crypto z ws2_32 Iphlpapi)
target_link_libraries (NppFTP comctl32 shlwapi ssh ssl crypto z ws2_32 iphlpapi)
else (MINGW)
target_link_libraries (NppFTP comctl32 shlwapi ssh libssl libcrypto zlib ws2_32 Iphlpapi)
target_link_libraries (NppFTP comctl32 shlwapi ssh libssl libcrypto zlib ws2_32 iphlpapi)
endif (MINGW)

# build a CPack driven zip package
Expand Down
2 changes: 1 addition & 1 deletion Makefile.mingw
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ endif

CXX = $(PREFIX)-g++
CFLAGS = -MMD -Os -O3 -Wall -pedantic -Wformat=2 -Wno-deprecated-declarations -Wno-unused-value -Werror -fexpensive-optimizations -DLIBSSH_STATIC -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE
LFLAGS = -static -L$(OUTDIR)/obj -L$(OUTDIR)/3rdparty/lib -lcomdlg32 -lcomctl32 -luuid -lole32 -lshlwapi -lssh -lssl -lcrypto -lz -lgdi32 -lws2_32 -lIphlpapi
LFLAGS = -static -L$(OUTDIR)/obj -L$(OUTDIR)/3rdparty/lib -lcomdlg32 -lcomctl32 -luuid -lole32 -lshlwapi -lssh -lssl -lcrypto -lz -lgdi32 -lws2_32 -liphlpapi
INC = -I$(OUTDIR)/3rdparty/include -Isrc -Isrc/Windows -Itinyxml/include -IUTCP/include -I.
RES = $(OUTDIR)/obj/NppFTP.res

Expand Down

0 comments on commit 69c5ad2

Please sign in to comment.