-#
-# File: makefile.nt
-# Author: Julian Smart
-# Created: 1997
+# This file was automatically generated by tmake at 14:31, 2000/01/19
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
+
+# File: makefile.vc
+# Author: Julian Smart
+# Created: 1997
# Updated:
-# Copyright: (c) 1997, Julian Smart
+# Copyright: (c) 1997, Julian Smart
#
# "%W% %G%"
#
DUMMYOBJ=$D\dummy.obj
!endif
-# Please set these according to the settings in wx_setup.h, so we can include
+# Please set these according to the settings in setup.h, so we can include
# the appropriate libraries in wx.lib
-# This one overrides the others, to be consistent with the settings in wx_setup.h
+# This one overrides the others, to be consistent with the settings in setup.h
MINIMAL_WXWINDOWS_SETUP=0
PERIPH_LIBS=
OLEDIR=ole
MSWDIR=$(WXDIR)\src\msw
DOCDIR = $(WXDIR)\docs
+HTMLDIR = $(WXDIR)\src\html
{..\generic}.cpp{..\generic\$D}.obj:
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $<
<<
+{..\common}.c{..\common\$D}.obj:
+ cl @<<
+$(CPPFLAGS2) /Fo$@ /c /Tc $<
+<<
+
{..\msw}.cpp{..\msw\$D}.obj:
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $<
<<
+{..\msw}.c{..\msw\$D}.obj:
+ cl @<<
+$(CPPFLAGS2) /Fo$@ /c /Tc $<
+<<
+
{..\msw\ole}.cpp{..\msw\ole\$D}.obj:
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $<
<<
-GENERICOBJS= \
- ..\generic\$D\choicdgg.obj \
- ..\generic\$D\gridg.obj \
- ..\generic\$D\laywin.obj \
- ..\generic\$D\panelg.obj \
- ..\generic\$D\prop.obj \
- ..\generic\$D\propform.obj \
- ..\generic\$D\proplist.obj \
- ..\generic\$D\sashwin.obj \
- ..\generic\$D\scrolwin.obj \
- ..\generic\$D\splitter.obj \
- ..\generic\$D\statusbr.obj \
- ..\generic\$D\tabg.obj \
- ..\generic\$D\textdlgg.obj
-
-# ..\generic\$D\imaglist.obj \
-# ..\generic\$D\treectrl.obj \
-# ..\generic\$D\listctrl.obj \
-# ..\generic\$D\notebook.obj \
+{..\html}.cpp{..\html\$D}.obj:
+ cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $<
+<<
+
+GENERICOBJS= ..\generic\$D\busyinfo.obj \
+ ..\generic\$D\calctrl.obj \
+ ..\generic\$D\choicdgg.obj \
+ ..\generic\$D\grid.obj \
+ ..\generic\$D\laywin.obj \
+ ..\generic\$D\logg.obj \
+ ..\generic\$D\numdlgg.obj \
+ ..\generic\$D\panelg.obj \
+ ..\generic\$D\plot.obj \
+ ..\generic\$D\progdlgg.obj \
+ ..\generic\$D\prop.obj \
+ ..\generic\$D\propform.obj \
+ ..\generic\$D\proplist.obj \
+ ..\generic\$D\sashwin.obj \
+ ..\generic\$D\scrolwin.obj \
+ ..\generic\$D\splitter.obj \
+ ..\generic\$D\statusbr.obj \
+ ..\generic\$D\tbarsmpl.obj \
+ ..\generic\$D\textdlgg.obj \
+ ..\generic\$D\tipdlg.obj \
+ ..\generic\$D\wizard.obj
# These are generic things that don't need to be compiled on MSW,
# but sometimes it's useful to do so for testing purposes.
-NONESSENTIALOBJS= \
- ..\generic\$D\printps.obj \
- ..\generic\$D\prntdlgg.obj \
- ..\generic\$D\msgdlgg.obj \
- ..\generic\$D\helpxlp.obj \
- ..\generic\$D\colrdlgg.obj \
- ..\generic\$D\fontdlgg.obj
+NONESSENTIALOBJS= ..\generic\$D\caret.obj \
+ ..\generic\$D\colrdlgg.obj \
+ ..\generic\$D\dcpsg.obj \
+ ..\generic\$D\dirdlgg.obj \
+ ..\generic\$D\filedlgg.obj \
+ ..\generic\$D\fontdlgg.obj \
+ ..\generic\$D\helpext.obj \
+ ..\generic\$D\helphtml.obj \
+ ..\generic\$D\helpwxht.obj \
+ ..\generic\$D\helpxlp.obj \
+ ..\generic\$D\imaglist.obj \
+ ..\generic\$D\listctrl.obj \
+ ..\generic\$D\msgdlgg.obj \
+ ..\generic\$D\notebook.obj \
+ ..\generic\$D\printps.obj \
+ ..\generic\$D\prntdlgg.obj \
+ ..\generic\$D\statline.obj \
+ ..\generic\$D\tabg.obj \
+ ..\generic\$D\treectrl.obj
COMMONOBJS = \
- ..\common\$D\cmndata.obj \
- ..\common\$D\config.obj \
- ..\common\$D\db.obj \
- ..\common\$D\dbtable.obj \
- ..\common\$D\docview.obj \
- ..\common\$D\docmdi.obj \
- ..\common\$D\dynarray.obj \
- ..\common\$D\dynlib.obj \
- ..\common\$D\event.obj \
- ..\common\$D\file.obj \
- ..\common\$D\filefn.obj \
- ..\common\$D\fileconf.obj \
- ..\common\$D\framecmn.obj \
- ..\common\$D\ftp.obj \
- ..\common\$D\gdicmn.obj \
- ..\common\$D\image.obj \
- ..\common\$D\intl.obj \
- ..\common\$D\ipcbase.obj \
- ..\common\$D\helpbase.obj \
- ..\common\$D\layout.obj \
- ..\common\$D\log.obj \
- ..\common\$D\memory.obj \
- ..\common\$D\mimetype.obj \
- ..\common\$D\module.obj \
- ..\common\$D\odbc.obj \
- ..\common\$D\object.obj \
- ..\common\$D\prntbase.obj \
- ..\common\$D\resource.obj \
- ..\common\$D\tbarbase.obj \
- ..\common\$D\tbarsmpl.obj \
- ..\common\$D\textfile.obj \
- ..\common\$D\timercmn.obj \
- ..\common\$D\utilscmn.obj \
- ..\common\$D\validate.obj \
- ..\common\$D\valgen.obj \
- ..\common\$D\valtext.obj \
- ..\common\$D\date.obj \
- ..\common\$D\hash.obj \
- ..\common\$D\list.obj \
- ..\common\$D\string.obj \
- ..\common\$D\socket.obj \
- ..\common\$D\sckaddr.obj \
- ..\common\$D\sckfile.obj \
- ..\common\$D\sckipc.obj \
- ..\common\$D\sckstrm.obj \
- ..\common\$D\url.obj \
- ..\common\$D\http.obj \
- ..\common\$D\protocol.obj \
- ..\common\$D\time.obj \
- ..\common\$D\tokenzr.obj \
- ..\common\$D\wxexpr.obj \
- ..\common\$D\y_tab.obj \
- ..\common\$D\extended.obj \
- ..\common\$D\process.obj \
- ..\common\$D\wfstream.obj \
- ..\common\$D\mstream.obj \
- ..\common\$D\zstream.obj \
- ..\common\$D\stream.obj \
- ..\common\$D\datstrm.obj \
- ..\common\$D\objstrm.obj \
- ..\common\$D\variant.obj \
- ..\common\$D\wincmn.obj
-
-MSWOBJS = \
- ..\msw\$D\accel.obj \
- ..\msw\$D\app.obj \
- ..\msw\$D\bitmap.obj \
- ..\msw\$D\bmpbuttn.obj \
- ..\msw\$D\brush.obj \
- ..\msw\$D\button.obj \
- ..\msw\$D\checkbox.obj \
- ..\msw\$D\checklst.obj \
- ..\msw\$D\choice.obj \
- ..\msw\$D\clipbrd.obj \
- ..\msw\$D\colordlg.obj \
- ..\msw\$D\colour.obj \
- ..\msw\$D\combobox.obj \
- ..\msw\$D\control.obj \
- ..\msw\$D\curico.obj \
- ..\msw\$D\cursor.obj \
- ..\msw\$D\data.obj \
- ..\msw\$D\dc.obj \
- ..\msw\$D\dcmemory.obj \
- ..\msw\$D\dcclient.obj \
- ..\msw\$D\dcprint.obj \
- ..\msw\$D\dcscreen.obj \
- ..\msw\$D\dde.obj \
- ..\msw\$D\dialog.obj \
- ..\msw\$D\dib.obj \
- ..\msw\$D\dibutils.obj \
- ..\msw\$D\dirdlg.obj \
- ..\msw\$D\filedlg.obj \
- ..\msw\$D\font.obj \
- ..\msw\$D\fontdlg.obj \
- ..\msw\$D\frame.obj \
- ..\msw\$D\gauge95.obj \
- ..\msw\$D\gaugemsw.obj \
- ..\msw\$D\gdiobj.obj \
- ..\msw\$D\helpwin.obj \
- ..\msw\$D\icon.obj \
- ..\msw\$D\iniconf.obj \
- ..\msw\$D\joystick.obj \
- ..\msw\$D\imaglist.obj \
- ..\msw\$D\listbox.obj \
- ..\msw\$D\listctrl.obj \
- ..\msw\$D\main.obj \
- ..\msw\$D\mdi.obj \
- ..\msw\$D\menu.obj \
- ..\msw\$D\menuitem.obj \
- ..\msw\$D\metafile.obj \
- ..\msw\$D\minifram.obj \
- ..\msw\$D\msgdlg.obj \
- ..\msw\$D\nativdlg.obj \
- ..\msw\$D\notebook.obj \
- ..\msw\$D\ownerdrw.obj \
- ..\msw\$D\palette.obj \
- ..\msw\$D\pen.obj \
- ..\msw\$D\penwin.obj \
- ..\msw\$D\pnghand.obj \
- ..\msw\$D\printdlg.obj \
- ..\msw\$D\printwin.obj \
- ..\msw\$D\radiobox.obj \
- ..\msw\$D\radiobut.obj \
- ..\msw\$D\region.obj \
- ..\msw\$D\registry.obj \
- ..\msw\$D\regconf.obj \
- ..\msw\$D\scrolbar.obj \
- ..\msw\$D\settings.obj \
- ..\msw\$D\slidrmsw.obj \
- ..\msw\$D\slider95.obj \
- ..\msw\$D\spinbutt.obj \
- ..\msw\$D\statbmp.obj \
- ..\msw\$D\statbox.obj \
- ..\msw\$D\statbr95.obj \
- ..\msw\$D\stattext.obj \
- ..\msw\$D\tabctrl.obj \
- ..\msw\$D\taskbar.obj \
- ..\msw\$D\tbar95.obj \
- ..\msw\$D\tbarmsw.obj \
- ..\msw\$D\textctrl.obj \
- ..\msw\$D\thread.obj \
- ..\msw\$D\timer.obj \
- ..\msw\$D\tooltip.obj \
- ..\msw\$D\treectrl.obj \
- ..\msw\$D\utils.obj \
- ..\msw\$D\utilsexc.obj \
- ..\msw\ole\$D\uuid.obj \
- ..\msw\$D\wave.obj \
- ..\msw\$D\window.obj \
- ..\msw\$D\xpmhand.obj \
- ..\msw\ole\$D\dataobj.obj \
- ..\msw\ole\$D\automtn.obj \
- ..\msw\ole\$D\droptgt.obj \
- ..\msw\ole\$D\dropsrc.obj \
- ..\msw\ole\$D\oleutils.obj
+ ..\common\$D\y_tab.obj \
+ ..\common\$D\appcmn.obj \
+ ..\common\$D\choiccmn.obj \
+ ..\common\$D\clipcmn.obj \
+ ..\common\$D\cmdline.obj \
+ ..\common\$D\cmndata.obj \
+ ..\common\$D\config.obj \
+ ..\common\$D\ctrlcmn.obj \
+ ..\common\$D\ctrlsub.obj \
+ ..\common\$D\datetime.obj \
+ ..\common\$D\datstrm.obj \
+ ..\common\$D\db.obj \
+ ..\common\$D\dbtable.obj \
+ ..\common\$D\dcbase.obj \
+ ..\common\$D\dlgcmn.obj \
+ ..\common\$D\dobjcmn.obj \
+ ..\common\$D\docmdi.obj \
+ ..\common\$D\docview.obj \
+ ..\common\$D\dynarray.obj \
+ ..\common\$D\dynlib.obj \
+ ..\common\$D\encconv.obj \
+ ..\common\$D\event.obj \
+ ..\common\$D\extended.obj \
+ ..\common\$D\ffile.obj \
+ ..\common\$D\file.obj \
+ ..\common\$D\fileconf.obj \
+ ..\common\$D\filefn.obj \
+ ..\common\$D\filesys.obj \
+ ..\common\$D\fontcmn.obj \
+ ..\common\$D\fontmap.obj \
+ ..\common\$D\framecmn.obj \
+ ..\common\$D\fs_inet.obj \
+ ..\common\$D\fs_zip.obj \
+ ..\common\$D\ftp.obj \
+ ..\common\$D\gdicmn.obj \
+ ..\common\$D\gifdecod.obj \
+ ..\common\$D\hash.obj \
+ ..\common\$D\helpbase.obj \
+ ..\common\$D\http.obj \
+ ..\common\$D\imagall.obj \
+ ..\common\$D\imagbmp.obj \
+ ..\common\$D\image.obj \
+ ..\common\$D\imaggif.obj \
+ ..\common\$D\imagjpeg.obj \
+ ..\common\$D\imagpcx.obj \
+ ..\common\$D\imagpng.obj \
+ ..\common\$D\imagpnm.obj \
+ ..\common\$D\imagtiff.obj \
+ ..\common\$D\intl.obj \
+ ..\common\$D\ipcbase.obj \
+ ..\common\$D\layout.obj \
+ ..\common\$D\lboxcmn.obj \
+ ..\common\$D\list.obj \
+ ..\common\$D\log.obj \
+ ..\common\$D\longlong.obj \
+ ..\common\$D\memory.obj \
+ ..\common\$D\menucmn.obj \
+ ..\common\$D\mimecmn.obj \
+ ..\common\$D\module.obj \
+ ..\common\$D\mstream.obj \
+ ..\common\$D\object.obj \
+ ..\common\$D\objstrm.obj \
+ ..\common\$D\odbc.obj \
+ ..\common\$D\paper.obj \
+ ..\common\$D\prntbase.obj \
+ ..\common\$D\process.obj \
+ ..\common\$D\protocol.obj \
+ ..\common\$D\resource.obj \
+ ..\common\$D\sckaddr.obj \
+ ..\common\$D\sckfile.obj \
+ ..\common\$D\sckipc.obj \
+ ..\common\$D\sckstrm.obj \
+ ..\common\$D\serbase.obj \
+ ..\common\$D\sizer.obj \
+ ..\common\$D\socket.obj \
+ ..\common\$D\strconv.obj \
+ ..\common\$D\stream.obj \
+ ..\common\$D\string.obj \
+ ..\common\$D\tbarbase.obj \
+ ..\common\$D\textcmn.obj \
+ ..\common\$D\textfile.obj \
+ ..\common\$D\timercmn.obj \
+ ..\common\$D\tokenzr.obj \
+ ..\common\$D\txtstrm.obj \
+ ..\common\$D\unzip.obj \
+ ..\common\$D\url.obj \
+ ..\common\$D\utilscmn.obj \
+ ..\common\$D\valgen.obj \
+ ..\common\$D\validate.obj \
+ ..\common\$D\valtext.obj \
+ ..\common\$D\variant.obj \
+ ..\common\$D\wfstream.obj \
+ ..\common\$D\wincmn.obj \
+ ..\common\$D\wxchar.obj \
+ ..\common\$D\wxexpr.obj \
+ ..\common\$D\zipstrm.obj \
+ ..\common\$D\zstream.obj
+
+MSWOBJS = ..\msw\$D\accel.obj \
+ ..\msw\$D\app.obj \
+ ..\msw\ole\$D\automtn.obj \
+ ..\msw\$D\bitmap.obj \
+ ..\msw\$D\bmpbuttn.obj \
+ ..\msw\$D\brush.obj \
+ ..\msw\$D\button.obj \
+ ..\msw\$D\caret.obj \
+ ..\msw\$D\checkbox.obj \
+ ..\msw\$D\checklst.obj \
+ ..\msw\$D\choice.obj \
+ ..\msw\$D\clipbrd.obj \
+ ..\msw\$D\colordlg.obj \
+ ..\msw\$D\colour.obj \
+ ..\msw\$D\combobox.obj \
+ ..\msw\$D\control.obj \
+ ..\msw\$D\curico.obj \
+ ..\msw\$D\cursor.obj \
+ ..\msw\$D\data.obj \
+ ..\msw\ole\$D\dataobj.obj \
+ ..\msw\$D\dc.obj \
+ ..\msw\$D\dcclient.obj \
+ ..\msw\$D\dcmemory.obj \
+ ..\msw\$D\dcprint.obj \
+ ..\msw\$D\dcscreen.obj \
+ ..\msw\$D\dde.obj \
+ ..\msw\$D\dialog.obj \
+ ..\msw\$D\dialup.obj \
+ ..\msw\$D\dib.obj \
+ ..\msw\$D\dibutils.obj \
+ ..\msw\$D\dir.obj \
+ ..\msw\$D\dirdlg.obj \
+ ..\msw\$D\dragimag.obj \
+ ..\msw\ole\$D\dropsrc.obj \
+ ..\msw\ole\$D\droptgt.obj \
+ ..\msw\$D\enhmeta.obj \
+ ..\msw\$D\filedlg.obj \
+ ..\msw\$D\font.obj \
+ ..\msw\$D\fontdlg.obj \
+ ..\msw\$D\fontenum.obj \
+ ..\msw\$D\fontutil.obj \
+ ..\msw\$D\frame.obj \
+ ..\msw\$D\gauge95.obj \
+ ..\msw\$D\gdiimage.obj \
+ ..\msw\$D\gdiobj.obj \
+ ..\msw\$D\gsocket.obj \
+ ..\msw\$D\helpwin.obj \
+ ..\msw\$D\icon.obj \
+ ..\msw\$D\imaglist.obj \
+ ..\msw\$D\joystick.obj \
+ ..\msw\$D\listbox.obj \
+ ..\msw\$D\listctrl.obj \
+ ..\msw\$D\main.obj \
+ ..\msw\$D\mdi.obj \
+ ..\msw\$D\menu.obj \
+ ..\msw\$D\menuitem.obj \
+ ..\msw\$D\metafile.obj \
+ ..\msw\$D\mimetype.obj \
+ ..\msw\$D\minifram.obj \
+ ..\msw\$D\msgdlg.obj \
+ ..\msw\$D\nativdlg.obj \
+ ..\msw\$D\notebook.obj \
+ ..\msw\ole\$D\oleutils.obj \
+ ..\msw\$D\ownerdrw.obj \
+ ..\msw\$D\palette.obj \
+ ..\msw\$D\pen.obj \
+ ..\msw\$D\penwin.obj \
+ ..\msw\$D\printdlg.obj \
+ ..\msw\$D\printwin.obj \
+ ..\msw\$D\radiobox.obj \
+ ..\msw\$D\radiobut.obj \
+ ..\msw\$D\regconf.obj \
+ ..\msw\$D\region.obj \
+ ..\msw\$D\registry.obj \
+ ..\msw\$D\scrolbar.obj \
+ ..\msw\$D\settings.obj \
+ ..\msw\$D\slider95.obj \
+ ..\msw\$D\spinbutt.obj \
+ ..\msw\$D\spinctrl.obj \
+ ..\msw\$D\statbmp.obj \
+ ..\msw\$D\statbox.obj \
+ ..\msw\$D\statbr95.obj \
+ ..\msw\$D\statline.obj \
+ ..\msw\$D\stattext.obj \
+ ..\msw\$D\tabctrl.obj \
+ ..\msw\$D\taskbar.obj \
+ ..\msw\$D\tbar95.obj \
+ ..\msw\$D\textctrl.obj \
+ ..\msw\$D\thread.obj \
+ ..\msw\$D\timer.obj \
+ ..\msw\$D\tooltip.obj \
+ ..\msw\$D\treectrl.obj \
+ ..\msw\$D\utils.obj \
+ ..\msw\$D\utilsexc.obj \
+ ..\msw\ole\$D\uuid.obj \
+ ..\msw\$D\wave.obj \
+ ..\msw\$D\window.obj \
+ ..\msw\$D\xpmhand.obj
+
+HTMLOBJS = ..\html\$D\helpctrl.obj \
+ ..\html\$D\helpdata.obj \
+ ..\html\$D\helpfrm.obj \
+ ..\html\$D\htmlcell.obj \
+ ..\html\$D\htmlfilt.obj \
+ ..\html\$D\htmlpars.obj \
+ ..\html\$D\htmltag.obj \
+ ..\html\$D\htmlwin.obj \
+ ..\html\$D\htmprint.obj \
+ ..\html\$D\m_dflist.obj \
+ ..\html\$D\m_fonts.obj \
+ ..\html\$D\m_hline.obj \
+ ..\html\$D\m_image.obj \
+ ..\html\$D\m_layout.obj \
+ ..\html\$D\m_links.obj \
+ ..\html\$D\m_list.obj \
+ ..\html\$D\m_meta.obj \
+ ..\html\$D\m_pre.obj \
+ ..\html\$D\m_tables.obj \
+ ..\html\$D\winpars.obj
+
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+# Add $(HTMLOBJS) if wanting wxHTML classes
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
# Normal, static library
-all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm $(LIBTARGET)
+all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
+
+dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
-dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D
test: $(MSWDIR)\$D\wave.obj
test2: ..\common\Debug\config.obj
$(OLEDIR)\$D:
mkdir $(OLEDIR)\$D
+$(HTMLDIR)\$D:
+ mkdir $(HTMLDIR)\$D
+
# wxWindows library as DLL
dll:
- nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1
+ nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
cleandll:
- nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1
+ nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
# wxWindows + app as DLL. Only affects main.cpp.
dllapp:
# In fact headers are compiled differently depending on whether a DLL is being made
# or an app is calling the DLL exported functionality (WXDLLEXPORT is different
# in each case) so you couldn't use the same PCH.
-pch:
- nmake -f makefile.vc pch1 WXUSINGDLL=1 FINAL=$(FINAL)
+pch:
+ nmake -f makefile.vc pch1 WXUSINGDLL=1 FINAL=$(FINAL) NEW_WXLIBNAME=$(NEW_WXLIBNAME)
pch1: dirs $(DUMMYOBJ)
echo $(DUMMYOBJ)
<<
# Update the dynamic link library
-$(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(WXDIR)\lib\$(WXLIBNAME).lib
+$(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
$(link) @<<
$(LINKFLAGS)
-out:$(WXDIR)\lib\$(WXLIBNAME).dll
- $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib
+ $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib
<<
!endif
<<
# If taking wxWindows from CVS, setup.h doesn't exist yet.
-$(WXDIR)\include\wx\msw\setup.h: $(WXDIR)\include\wx\msw\setup0.h
- -copy "$(WXDIR)"\include\wx\msw\setup.h "$(WXDIR)"\include\wx\msw\setup.bak
- if not exist "$(WXDIR)"\include\wx\msw\setup.h copy "$(WXDIR)"\include\wx\msw\setup0.h "$(WXDIR)"\include\wx\msw\setup.h
+# Actually the 'if not exist setup.h' test doesn't work
+# (copies the file anyway)
+# we'll have to comment this rule out.
-..\common\$D\extended.obj: ..\common\extended.c
- cl @<<
-$(CPPFLAGS2) /c $(COMMDIR)\extended.c /Fo$@
-<<
+# $(WXDIR)\include\wx\msw\setup.h: $(WXDIR)\include\wx\msw\setup0.h
+# cd "$(WXDIR)"\include\wx\msw
+# if not exist setup.h copy setup0.h setup.h
+# cd "$(WXDIR)"\src\msw
..\common\$D\y_tab.obj: ..\common\y_tab.c ..\common\lex_yy.c
cl @<<
$(OBJECTS): $(WXDIR)/include/wx/setup.h
+..\common\$D\unzip.obj: ..\common\unzip.c
+ cl @<<
+$(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@
+<<
+
# Peripheral components
png:
cd $(WXDIR)\src\png
- nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+ nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
cd $(WXDIR)\src\msw
clean_png:
zlib:
cd $(WXDIR)\src\zlib
- nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+ nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
cd $(WXDIR)\src\msw
clean_zlib:
nmake -f makefile.vc clean
cd $(WXDIR)\src\msw
+jpeg:
+ cd $(WXDIR)\src\jpeg
+ nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all
+ cd $(WXDIR)\src\msw
+
+clean_jpeg:
+ cd $(WXDIR)\src\jpeg
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\src\msw
+
+tiff:
+ cd $(WXDIR)\src\tiff
+ nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all
+ cd $(WXDIR)\src\msw
+
+clean_tiff:
+ cd $(WXDIR)\src\tiff
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\src\msw
+
xpm:
cd $(WXDIR)\src\xpm
- nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+ nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
cd $(WXDIR)\src\msw
clean_xpm:
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\src\msw
-clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm
+clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg clean_tiff
-erase $(LIBTARGET)
-erase $(WXDIR)\lib\$(WXLIBNAME).pdb
- -erase ..\..\lib\wx200.dll
- -erase ..\..\lib\wx200.lib
- -erase ..\..\lib\wx200.exp
- -erase ..\..\lib\wx200.pdb
- -erase ..\..\lib\wx200.ilk
+ -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
+ -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
+ -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
+ -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).pdb
+ -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).ilk
-erase *.pdb
-erase *.sbr
-erase $(WXLIBNAME).pch
-erase $(OLEDIR)\$D\*.obj
-erase $(OLEDIR)\$D\*.sbr
-erase $(OLEDIR)\$D\*.pdb
+ -erase $(HTMLDIR)\$D\*.obj
+ -erase $(HTMLDIR)\$D\*.sbr
+ -erase $(HTMLDIR)\$D\*.pdb
-rmdir $(D)
-rmdir ole\$(D)
-rmdir ..\generic\$(D)
-rmdir ..\common\$(D)
+ -rmdir ..\html\$(D)
cleanall: clean
# Making documents
docs: allhlp allhtml allpdfrtf
alldocs: docs
-hlp: wxhlp portinghlp # faqhlp
+hlp: wxhlp
wxhlp: $(DOCDIR)/winhelp/wx.hlp
-prophlp: $(DOCDIR)/winhelp/prop.hlp
-faqhlp: $(DOCDIR)/winhelp/faq.hlp
refhlp: $(DOCDIR)/winhelp/techref.hlp
rtf: $(DOCDIR)/winhelp/wx.rtf
-faqrtf: $(DOCDIR)/winhelp/faq.rtf
-proprtf: $(DOCDIR)/winhelp/prop.rtf
pdfrtf: $(DOCDIR)/pdf/wx.rtf
-faqpdfrtf: $(DOCDIR)/pdf/faq.rtf
-proppdfrtf: $(DOCDIR)/pdf/prop.rtf
refpdfrtf: $(DOCDIR)/pdf/techref.rtf
-html: wxhtml # faqhtml
+html: wxhtml
wxhtml: $(DOCDIR)\html\wx\wx.htm
-faqhtml: $(DOCDIR)\html\faq\faq.htm
-prophtml: $(DOCDIR)\html\proplist\prop.htm
-ps: wxps referencps # faqps
+htmlhelp: $(DOCDIR)\html\wx\wx.chm
+ps: wxps referencps
wxps: $(WXDIR)\docs\ps\wx.ps
-propps: $(WXDIR)\docs\ps\prop.ps
-faqps: $(WXDIR)\docs\ps\faq.ps
referencps: $(WXDIR)\docs\ps\referenc.ps
-portinghtml: $(DOCDIR)\html\porting\port.htm
-portingrtf: $(DOCDIR)/winhelp/porting.rtf
-portinghlp: $(DOCDIR)/winhelp/porting.hlp
-portingpdfrtf: $(DOCDIR)/pdf/porting.rtf
-portingps: $(WXDIR)\docs\ps\porting.ps
-
-allhlp: wxhlp portinghlp prop # faqhlp
+allhlp: wxhlp
cd $(WXDIR)\utils\dialoged\src
nmake -f makefile.vc hlp
cd $(THISDIR)
# cd $(WXDIR)\utils\wxgrid\src
# nmake -f makefile.vc hlp
-allhtml: wxhtml portinghtml prophtml # faqhtml
+allhtml: wxhtml
cd $(WXDIR)\utils\dialoged\src
nmake -f makefile.vc html
cd $(THISDIR)
# cd $(WXDIR)\utils\wxtree\src
# nmake -f makefile.vc html
-allps: wxps referencps portingps propps # faqps
+allps: wxps referencps
cd $(WXDIR)\utils\dialoged\src
nmake -f makefile.vc ps
cd $(THISDIR)
-allpdfrtf: pdfrtf portingpdfrtf proppdfrtf # faqpdfrtf
+allpdfrtf: pdfrtf
cd $(WXDIR)\utils\dialoged\src
nmake -f makefile.vc pdfrtf
cd $(THISDIR)
move wx.cnt $(DOCDIR)\winhelp\wx.cnt
cd $(THISDIR)
-$(DOCDIR)/winhelp/porting.hlp: $(DOCDIR)/latex/porting/porting.rtf $(DOCDIR)/latex/porting/porting.hpj
- cd $(DOCDIR)/latex/porting
- -erase porting.ph
- hc porting
- move porting.hlp $(DOCDIR)\winhelp\porting.hlp
- move porting.cnt $(DOCDIR)\winhelp\porting.cnt
- cd $(THISDIR)
-
-$(DOCDIR)/winhelp/faq.hlp: $(DOCDIR)/latex/faq/faq.rtf $(DOCDIR)/latex/faq/faq.hpj
- cd $(DOCDIR)/latex/faq
- -erase faq.ph
- hc faq
- move faq.hlp $(DOCDIR)\winhelp\faq.hlp
- move faq.cnt $(DOCDIR)\winhelp\faq.cnt
- cd $(THISDIR)
-
-$(DOCDIR)/winhelp/prop.hlp: $(DOCDIR)/latex/proplist/prop.rtf $(DOCDIR)/latex/proplist/prop.hpj
- cd $(DOCDIR)/latex/proplist
- -erase prop.ph
- hc prop
- move prop.hlp $(DOCDIR)\winhelp\prop.hlp
- move prop.cnt $(DOCDIR)\winhelp\prop.cnt
- cd $(THISDIR)
-
$(DOCDIR)/winhelp/techref.hlp: $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj
cd $(DOCDIR)/latex/techref
-erase techref.ph
$(DOCDIR)/latex/wx/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
cd $(DOCDIR)\latex\wx
- -start /w tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp
- cd $(THISDIR)
-
-$(DOCDIR)/latex/porting/porting.rtf: $(DOCDIR)/latex/porting/porting.tex
- cd $(DOCDIR)\latex\porting
- -start /w tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/latex/porting/porting.rtf -twice -winhelp
- cd $(THISDIR)
-
-$(DOCDIR)/latex/faq/faq.rtf: $(DOCDIR)/latex/faq/faq.tex
- cd $(DOCDIR)\latex\faq
- -start /w tex2rtf $(DOCDIR)/latex/faq/faq.tex $(DOCDIR)/latex/faq/faq.rtf -twice -winhelp
- cd $(THISDIR)
-
-$(DOCDIR)/latex/proplist/prop.rtf: $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex
- cd $(DOCDIR)\latex\proplist
- -start /w tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/prop.rtf -twice -winhelp
+ -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp
cd $(THISDIR)
$(DOCDIR)/latex/techref/techref.rtf: $(DOCDIR)/latex/techref/techref.tex
cd $(DOCDIR)\latex\techref
- -start /w tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp
+ -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp
cd $(THISDIR)
$(DOCDIR)/pdf/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
cd $(DOCDIR)\latex\wx
- -copy *.bmp *.wmf $(DOCDIR)\pdf
- -start /w tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
- cd $(THISDIR)
-
-$(DOCDIR)/pdf/porting.rtf: $(DOCDIR)/latex/porting/porting.tex
- cd $(DOCDIR)\latex\porting
- -copy *.bmp *.wmf $(DOCDIR)\pdf
- -start /w tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf
- cd $(THISDIR)
-
-$(DOCDIR)/pdf/faq.rtf: $(DOCDIR)/latex/faq/faq.tex
- cd $(DOCDIR)\latex\faq
- -copy *.bmp *.wmf $(DOCDIR)\pdf
- -start /w tex2rtf $(DOCDIR)/latex/faq/faq.tex $(DOCDIR)/pdf/faq.rtf -twice -rtf
- cd $(THISDIR)
-
-$(DOCDIR)/pdf/prop.rtf: $(DOCDIR)/latex/proplist/proplist.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex
- cd $(DOCDIR)\latex\proplist
- -copy *.bmp *.wmf $(DOCDIR)\pdf
- -start /w tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf
+ -copy *.wmf $(DOCDIR)\pdf
+ -copy *.bmp $(DOCDIR)\pdf
+ -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
cd $(THISDIR)
$(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex
cd $(DOCDIR)\latex\techref
- -copy *.bmp *.wmf $(DOCDIR)\pdf
- -start /w tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf
+ -copy *.wmf $(DOCDIR)\pdf
+ -copy *.bmp $(DOCDIR)\pdf
+ -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf
cd $(THISDIR)
$(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
cd $(DOCDIR)\latex\wx
-mkdir $(DOCDIR)\html\wx
- -start /w tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
+ -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
-erase $(DOCDIR)\html\wx\*.con
-erase $(DOCDIR)\html\wx\*.ref
-erase $(DOCDIR)\latex\wx\*.con
-erase $(DOCDIR)\latex\wx\*.ref
cd $(THISDIR)
-$(DOCDIR)\html\porting\port.htm: $(DOCDIR)\latex\porting\porting.tex
- cd $(DOCDIR)\latex\porting
- -mkdir $(DOCDIR)\html\porting
- -start /w tex2rtf $(DOCDIR)\latex\porting\porting.tex $(DOCDIR)\html\porting\port.htm -twice -html
- -erase $(DOCDIR)\html\porting\*.con
- -erase $(DOCDIR)\html\porting\*.ref
- -erase $(DOCDIR)\latex\porting\*.con
- -erase $(DOCDIR)\latex\porting\*.ref
- cd $(THISDIR)
-
-$(DOCDIR)\html\faq\faq.htm: $(DOCDIR)\latex\faq\faq.tex
- cd $(DOCDIR)\latex\faq
- -mkdir $(DOCDIR)\html\faq
- -start /w tex2rtf $(DOCDIR)\latex\faq\faq.tex $(DOCDIR)\html\faq\faq.htm -twice -html
- -erase $(DOCDIR)\html\faq\*.con
- -erase $(DOCDIR)\html\faq\*.ref
- -erase $(DOCDIR)\latex\faq\*.con
- -erase $(DOCDIR)\latex\faq\*.ref
- cd $(THISDIR)
-
-$(DOCDIR)\html\proplist\prop.htm: $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\latex\proplist\body.tex $(DOCDIR)\latex\proplist\classes.tex $(DOCDIR)\latex\proplist\changes.tex
- cd $(DOCDIR)\latex\proplist
- -mkdir $(DOCDIR)\html\proplist
- -start /w tex2rtf $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\html\proplist\prop.htm -twice -html
- -erase $(DOCDIR)\html\proplist\*.con
- -erase $(DOCDIR)\html\proplist\*.ref
- -erase $(DOCDIR)\latex\proplist\*.con
- -erase $(DOCDIR)\latex\proplist\*.ref
- cd $(THISDIR)
+$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
+ cd $(DOCDIR)\html\wx
+ -hhc wx.hhp
+ cd $(THISDIR)
$(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
cd $(WXDIR)\docs\latex\wx
-latex manual
cd $(THISDIR)
-$(WXDIR)\docs\latex\porting\porting.dvi: $(DOCDIR)/latex/porting/porting.tex
- cd $(WXDIR)\docs\latex\porting
- -latex porting
- -latex porting
- -makeindx porting
- -bibtex porting
- -latex porting
- -latex porting
- cd $(THISDIR)
-
$(WXDIR)\docs\ps\wx.ps: $(WXDIR)\docs\latex\wx\manual.dvi
cd $(WXDIR)\docs\latex\wx
-dvips32 -o wx.ps manual
move wx.ps $(WXDIR)\docs\ps\wx.ps
cd $(THISDIR)
-$(WXDIR)\docs\ps\porting.ps: $(WXDIR)\docs\latex\porting\porting.dvi
- cd $(WXDIR)\docs\latex\porting
- -dvips32 -o porting.ps porting
- move porting.ps $(WXDIR)\docs\ps\porting.ps
- cd $(THISDIR)
-
$(WXDIR)\docs\latex\wx\referenc.dvi: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex
cd $(WXDIR)\docs\latex\wx
-latex referenc
move referenc.ps $(WXDIR)\docs\ps\referenc.ps
cd $(THISDIR)
-$(WXDIR)\docs\latex\faq\faq.dvi: $(DOCDIR)/latex/faq/faq.tex
- cd $(WXDIR)\docs\latex\faq
- -latex faq
- -latex faq
- -makeindx faq
- -latex faq
- -latex faq
- cd $(THISDIR)
-
-$(WXDIR)\docs\ps\faq.ps: $(WXDIR)\docs\latex\faq\faq.dvi
- cd $(WXDIR)\docs\latex\faq
- -dvips32 -o faq.ps faq
- move faq.ps $(WXDIR)\docs\ps\faq.ps
- cd $(THISDIR)
-
# In order to force document reprocessing
touchmanual:
-touch $(WXDIR)\docs\latex\wx\manual.tex
# Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
# Office StartUp folder, and PDFMaker should be installed.
updatepdf: # touchmanual pdfrtf
- start /w "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"
+ start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"
+
+
+MFTYPE=vc
+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
projects / wxWidgets.git / blobdiff