Reverted the warning fix since it breaks MinGW

[wxWidgets.git] / src / msw / makefile.sc

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index e32a27a733a808538676d5048b2b3987c8d982d1..b69656843c4e7579248b92c540cc7bc9e201f5da 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -3,12 +3,14 @@
 # This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
-# Symantec C++ makefile for the msw objects
+# Digital mars makefile 
+# was Symantec C++ makefile for the msw objects
+#
 # called from src\makefile.sc
 
 # configuration section (see src\makefile.sc) ###########################
 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 
 include ..\makesc.env
 
@@ -322,7 +324,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) 
 
-all: MAKEARCHDIR MAKEWINSOCKLIB $(LIBTARGET) zlib png jpeg tiff regex
+all: MAKEARCHDIR MAKELIBS $(LIBTARGET) zlib png jpeg tiff regex
 
 MAKEARCHDIR:
     @if not exist $(MSWINCDIR)\setup.h copy $(MSWINCDIR)\setup0.h $(MSWINCDIR)\setup.h
@@ -330,10 +332,10 @@ MAKEARCHDIR:
     @if not exist $(ARCHINCDIR)\wx\setup.h mkdir $(ARCHINCDIR)\wx
     @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)  
+#build our own copies of missing libraries
+MAKELIBS:
+      implib  /s $(LIBDIR)\$(SHELLLIB) $(LIBDIR)\$(SC_SUFFIX)\$(SHELLLIB).def
+      implib  /s $(LIBDIR)\$(WINSOCKLIB) $(LIBDIR)\$(SC_SUFFIX)\$(WINSOCKLIB).def
 
 $(LIBTARGET): $(OBJECTS)
        -del $(LIBTARGET)
@@ -345,9 +347,11 @@ clean_msw:
        -del $(COMMDIR)\*.obj
        -del $(MSWDIR)\*.obj
        -del $(GENDIR)\*.obj
-    -del $(HTMLDIR)\*.obj
+        -del $(HTMLDIR)\*.obj
        -del *.obj
-    -del $(LIBTARGET)
+        -del *.sym
+        -del ole\*.obj
+        -del $(LIBTARGET)
 
 png:   
         make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL)