X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c15521c67eb8aba1994240262ba973aa11ef0086..a2c6537e60ab5564d6bf33bb14ac8c42744aa93c:/src/msw/makefile.sc

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 8b44a3a4fa..35402f1453 100644
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -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,28 +43,26 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\numdlgg.obj \
 		$(GENDIR)\panelg.obj \
 		$(GENDIR)\progdlgg.obj \
-		$(GENDIR)\prop.obj \
-		$(GENDIR)\propform.obj \
-		$(GENDIR)\proplist.obj \
+		$(GENDIR)\renderg.obj \
 		$(GENDIR)\sashwin.obj \
 		$(GENDIR)\scrlwing.obj \
+		$(GENDIR)\selstore.obj \
 		$(GENDIR)\spinctlg.obj \
 		$(GENDIR)\splash.obj \
 		$(GENDIR)\splitter.obj \
 		$(GENDIR)\statusbr.obj \
-		$(GENDIR)\tbarsmpl.obj \
 		$(GENDIR)\textdlgg.obj \
 		$(GENDIR)\tipdlg.obj \
 		$(GENDIR)\tipwin.obj \
 		$(GENDIR)\treectlg.obj \
-		$(GENDIR)\treelay.obj \
 		$(GENDIR)\wizard.obj
 
-COMMONOBJS = \
-		$(COMMDIR)\y_tab.obj \
+COMMONOBJS = $(COMMDIR)\accesscmn.obj \
+		$(COMMDIR)\appbase.obj \
 		$(COMMDIR)\appcmn.obj \
 		$(COMMDIR)\artprov.obj \
 		$(COMMDIR)\artstd.obj \
+                $(COMMDIR)\bookctrl.obj \
 		$(COMMDIR)\choiccmn.obj \
 		$(COMMDIR)\clipcmn.obj \
 		$(COMMDIR)\clntdata.obj \
@@ -73,6 +74,7 @@ COMMONOBJS = \
 		$(COMMDIR)\cshelp.obj \
 		$(COMMDIR)\ctrlcmn.obj \
 		$(COMMDIR)\ctrlsub.obj \
+		$(COMMDIR)\datacmn.obj \
 		$(COMMDIR)\datetime.obj \
 		$(COMMDIR)\datstrm.obj \
 		$(COMMDIR)\db.obj \
@@ -85,6 +87,7 @@ COMMONOBJS = \
 		$(COMMDIR)\dobjcmn.obj \
 		$(COMMDIR)\docmdi.obj \
 		$(COMMDIR)\docview.obj \
+		$(COMMDIR)\dpycmn.obj \
 		$(COMMDIR)\dseldlg.obj \
 		$(COMMDIR)\dynarray.obj \
 		$(COMMDIR)\dynlib.obj \
@@ -100,6 +103,8 @@ COMMONOBJS = \
 		$(COMMDIR)\filefn.obj \
 		$(COMMDIR)\filename.obj \
 		$(COMMDIR)\filesys.obj \
+		$(COMMDIR)\fldlgcmn.obj \
+		$(COMMDIR)\fmapbase.obj \
 		$(COMMDIR)\fontcmn.obj \
 		$(COMMDIR)\fontmap.obj \
 		$(COMMDIR)\framecmn.obj \
@@ -129,6 +134,7 @@ COMMONOBJS = \
 		$(COMMDIR)\imagtiff.obj \
 		$(COMMDIR)\imagxpm.obj \
 		$(COMMDIR)\intl.obj \
+		$(COMMDIR)\init.obj \
 		$(COMMDIR)\ipcbase.obj \
 		$(COMMDIR)\layout.obj \
 		$(COMMDIR)\lboxcmn.obj \
@@ -140,10 +146,10 @@ COMMONOBJS = \
 		$(COMMDIR)\menucmn.obj \
 		$(COMMDIR)\mimecmn.obj \
 		$(COMMDIR)\module.obj \
+		$(COMMDIR)\msgout.obj \
 		$(COMMDIR)\mstream.obj \
 		$(COMMDIR)\nbkbase.obj \
 		$(COMMDIR)\object.obj \
-		$(COMMDIR)\odbc.obj \
 		$(COMMDIR)\paper.obj \
 		$(COMMDIR)\popupcmn.obj \
 		$(COMMDIR)\prntbase.obj \
@@ -152,7 +158,8 @@ COMMONOBJS = \
 		$(COMMDIR)\quantize.obj \
 		$(COMMDIR)\radiocmn.obj \
 		$(COMMDIR)\regex.obj \
-		$(COMMDIR)\resource.obj \
+		$(COMMDIR)\rendcmn.obj  \
+		$(COMMDIR)\rgncmn.obj \
 		$(COMMDIR)\sckaddr.obj \
 		$(COMMDIR)\sckfile.obj \
 		$(COMMDIR)\sckipc.obj \
