From 7783e39b77352368aefcd5b8b57ce269be0e7953 Mon Sep 17 00:00:00 2001 From: Volker Ruppert Date: Wed, 21 Aug 2013 15:19:47 +0000 Subject: [PATCH] On Windows, the netmod plugin now must be linked with wsock32 --- .../win32/vs2008ex-plugins-workspace.zip | Bin 76695 -> 76702 bytes bochs/iodev/network/Makefile.in | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/bochs/build/win32/vs2008ex-plugins-workspace.zip b/bochs/build/win32/vs2008ex-plugins-workspace.zip index 927ca330d9994ba2ce3b15218865486a5e322bfd..ddac51960023af5286855082a1082a0ff46cd034 100644 GIT binary patch delta 1534 zcmV8q!tD!03v5KrC0{c%Wv7wuX~+#{?AgQWtOV8 zsg(p=#0!GjwBqL9$88k@V253*R^-=li(=hKNJ=+NcdtOC0>n3sdK(qmmJ5u-6f_{Z71}_ zqYPFgBnx7mEabmk^gBqRb4)RKi192uH`p0tz9cS&++98VBi@T%r=Q7;zQuwNytpGZ zHw>i;P8`Wi&~k?75w(K+9(Dc5+av_RB1wM<9kPN@A$b&l7bikSj)>QohnJ}oaCFF- zi-lmkgJ+Niaq_}N=nbkBecI`o*XR1w8V<(8epjEua%Xrm)(7!MDkRPx_$o!xKDX*?;a(E=>oY6LUD#%F_Z@~-TBnaO!cS(D;nM`n6EHm4xPw;?Jj@6!sYjd z%QbrRs1Ntsj;O2FyQ>gUu^W@;@U$@b^zY$xa0sW?=xRFdTGylQbTFLW7^6XNa6Voa zJIMhBFTt|7G2bbJhrqe6!Ci_Re`92fpQ>6NvcC{te;E86{IK|$7M*V*=u3g_6{!Au zpgLGe-gP59!yE#=e)S#9HxGZncnDaq18?Ivw@+e{*6D|v)S`Rck+W`0czDE0h9PM}rt;3N{<5!G4%%AEs7SK|J`U2XFMW7Q3T?TdamGF)>7OiTlRjW2j zTC-(#v{R>asx_NkQ>%YhYPQ*}Rl25azOb=K^Kh}3hS`l=KNg-cle;=`neIkhcY;v& z{JGBE3Vc#`2-W#q=yNjDZ^Jo!IR2%>b7!T4-81z|59wULN6VvrsW&=C-7xE#-7J-~ zQ@7OAnr6e$npM**SIUObDV2BqvTICYW7065`^-Up+DvXIXT=96{?P*Ke*?2R{f{gS z0Erbtn+2BIegyykub0*-0agJ)mn|v*WC3rNk}3g11N8_2mkS929hdbg0V)BFmmn(v kMgs~I0hb^Y0T>ogO9ci10000p05bsN5dZ+C836zQ02GVuRR910 delta 1522 zcmV1hAO*5}K1SKu!&p3U>tn0GAm602ct4@F@Wqf9+XqZ`(Ey{_Fz% z4}sASEn3;K9lt^G3cXmF0mlyPq}c}p1|`up6NywQ%5k>!zwao?uZb5e!-@_K5CtN2 zcjVnYyyuvleO?9r$rAI3Fxn|rN^0>0QnPpwny;3R+aLFa-vb*e^WWTV$8RRkJC|ke`qo~ zBlDOe0n27f?9J`0V__$r|G8bQFpNbQ3yW|F3gZu*Vrfz;O_+15cv3VK>QRAtfIWf) zenxa};WSCvO4kt{&Ms^-3rwM)U-d5tB?0*zN9HJ|S0uoF;&8+tt|K%D%^C6|oY`F< zj$GKr7>kWbeUIEomz@C;y(fENxzZ&0ghQ>$xSpKDWdI2aH6U2O`}*6?Pm4U!L; zkpw-+9|8Ix{(EpK7$_nxfC^l|<^sES(bk1*I>TD0Sj*;b5T{U!`gn=`?d&)XLk=4q z3&cene;SBF0y;%-Z@pG>sCrZ$*CbeW@&Xm^+4LX^IQK?4Vlj8|;~X4UJ+5;+w$t6< znXxZo4z?<4t@hk%V6so>UG8Hch4=QfMU90+Og*UkDPDF8$i!jpA}aaB$&{oO02#*; zN66nC`y46BP6>txlNpZ0J~-B24->a%VjMf;e}_omV3Wwg2mwdQdgTGUF!&@lvHdKM zc6Wu{SlWV+$!P7JowOKTAa_A1&VdhIMj+QY&)m#agDeog!+AuF$jvKiuS^!^5!AyF z7?R9LKAc~&NE|Q8XXQP<`FrjgVIM=<^06OJh4b;>p73{Nz?%j0B`?gO``EA7l~;=V zf8G?iW{e*7;e6XMb>)0_6(Sn#=HxjJElocCdkP&KQm8q)nvT2X^{6`?45v5xXwVy+ zkJrUcaA3Ym@GNP@cgo-)S*~kvmmAxqZgQ@iXHo`N^A-U_@-NATs(Mw*TfBx@K+Bm`UNg|Rior-jdZWwB==EBcvrFnR! zG0)csJd5yFbCA$b6v$_lQ4=L!W8Cv($0EIlyYZ=QHfv40qL@v+uAJ7I4MkTQ4W+8r zs#ddJ)vLDsZI3MEHnO6D;rdFJ_!5al0@$Q*P2kQfZ^#oY7E>Dge#vz+@TC?~e-n@S z`{?a;qqv)$XKMCy<#!`?v?i=2%IjU1A8k9IKTmWdKe$KfhnM7g34_;s|2+A=mp;BG z{O3q``p3}MZ2yn5oxDQpaHP}t6(bMxr#g)Vv=pJXfHq?hXoNzSL0xSXc}E+IcCFp6 z*IKI5Y8#ev>ZqqmtJO7>MzwAmf8BbuYuLsM8;cBwi#-_TcXE9}c*;%gYQ$xl8*|MG zLe2B%8h5Mk2+bi>tn0GF5DDFIdiI+rvm0b~JamzgR7LjmrW-6{b|1BMO(m#Pi{8kZR+ Y0SuQ1D9?q0V)Qb836zQ09q^7ga7~l diff --git a/bochs/iodev/network/Makefile.in b/bochs/iodev/network/Makefile.in index aa9cca3e6..75b45ac8e 100644 --- a/bochs/iodev/network/Makefile.in +++ b/bochs/iodev/network/Makefile.in @@ -94,7 +94,7 @@ bx_%.dll: %.o # special link rules for plugins that require more than one object file bx_netmod.dll: netmod.o $(NETLOW_OBJS) - $(CXX) $(CXXFLAGS) -shared -o bx_netmod.dll netmod.o $(NETLOW_OBJS) $(WIN32_DLL_IMPORT_LIBRARY) + $(CXX) $(CXXFLAGS) -shared -o bx_netmod.dll netmod.o $(NETLOW_OBJS) $(WIN32_DLL_IMPORT_LIBRARY) -lwsock32 ##### end DLL section