From: Chris Elliott <biol75@york.ac.uk>
Date: Thu, 24 Apr 2003 21:37:23 +0000 (+0000)
Subject: update to make digitalmars compile/link make clean
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7960c7b4c5b44c2ea923f5acca38fd0fd269a159?ds=inline

update to make digitalmars compile/link make clean


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/distrib/msw/tmake/sc.t b/distrib/msw/tmake/sc.t
index 0c06c8a5e2..9ac6d5f8df 100644
--- a/distrib/msw/tmake/sc.t
+++ b/distrib/msw/tmake/sc.t
@@ -89,7 +89,7 @@ HTMLOBJS = #$ ExpandList ("WXHTMLOBJS");
 MSWOBJS = #$ ExpandList("WXMSWOBJS");
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) $(WINSOCKLIB)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) 
 
 all: MAKEARCHDIR MAKEWINSOCKLIB $(LIBTARGET) zlib png jpeg tiff regex
 
diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 93e8cabd4c..0fc2eddc54 100644
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -320,7 +320,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\window.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) $(WINSOCKLIB)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) 
 
 all: MAKEARCHDIR MAKEWINSOCKLIB $(LIBTARGET) zlib png jpeg tiff regex
 
@@ -331,7 +331,8 @@ MAKEARCHDIR:
     @if not exist $(ARCHINCDIR)\wx\setup.h copy $(MSWINCDIR)\setup.h $(ARCHINCDIR)\wx\setup.h
 
 MAKEWINSOCKLIB:
-      if not exist $(WINSOCKLIB) implib  /s $(WINSOCKLIB) $(WINDIR)\system32\wsock32.dll
+      implib  /s $(WINSOCKLIB) $(WINDIR)\system32\wsock32.dll
+##      implib /system /v /suffix /Ic:\wx\dm\include\win32 $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll
 ##    implib /system /v /suffix /Ic:\wx\dm\include\win32 $(WINSOCKLIB) $(WINDIR)\system32\wsock32.dll
 ##  bug here on win98 no system32 ??
 ##  implib doesn't work anyway