* Fix logical error in m_overflow attribute merging

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

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 852d757876f99186dfc7ecb1c91058e68d0178d8..f82064a06fb32e2d132f8fbeca16c405264c87d7 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -8,7 +8,7 @@
 
 # configuration section (see src\makefile.sc) ###########################
 
 
 # configuration section (see src\makefile.sc) ###########################
 

-WXDIR = $(WXWIN)
+WXDIR = ..\..

 
 include ..\makesc.env
 
 
 include ..\makesc.env
 


@@ -320,9 +320,9 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\window.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
                $(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
 
 MAKEARCHDIR:
     @if not exist $(MSWINCDIR)\setup.h copy $(MSWINCDIR)\setup0.h $(MSWINCDIR)\setup.h


@@ -330,23 +330,26 @@ 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
 
     @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\winsock.dll
-##    implib /system /v /suffix /Ic:\wx\dm\include\win32 $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll
-##    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)
        *lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul;
 
 
 $(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 $(COMMDIR)\*.obj
        -del $(MSWDIR)\*.obj
        -del $(GENDIR)\*.obj

-    -del $(HTMLDIR)\*.obj
+        -del $(HTMLDIR)\*.obj

        -del *.obj
        -del *.obj

-    -del $(LIBTARGET)
+       -del *.sym
+        -del ole\*.obj
+        -del $(LIBTARGET)

 
 png:   
         make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL)
 
 png:   
         make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL)