update to make digitalmars compile/link make clean

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

diff --git a/distrib/msw/tmake/sc.t b/distrib/msw/tmake/sc.t
index 3c18534307b8a6ffd8e48b5a9dc7ada0c8537990..0c06c8a5e24e1b8442388053eae3453da1584862 100644 (file)
--- a/distrib/msw/tmake/sc.t
+++ b/distrib/msw/tmake/sc.t
@@ -100,8 +100,10 @@ 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\winsock.dll
-##    implib /system /v /suffix /Ic:\wx\dm\include\win32 $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll
+      if not exist $(WINSOCKLIB) implib  /s $(WINSOCKLIB) $(WINDIR)\system32\wsock32.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
 ##    implib  /s $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll
 ##@if not exist $(WINSOCKLIB)  
 
@@ -109,12 +111,15 @@ $(LIBTARGET): $(OBJECTS)
        -del $(LIBTARGET)
        *lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul;
 
-clean: clean_zlib clean_png clean_jpeg clean_tiff clean_regex
+clean: clean_msw clean_zlib clean_png clean_jpeg clean_tiff clean_regex
+
+clean_msw:
        -del $(COMMDIR)\*.obj
        -del $(MSWDIR)\*.obj
        -del $(GENDIR)\*.obj
     -del $(HTMLDIR)\*.obj
        -del *.obj
+    -del ole\*.obj
     -del $(LIBTARGET)
 
 png:   

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index e32a27a733a808538676d5048b2b3987c8d982d1..93e8cabd4ca79e6393730d499ea31100aa89f6ec 100644 (file)
--- 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) 
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) $(WINSOCKLIB)
 
 all: MAKEARCHDIR MAKEWINSOCKLIB $(LIBTARGET) zlib png jpeg tiff regex
 
@@ -331,8 +331,11 @@ MAKEARCHDIR:
     @if not exist $(ARCHINCDIR)\wx\setup.h copy $(MSWINCDIR)\setup.h $(ARCHINCDIR)\wx\setup.h
 
 MAKEWINSOCKLIB:
-      implib  /s $(WINSOCKLIB) $(WINDIR)\system32\wsock32.dll
-###      implib /system /v /suffix /Ic:\wx\dm\include\win32\ $(WINSOCKLIB) $(WINDIR)\system32\wsock32.dll
+      if not exist $(WINSOCKLIB) implib  /s $(WINSOCKLIB) $(WINDIR)\system32\wsock32.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
+##    implib  /s $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll
 ##@if not exist $(WINSOCKLIB)  
 
 $(LIBTARGET): $(OBJECTS)
@@ -347,6 +350,7 @@ clean_msw:
        -del $(GENDIR)\*.obj
     -del $(HTMLDIR)\*.obj
        -del *.obj
+    -del ole\*.obj
     -del $(LIBTARGET)
 
 png: