* 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 37a26a971e3fcb8ee50516c92471263df9e511c3..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
 
@@ -22,6 +22,7 @@ OPTIONS=
 
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
+HTMLDIR=$(WXDIR)\src\html
 OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 
@@ -53,9 +54,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\treectlg.obj \
                $(GENDIR)\wizard.obj
 
-COMMONOBJS = \
-               $(COMMDIR)\y_tab.obj \
-               $(COMMDIR)\accesscmn.obj \
+COMMONOBJS = $(COMMDIR)\accesscmn.obj \
                $(COMMDIR)\appcmn.obj \
                $(COMMDIR)\artprov.obj \
                $(COMMDIR)\artstd.obj \
@@ -188,6 +187,27 @@ COMMONOBJS = \
                $(COMMDIR)\zipstrm.obj \
                $(COMMDIR)\zstream.obj
 
+HTMLOBJS = $(HTMLDIR)\helpctrl.obj \
+               $(HTMLDIR)\helpdata.obj \
+               $(HTMLDIR)\helpfrm.obj \
+               $(HTMLDIR)\htmlcell.obj \
+               $(HTMLDIR)\htmlfilt.obj \
+               $(HTMLDIR)\htmlpars.obj \
+               $(HTMLDIR)\htmltag.obj \
+               $(HTMLDIR)\htmlwin.obj \
+               $(HTMLDIR)\htmprint.obj \
+               $(HTMLDIR)\m_dflist.obj \
+               $(HTMLDIR)\m_fonts.obj \
+               $(HTMLDIR)\m_hline.obj \
+               $(HTMLDIR)\m_image.obj \
+               $(HTMLDIR)\m_layout.obj \
+               $(HTMLDIR)\m_links.obj \
+               $(HTMLDIR)\m_list.obj \
+               $(HTMLDIR)\m_pre.obj \
+               $(HTMLDIR)\m_style.obj \
+               $(HTMLDIR)\m_tables.obj \
+               $(HTMLDIR)\winpars.obj
+
 MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\ole\access.obj \
                $(MSWDIR)\app.obj \
@@ -244,6 +264,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\icon.obj \
                $(MSWDIR)\imaglist.obj \
                $(MSWDIR)\iniconf.obj \
+               $(MSWDIR)\joystick.obj \
                $(MSWDIR)\listbox.obj \
                $(MSWDIR)\listctrl.obj \
                $(MSWDIR)\main.obj \
@@ -299,9 +320,9 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\window.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) 
 
-all: MAKEARCHDIR $(LIBTARGET)
+all: MAKEARCHDIR MAKELIBS $(LIBTARGET) zlib png jpeg tiff regex
 
 MAKEARCHDIR:
     @if not exist $(MSWINCDIR)\setup.h copy $(MSWINCDIR)\setup0.h $(MSWINCDIR)\setup.h
@@ -309,27 +330,56 @@ 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
 
+#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;
 
-clean:
+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 $(LIBTARGET)
-
-## $(COMMDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
-##
-## $(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
-##        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
-##
-## $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
-##    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
-##
-### $(COMMDIR)\cmndata.obj:     $(COMMDIR)\cmndata.cpp
-###    *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $(COMMDIR)\cmndata.cpp -o$(COMMDIR)\cmndata.obj
+       -del *.sym
+        -del ole\*.obj
+        -del $(LIBTARGET)
+
+png:   
+        make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL)
+
+clean_png:
+        make -f $(WXDIR)\src\png\makefile.sc clean
+
+zlib:   
+        make -f $(WXDIR)\src\zlib\makefile.sc FINAL=$(FINAL) 
+
+clean_zlib:
+        make -f $(WXDIR)\src\zlib\makefile.sc clean
+
+jpeg:   
+        make -f $(WXDIR)\src\jpeg\makefile.sc FINAL=$(FINAL)
+
+clean_jpeg:
+        make -f $(WXDIR)\src\jpeg\makefile.sc clean
+
+regex:  
+        make -f $(WXDIR)\src\regex\makefile.sc FINAL=$(FINAL) 
+
+clean_regex:
+        make -f $(WXDIR)\src\regex\makefile.sc clean
+
+tiff:  
+        make -f $(WXDIR)\src\tiff\makefile.sc FINAL=$(FINAL) 
+
+clean_tiff:
+        make -f $(WXDIR)\src\tiff\makefile.sc clean
 
 MFTYPE=sc
 makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t