]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/makefile.sc
removed countItems parameter from ctor -- doesn't work anyhow
[wxWidgets.git] / src / msw / makefile.sc
index d1e48df4d5c3389e5ac69b6229d6cb275eba7b9f..b69656843c4e7579248b92c540cc7bc9e201f5da 100644 (file)
@@ -3,18 +3,20 @@
 # 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
 
 DEBUG=0
 
-LIBTARGET = $(LIBDIR)\wx.lib
+LIBTARGET = $(LIBDIR)\wx$(SC_SUFFIX).lib
 
 OPTIONS=
 
@@ -22,6 +24,7 @@ OPTIONS=
 
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
+HTMLDIR=$(WXDIR)\src\html
 OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 
@@ -40,9 +43,6 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\numdlgg.obj \
                $(GENDIR)\panelg.obj \
                $(GENDIR)\progdlgg.obj \
-               $(GENDIR)\prop.obj \
-               $(GENDIR)\propform.obj \
-               $(GENDIR)\proplist.obj \
                $(GENDIR)\sashwin.obj \
                $(GENDIR)\scrlwing.obj \
                $(GENDIR)\spinctlg.obj \
@@ -54,12 +54,9 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\tipdlg.obj \
                $(GENDIR)\tipwin.obj \
                $(GENDIR)\treectlg.obj \
-               $(GENDIR)\treelay.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 \
@@ -74,6 +71,7 @@ COMMONOBJS = \
                $(COMMDIR)\cshelp.obj \
                $(COMMDIR)\ctrlcmn.obj \
                $(COMMDIR)\ctrlsub.obj \
+               $(COMMDIR)\datacmn.obj \
                $(COMMDIR)\datetime.obj \
                $(COMMDIR)\datstrm.obj \
                $(COMMDIR)\db.obj \
@@ -146,7 +144,6 @@ COMMONOBJS = \
                $(COMMDIR)\mstream.obj \
                $(COMMDIR)\nbkbase.obj \
                $(COMMDIR)\object.obj \
-               $(COMMDIR)\odbc.obj \
                $(COMMDIR)\paper.obj \
                $(COMMDIR)\popupcmn.obj \
                $(COMMDIR)\prntbase.obj \
@@ -155,7 +152,7 @@ COMMONOBJS = \
                $(COMMDIR)\quantize.obj \
                $(COMMDIR)\radiocmn.obj \
                $(COMMDIR)\regex.obj \
-               $(COMMDIR)\resource.obj \
+               $(COMMDIR)\rgncmn.obj \
                $(COMMDIR)\sckaddr.obj \
                $(COMMDIR)\sckfile.obj \
                $(COMMDIR)\sckipc.obj \
@@ -168,6 +165,7 @@ COMMONOBJS = \
                $(COMMDIR)\stream.obj \
                $(COMMDIR)\string.obj \
                $(COMMDIR)\sysopt.obj \
+               $(COMMDIR)\taskbarcmn.obj \
                $(COMMDIR)\tbarbase.obj \
                $(COMMDIR)\textbuf.obj \
                $(COMMDIR)\textcmn.obj \
@@ -187,11 +185,31 @@ COMMONOBJS = \
                $(COMMDIR)\wfstream.obj \
                $(COMMDIR)\wincmn.obj \
                $(COMMDIR)\wxchar.obj \
-               $(COMMDIR)\wxexpr.obj \
                $(COMMDIR)\xpmdecod.obj \
                $(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 \
@@ -237,7 +255,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\fontutil.obj \
                $(MSWDIR)\frame.obj \
                $(MSWDIR)\gauge95.obj \
-               $(MSWDIR)\gaugemsw.obj \
                $(MSWDIR)\gdiimage.obj \
                $(MSWDIR)\gdiobj.obj \
                $(MSWDIR)\glcanvas.obj \
@@ -247,8 +264,11 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\helpchm.obj \
                $(MSWDIR)\helpwin.obj \
                $(MSWDIR)\icon.obj \
+               $(MSWDIR)\imaglist.obj \
                $(MSWDIR)\iniconf.obj \
+               $(MSWDIR)\joystick.obj \
                $(MSWDIR)\listbox.obj \
+               $(MSWDIR)\listctrl.obj \
                $(MSWDIR)\main.obj \
                $(MSWDIR)\mdi.obj \
                $(MSWDIR)\menu.obj \
@@ -259,6 +279,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\msgdlg.obj \
                $(MSWDIR)\mslu.obj \
                $(MSWDIR)\nativdlg.obj \
+               $(MSWDIR)\notebook.obj \
                $(MSWDIR)\ole\oleutils.obj \
                $(MSWDIR)\ownerdrw.obj \
                $(MSWDIR)\palette.obj \
@@ -275,7 +296,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\scrolbar.obj \
                $(MSWDIR)\settings.obj \
                $(MSWDIR)\slider95.obj \
-               $(MSWDIR)\slidrmsw.obj \
                $(MSWDIR)\snglinst.obj \
                $(MSWDIR)\spinbutt.obj \
                $(MSWDIR)\spinctrl.obj \
@@ -287,7 +307,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\tabctrl.obj \
                $(MSWDIR)\taskbar.obj \
                $(MSWDIR)\tbar95.obj \
-               $(MSWDIR)\tbarmsw.obj \
                $(MSWDIR)\textctrl.obj \
                $(MSWDIR)\tglbtn.obj \
                $(MSWDIR)\thread.obj \
@@ -303,28 +322,66 @@ 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 MAKELIBS $(LIBTARGET) zlib png jpeg tiff regex
+
+MAKEARCHDIR:
+    @if not exist $(MSWINCDIR)\setup.h copy $(MSWINCDIR)\setup0.h $(MSWINCDIR)\setup.h
+    @if not exist $(ARCHINCDIR)\wx\setup.h mkdir $(ARCHINCDIR)
+    @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
 
-all: $(LIBTARGET)
+#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)
+        -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
 
-$(COMMDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+regex:  
+        make -f $(WXDIR)\src\regex\makefile.sc FINAL=$(FINAL) 
 
-$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
-        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+clean_regex:
+        make -f $(WXDIR)\src\regex\makefile.sc clean
 
-$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
-    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
+tiff:  
+        make -f $(WXDIR)\src\tiff\makefile.sc FINAL=$(FINAL) 
 
-# $(COMMDIR)\cmndata.obj:     $(COMMDIR)\cmndata.cpp
-#      *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $(COMMDIR)\cmndata.cpp -o$(COMMDIR)\cmndata.obj
+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