@@ -161,10 +168,12 @@ COMMONOBJS = \
 		$(COMMDIR)\sizer.obj \
 		$(COMMDIR)\socket.obj \
 		$(COMMDIR)\statbar.obj \
+		$(COMMDIR)\stopwatch.obj \
 		$(COMMDIR)\strconv.obj \
 		$(COMMDIR)\stream.obj \
 		$(COMMDIR)\string.obj \
 		$(COMMDIR)\sysopt.obj \
+		$(COMMDIR)\taskbarcmn.obj \
 		$(COMMDIR)\tbarbase.obj \
 		$(COMMDIR)\textbuf.obj \
 		$(COMMDIR)\textcmn.obj \
@@ -184,14 +193,36 @@ 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 \
 		$(MSWDIR)\ole\automtn.obj \
+		$(MSWDIR)\basemsw.obj \
 		$(MSWDIR)\bitmap.obj \
 		$(MSWDIR)\bmpbuttn.obj \
 		$(MSWDIR)\brush.obj \
@@ -205,7 +236,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\colour.obj \
 		$(MSWDIR)\combobox.obj \
 		$(MSWDIR)\control.obj \
-		$(MSWDIR)\curico.obj \
 		$(MSWDIR)\cursor.obj \
 		$(MSWDIR)\data.obj \
 		$(MSWDIR)\ole\dataobj.obj \
@@ -218,9 +248,9 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\dialog.obj \
 		$(MSWDIR)\dialup.obj \
 		$(MSWDIR)\dib.obj \
-		$(MSWDIR)\dibutils.obj \
 		$(MSWDIR)\dir.obj \
 		$(MSWDIR)\dirdlg.obj \
+		$(MSWDIR)\display.obj \
 		$(MSWDIR)\dragimag.obj \
 		$(MSWDIR)\ole\dropsrc.obj \
 		$(MSWDIR)\ole\droptgt.obj \
@@ -234,7 +264,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 \
@@ -244,8 +273,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 \
@@ -256,22 +288,24 @@ 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 \
 		$(MSWDIR)\pen.obj \
 		$(MSWDIR)\penwin.obj \
+		$(MSWDIR)\popupwin.obj \
 		$(MSWDIR)\printdlg.obj \
 		$(MSWDIR)\printwin.obj \
 		$(MSWDIR)\radiobox.obj \
 		$(MSWDIR)\radiobut.obj \
 		$(MSWDIR)\regconf.obj \
 		$(MSWDIR)\region.obj \
+		$(MSWDIR)\renderer.obj \
 		$(MSWDIR)\registry.obj \
 		$(MSWDIR)\scrolbar.obj \
 		$(MSWDIR)\settings.obj \
 		$(MSWDIR)\slider95.obj \
-		$(MSWDIR)\slidrmsw.obj \
 		$(MSWDIR)\snglinst.obj \
 		$(MSWDIR)\spinbutt.obj \
 		$(MSWDIR)\spinctrl.obj \
@@ -283,7 +317,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 \
@@ -293,37 +326,86 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\treectrl.obj \
 		$(MSWDIR)\utils.obj \
 		$(MSWDIR)\utilsexc.obj \
+		$(MSWDIR)\utilsgui.obj \
 		$(MSWDIR)\ole\uuid.obj \
+		$(MSWDIR)\uxtheme.obj \
 		$(MSWDIR)\volume.obj \
 		$(MSWDIR)\wave.obj \
 		$(MSWDIR)\window.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) 
+
+all: MAKEARCHDIR MAKELIBS PCH $(LIBTARGET) zlib png jpeg tiff regex
 
-all: $(LIBTARGET)
+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
+    @if not exist $(WXOUTDIR)\nul mkdir $(WXOUTDIR)
+
+#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
+      implib  /s $(LIBDIR)\$(WINMMLIB) $(LIBDIR)\$(SC_SUFFIX)\$(WINMMLIB).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_pch
+
+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)
+
+PCH: $(INCDIR)\wx\wxprec.h
+        dmc $(CPPFLAGS) $(CFLAGS) $(INCLUDE) -HF$(WXOUTDIR)\wxprec.SYM -o$(WXOUTDIR)\wxprec.PCO $(INCDIR)\wx\wxprec.h
+
+clean_pch:
+        del $(WXOUTDIR)\*.sym
+        del $(WXOUTDIR)\*.PCO
+
+
+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
-	cd $(WXWIN)\distrib\msw\tmake
-	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
-	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+self : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	perl -x$(WXWIN)\distrib\msw\tmake -S tmake -t$(MFTYPE) wxwin.pro -o $(WXWIN)\distrib\msw\tmake\makefile.sc
+	copy $(WXWIN)\distrib\msw\tmake\makefile.$(MFTYPE) $(WXWIN)\src\msw