diff options
| author | Adam Mitz <mitza-oci@users.noreply.github.com> | 2012-03-30 13:40:08 +0000 |
|---|---|---|
| committer | Adam Mitz <mitza-oci@users.noreply.github.com> | 2012-03-30 13:40:08 +0000 |
| commit | 5501c0872845c63a819a781cc3941452ab47cb60 (patch) | |
| tree | 14d98746bf07fbc687cfae4d7d78d88857ef8bc4 | |
| parent | d25bbd490356691858f50b7a62d4953eee35ed0f (diff) | |
| download | ATCD-5501c0872845c63a819a781cc3941452ab47cb60.tar.gz | |
ChangeLogTag: Fri Mar 30 13:39:25 UTC 2012 Adam Mitz <mitza@ociweb.com>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_win32_msvc.GNU | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 64d8007a181..792a7894f9f 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Fri Mar 30 13:39:25 UTC 2012 Adam Mitz <mitza@ociweb.com> + + * include/makeinclude/platform_win32_msvc.GNU: + + Added iphlpapi to the list of system libraries. + Thu Mar 29 21:50:17 UTC 2012 Adam Mitz <mitza@ociweb.com> * bin/MakeProjectCreator/templates/gnu.mpd: diff --git a/ACE/include/makeinclude/platform_win32_msvc.GNU b/ACE/include/makeinclude/platform_win32_msvc.GNU index 8bec8100e42..405bbb57d5f 100644 --- a/ACE/include/makeinclude/platform_win32_msvc.GNU +++ b/ACE/include/makeinclude/platform_win32_msvc.GNU @@ -115,7 +115,7 @@ CCFLAGS = $(CFLAGS) CXXFLAGS = $(CFLAGS) RC_INCLUDE_FLAG = -I RC_OUTPUT_FLAG = -fo -SYSTEMLIBS += advapi32.lib user32.lib +SYSTEMLIBS += advapi32.lib user32.lib iphlpapi.lib MSVC_LINK = $(LD) $(SYSTEMLIBS) $(MSVC_LDFLAGS) $(patsubst %\,%,$(patsubst -L%,-libpath:%, $(subst /,\,$(LDFLAGS)))) $(patsubst -l%,%.lib,$(ACE_SHLIBS)) $(LIBS) -out:$@ define SOLINK.cc.override $(MSVC_LINK) $(MSVC_DLLFLAGS) $^ |