Corrected some wxAccessible mistakes

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

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 93e8cabd4ca79e6393730d499ea31100aa89f6ec..f82064a06fb32e2d132f8fbeca16c405264c87d7 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -8,7 +8,7 @@
 
 # configuration section (see src\makefile.sc) ###########################
 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 
 include ..\makesc.env
 
@@ -320,9 +320,9 @@ 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
+all: MAKEARCHDIR MAKELIBS $(LIBTARGET) zlib png jpeg tiff regex
 
 MAKEARCHDIR:
     @if not exist $(MSWINCDIR)\setup.h copy $(MSWINCDIR)\setup0.h $(MSWINCDIR)\setup.h
@@ -330,13 +330,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:
-      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)  
+#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)
@@ -348,10 +345,11 @@ clean_msw:
        -del $(COMMDIR)\*.obj
        -del $(MSWDIR)\*.obj
        -del $(GENDIR)\*.obj
-    -del $(HTMLDIR)\*.obj
+        -del $(HTMLDIR)\*.obj
        -del *.obj
-    -del ole\*.obj
-    -del $(LIBTARGET)
+       -del *.sym
+        -del ole\*.obj
+        -del $(LIBTARGET)
 
 png:   
         make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL)