patches from Ricky Gonzales <gonzales@pyramid3.net> for BC++ Builder
compilation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
7aa4cce853
commit
c09f28798b
@ -21,6 +21,13 @@
|
||||
$project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " "
|
||||
}
|
||||
|
||||
foreach $file (sort keys %wxHTML) {
|
||||
next if $wxHTML{$file} =~ /\b16\b/;
|
||||
|
||||
$file =~ s/cp?p?$/obj/;
|
||||
$project{"WXHTMLOBJS"} .= "\$(MSWDIR)\\" . $file . " "
|
||||
}
|
||||
|
||||
foreach $file (sort keys %wxCommon) {
|
||||
$isCFile = $file =~ /\.c$/;
|
||||
$file =~ s/cp?p?$/obj/;
|
||||
@ -77,6 +84,7 @@
|
||||
!endif
|
||||
|
||||
WXDIR = $(WXWIN)
|
||||
THISDIR = $(WXDIR)\src\msw
|
||||
|
||||
# Set all these to 1 if you want to build a dynamic library
|
||||
!if "$(DLL)" == "1"
|
||||
@ -124,6 +132,7 @@ LIBTARGET=$(WXLIB)
|
||||
|
||||
GENDIR=..\generic
|
||||
COMMDIR=..\common
|
||||
HTMLDIR=..\html
|
||||
OLEDIR=.\ole
|
||||
MSWDIR=.
|
||||
|
||||
@ -148,7 +157,9 @@ COMMONOBJS = \
|
||||
|
||||
MSWOBJS = #$ ExpandList("WXMSWOBJS");
|
||||
|
||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
|
||||
HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
|
||||
|
||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
||||
|
||||
default: wx
|
||||
|
||||
@ -239,6 +250,20 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
|
||||
}
|
||||
#$}
|
||||
|
||||
########################################################
|
||||
# HTML objects (always compiled)
|
||||
|
||||
#${
|
||||
$_ = $project{"WXHTMLOBJS"};
|
||||
my @objs = split;
|
||||
foreach (@objs) {
|
||||
$text .= $_ . ": ";
|
||||
s/MSWDIR/HTMLDIR/;
|
||||
s/obj$/\$(SRCSUFF)/;
|
||||
$text .= $_ . "\n\n";
|
||||
}
|
||||
#$}
|
||||
|
||||
|
||||
all_utils:
|
||||
cd $(WXDIR)\utils
|
||||
@ -330,12 +355,279 @@ clean: $(PERIPH_CLEAN_TARGET)
|
||||
-erase *.pch
|
||||
-erase *.csm
|
||||
-erase *.cfg
|
||||
-erase "wx32.#??"
|
||||
-erase ..\common\y_tab.c
|
||||
-erase ..\common\lex_yy.c
|
||||
|
||||
cleanall: clean
|
||||
|
||||
|
||||
# Making documents
|
||||
docs: allhlp allhtml allpdfrtf
|
||||
alldocs: docs
|
||||
hlp: wxhlp portinghlp
|
||||
wxhlp: $(DOCDIR)/winhelp/wx.hlp
|
||||
prophlp: $(DOCDIR)/winhelp/prop.hlp
|
||||
refhlp: $(DOCDIR)/winhelp/techref.hlp
|
||||
rtf: $(DOCDIR)/winhelp/wx.rtf
|
||||
proprtf: $(DOCDIR)/winhelp/prop.rtf
|
||||
pdfrtf: $(DOCDIR)/pdf/wx.rtf
|
||||
proppdfrtf: $(DOCDIR)/pdf/prop.rtf
|
||||
refpdfrtf: $(DOCDIR)/pdf/techref.rtf
|
||||
html: wxhtml portinghtml
|
||||
wxhtml: $(DOCDIR)\html\wx\wx.htm
|
||||
htmlhelp: $(DOCDIR)\html\wx\wx.chm
|
||||
prophtml: $(DOCDIR)\html\proplist\prop.htm
|
||||
ps: wxps referencps
|
||||
wxps: $(WXDIR)\docs\ps\wx.ps
|
||||
propps: $(WXDIR)\docs\ps\prop.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 prophlp
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
make -f makefile.b32 hlp
|
||||
cd $(THISDIR)
|
||||
|
||||
# cd $(WXDIR)\utils\wxhelp\src
|
||||
# make -f makefile.b32 hlp
|
||||
# cd $(WXDIR)\utils\tex2rtf\src
|
||||
# make -f makefile.b32 hlp
|
||||
# cd $(WXDIR)\utils\wxgraph\src
|
||||
# make -f makefile.b32 hlp
|
||||
# cd $(WXDIR)\utils\wxchart\src
|
||||
# make -f makefile.b32 hlp
|
||||
# cd $(WXDIR)\utils\wxtree\src
|
||||
# make -f makefile.b32 hlp
|
||||
# cd $(WXDIR)\utils\wxbuild\src
|
||||
# make -f makefile.b32 hlp
|
||||
# cd $(WXDIR)\utils\wxgrid\src
|
||||
# make -f makefile.b32 hlp
|
||||
|
||||
allhtml: wxhtml portinghtml prophtml
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
make -f makefile.b32 html
|
||||
cd $(THISDIR)
|
||||
|
||||
# make -f makefile.b32 html
|
||||
# cd $(WXDIR)\utils\dialoged\src
|
||||
# make -f makefile.b32 html
|
||||
# cd $(WXDIR)\utils\hytext\src
|
||||
# make -f makefile.b32 html
|
||||
# cd $(WXDIR)\utils\wxhelp\src
|
||||
# make -f makefile.b32 html
|
||||
# cd $(WXDIR)\utils\tex2rtf\src
|
||||
# make -f makefile.b32 html
|
||||
# cd $(WXDIR)\utils\wxgraph\src
|
||||
# make -f makefile.b32 html
|
||||
# cd $(WXDIR)\utils\wxchart\src
|
||||
# make -f makefile.b32 html
|
||||
# cd $(WXDIR)\utils\wxtree\src
|
||||
# make -f makefile.b32 html
|
||||
|
||||
allps: wxps referencps portingps propps
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
make -f makefile.b32 ps
|
||||
cd $(THISDIR)
|
||||
|
||||
allpdfrtf: pdfrtf portingpdfrtf proppdfrtf
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
make -f makefile.b32 pdfrtf
|
||||
cd $(THISDIR)
|
||||
|
||||
# cd $(WXDIR)\utils\wxhelp\src
|
||||
# make -f makefile.b32 ps
|
||||
# cd $(WXDIR)\utils\tex2rtf\src
|
||||
# make -f makefile.b32 ps
|
||||
# cd $(WXDIR)\utils\wxgraph\src
|
||||
# make -f makefile.b32 ps
|
||||
# cd $(WXDIR)\utils\wxchart\src
|
||||
# make -f makefile.b32 ps
|
||||
# cd $(WXDIR)\utils\wxtree\src
|
||||
# make -f makefile.b32 ps
|
||||
# cd $(THISDIR)
|
||||
|
||||
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
|
||||
cd $(DOCDIR)/latex/wx
|
||||
-erase wx.ph
|
||||
hc wx
|
||||
move wx.hlp $(DOCDIR)\winhelp\wx.hlp
|
||||
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/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
|
||||
hc techref
|
||||
move techref.hlp $(DOCDIR)\winhelp\techref.hlp
|
||||
move techref.cnt $(DOCDIR)\winhelp\techref.cnt
|
||||
cd $(THISDIR)
|
||||
|
||||
$(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 $(WAITFLAG) 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 $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/latex/porting/porting.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 $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/prop.rtf -twice -winhelp
|
||||
cd $(THISDIR)
|
||||
|
||||
$(DOCDIR)/latex/techref/techref.rtf: $(DOCDIR)/latex/techref/techref.tex
|
||||
cd $(DOCDIR)\latex\techref
|
||||
-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 *.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/porting.rtf: $(DOCDIR)/latex/porting/porting.tex
|
||||
cd $(DOCDIR)\latex\porting
|
||||
-copy *.wmf $(DOCDIR)\pdf
|
||||
-copy *.bmp $(DOCDIR)\pdf
|
||||
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf
|
||||
cd $(THISDIR)
|
||||
|
||||
$(DOCDIR)/pdf/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
|
||||
-copy *.wmf $(DOCDIR)\pdf
|
||||
-copy *.bmp $(DOCDIR)\pdf
|
||||
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf
|
||||
cd $(THISDIR)
|
||||
|
||||
$(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex
|
||||
cd $(DOCDIR)\latex\techref
|
||||
-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 $(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\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
|
||||
cd $(DOCDIR)\html\wx
|
||||
-hhc wx.hhp
|
||||
cd $(THISDIR)
|
||||
|
||||
|
||||
$(DOCDIR)\html\porting\port.htm: $(DOCDIR)\latex\porting\porting.tex
|
||||
cd $(DOCDIR)\latex\porting
|
||||
-mkdir $(DOCDIR)\html\porting
|
||||
-start $(WAITFLAG) 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\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 $(WAITFLAG) 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)
|
||||
|
||||
$(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
|
||||
cd $(WXDIR)\docs\latex\wx
|
||||
-latex manual
|
||||
-latex manual
|
||||
-makeindx manual
|
||||
-bibtex manual
|
||||
-latex manual
|
||||
-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
|
||||
-latex referenc
|
||||
-makeindx referenc
|
||||
-bibtex referenc
|
||||
-latex referenc
|
||||
-latex referenc
|
||||
cd $(THISDIR)
|
||||
|
||||
$(WXDIR)\docs\ps\referenc.ps: $(WXDIR)\docs\latex\wx\referenc.dvi
|
||||
cd $(WXDIR)\docs\latex\wx
|
||||
-dvips32 -o referenc.ps referenc
|
||||
move referenc.ps $(WXDIR)\docs\ps\referenc.ps
|
||||
cd $(THISDIR)
|
||||
|
||||
# In order to force document reprocessing
|
||||
touchmanual:
|
||||
-touch $(WXDIR)\docs\latex\wx\manual.tex
|
||||
|
||||
updatedocs: touchmanual alldocs
|
||||
|
||||
# Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
|
||||
# Office StartUp folder, and PDFMaker should be installed.
|
||||
updatepdf: # touchmanual pdfrtf
|
||||
start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"
|
||||
|
||||
|
||||
MFTYPE=b32
|
||||
# Can't use this or we'll have to distribute all tmake files with wxWindows
|
||||
# makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
|
||||
|
||||
@ -21,6 +21,9 @@
|
||||
#include "gsocket.h"
|
||||
#endif
|
||||
|
||||
#if defined(__BORLANDC__)
|
||||
#include <windows.h>
|
||||
#endif
|
||||
#include <winsock.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@ -402,13 +402,6 @@
|
||||
#define wxUSE_ODBC 0
|
||||
#endif
|
||||
|
||||
// With C++Builder we get lots of doubly-defined symbols
|
||||
// when including both winsock.h and winsock2.h
|
||||
#if defined(__BORLANDC__) && (__BORLANDC__ == 0x530)
|
||||
#undef wxUSE_SOCKETS
|
||||
#undef wxUSE_SOCKETS 0
|
||||
#endif
|
||||
|
||||
#if defined(__WXMSW__) && defined(__WATCOMC__)
|
||||
#undef wxUSE_LIBJPEG
|
||||
#define wxUSE_LIBJPEG 0
|
||||
|
||||
@ -170,9 +170,9 @@ typedef _TUCHAR wxUChar;
|
||||
// wchar_t is available
|
||||
# undef wxUSE_WCHAR_T
|
||||
// This test is for C++Builder
|
||||
#if __BORLANDC__ == 0x530
|
||||
#if __BORLANDC__ >= 0x530
|
||||
# define wxUSE_WCHAR_T 0
|
||||
#elif
|
||||
#else
|
||||
# define wxUSE_WCHAR_T 1
|
||||
# define wxNEED_WCSLEN
|
||||
#endif
|
||||
|
||||
@ -46,7 +46,7 @@
|
||||
// TODO: #define WX_GMTOFF_IN_TM for Windows compilers which have it here
|
||||
|
||||
#if defined(__WIN32__) && !defined(WX_GMTOFF_IN_TM)
|
||||
#include <winbase.h>
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_GETTIMEOFDAY)
|
||||
|
||||
@ -60,6 +60,8 @@ DUMMY=dummy
|
||||
SRCSUFF = cpp
|
||||
OBJSUFF = obj
|
||||
|
||||
WAITFLAG = /w
|
||||
|
||||
.$(SRCSUFF).obj:
|
||||
bcc32 $(CPPFLAGS) -c {$< }
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
# This file was automatically generated by tmake at 14:24, 1999/11/15
|
||||
# This file was automatically generated by tmake at 14:56, 1999/11/15
|
||||
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
|
||||
|
||||
#
|
||||
@ -24,6 +24,7 @@
|
||||
!endif
|
||||
|
||||
WXDIR = $(WXWIN)
|
||||
THISDIR = $(WXDIR)\src\msw
|
||||
|
||||
# Set all these to 1 if you want to build a dynamic library
|
||||
!if "$(DLL)" == "1"
|
||||
@ -71,6 +72,7 @@ LIBTARGET=$(WXLIB)
|
||||
|
||||
GENDIR=..\generic
|
||||
COMMDIR=..\common
|
||||
HTMLDIR=..\html
|
||||
OLEDIR=.\ole
|
||||
MSWDIR=.
|
||||
|
||||
@ -298,7 +300,26 @@ MSWOBJS = $(MSWDIR)\accel.obj \
|
||||
$(MSWDIR)\window.obj \
|
||||
$(MSWDIR)\xpmhand.obj
|
||||
|
||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
|
||||
HTMLOBJS = $(MSWDIR)\helpctrl.obj \
|
||||
$(MSWDIR)\helpdata.obj \
|
||||
$(MSWDIR)\helpfrm.obj \
|
||||
$(MSWDIR)\htmlcell.obj \
|
||||
$(MSWDIR)\htmlfilt.obj \
|
||||
$(MSWDIR)\htmlpars.obj \
|
||||
$(MSWDIR)\htmltag.obj \
|
||||
$(MSWDIR)\htmlwin.obj \
|
||||
$(MSWDIR)\htmprint.obj \
|
||||
$(MSWDIR)\m_fonts.obj \
|
||||
$(MSWDIR)\m_hline.obj \
|
||||
$(MSWDIR)\m_image.obj \
|
||||
$(MSWDIR)\m_layout.obj \
|
||||
$(MSWDIR)\m_links.obj \
|
||||
$(MSWDIR)\m_list.obj \
|
||||
$(MSWDIR)\m_pre.obj \
|
||||
$(MSWDIR)\m_tables.obj \
|
||||
$(MSWDIR)\winpars.obj
|
||||
|
||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
||||
|
||||
default: wx
|
||||
|
||||
@ -772,6 +793,47 @@ $(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
|
||||
|
||||
|
||||
|
||||
########################################################
|
||||
# HTML objects (always compiled)
|
||||
|
||||
$(MSWDIR)\helpctrl.obj: $(HTMLDIR)\helpctrl.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\helpdata.obj: $(HTMLDIR)\helpdata.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\helpfrm.obj: $(HTMLDIR)\helpfrm.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\htmlcell.obj: $(HTMLDIR)\htmlcell.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\htmlfilt.obj: $(HTMLDIR)\htmlfilt.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\htmlpars.obj: $(HTMLDIR)\htmlpars.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\htmltag.obj: $(HTMLDIR)\htmltag.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\htmlwin.obj: $(HTMLDIR)\htmlwin.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\htmprint.obj: $(HTMLDIR)\htmprint.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\m_fonts.obj: $(HTMLDIR)\m_fonts.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\m_hline.obj: $(HTMLDIR)\m_hline.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\m_image.obj: $(HTMLDIR)\m_image.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\m_layout.obj: $(HTMLDIR)\m_layout.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\m_links.obj: $(HTMLDIR)\m_links.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\m_list.obj: $(HTMLDIR)\m_list.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\m_pre.obj: $(HTMLDIR)\m_pre.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\m_tables.obj: $(HTMLDIR)\m_tables.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\winpars.obj: $(HTMLDIR)\winpars.$(SRCSUFF)
|
||||
|
||||
|
||||
|
||||
|
||||
all_utils:
|
||||
cd $(WXDIR)\utils
|
||||
@ -863,12 +925,279 @@ clean: $(PERIPH_CLEAN_TARGET)
|
||||
-erase *.pch
|
||||
-erase *.csm
|
||||
-erase *.cfg
|
||||
-erase "wx32.#??"
|
||||
-erase ..\common\y_tab.c
|
||||
-erase ..\common\lex_yy.c
|
||||
|
||||
cleanall: clean
|
||||
|
||||
|
||||
# Making documents
|
||||
docs: allhlp allhtml allpdfrtf
|
||||
alldocs: docs
|
||||
hlp: wxhlp portinghlp
|
||||
wxhlp: $(DOCDIR)/winhelp/wx.hlp
|
||||
prophlp: $(DOCDIR)/winhelp/prop.hlp
|
||||
refhlp: $(DOCDIR)/winhelp/techref.hlp
|
||||
rtf: $(DOCDIR)/winhelp/wx.rtf
|
||||
proprtf: $(DOCDIR)/winhelp/prop.rtf
|
||||
pdfrtf: $(DOCDIR)/pdf/wx.rtf
|
||||
proppdfrtf: $(DOCDIR)/pdf/prop.rtf
|
||||
refpdfrtf: $(DOCDIR)/pdf/techref.rtf
|
||||
html: wxhtml portinghtml
|
||||
wxhtml: $(DOCDIR)\html\wx\wx.htm
|
||||
htmlhelp: $(DOCDIR)\html\wx\wx.chm
|
||||
prophtml: $(DOCDIR)\html\proplist\prop.htm
|
||||
ps: wxps referencps
|
||||
wxps: $(WXDIR)\docs\ps\wx.ps
|
||||
propps: $(WXDIR)\docs\ps\prop.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 prophlp
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
make -f makefile.b32 hlp
|
||||
cd $(THISDIR)
|
||||
|
||||
# cd $(WXDIR)\utils\wxhelp\src
|
||||
# make -f makefile.b32 hlp
|
||||
# cd $(WXDIR)\utils\tex2rtf\src
|
||||
# make -f makefile.b32 hlp
|
||||
# cd $(WXDIR)\utils\wxgraph\src
|
||||
# make -f makefile.b32 hlp
|
||||
# cd $(WXDIR)\utils\wxchart\src
|
||||
# make -f makefile.b32 hlp
|
||||
# cd $(WXDIR)\utils\wxtree\src
|
||||
# make -f makefile.b32 hlp
|
||||
# cd $(WXDIR)\utils\wxbuild\src
|
||||
# make -f makefile.b32 hlp
|
||||
# cd $(WXDIR)\utils\wxgrid\src
|
||||
# make -f makefile.b32 hlp
|
||||
|
||||
allhtml: wxhtml portinghtml prophtml
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
make -f makefile.b32 html
|
||||
cd $(THISDIR)
|
||||
|
||||
# make -f makefile.b32 html
|
||||
# cd $(WXDIR)\utils\dialoged\src
|
||||
# make -f makefile.b32 html
|
||||
# cd $(WXDIR)\utils\hytext\src
|
||||
# make -f makefile.b32 html
|
||||
# cd $(WXDIR)\utils\wxhelp\src
|
||||
# make -f makefile.b32 html
|
||||
# cd $(WXDIR)\utils\tex2rtf\src
|
||||
# make -f makefile.b32 html
|
||||
# cd $(WXDIR)\utils\wxgraph\src
|
||||
# make -f makefile.b32 html
|
||||
# cd $(WXDIR)\utils\wxchart\src
|
||||
# make -f makefile.b32 html
|
||||
# cd $(WXDIR)\utils\wxtree\src
|
||||
# make -f makefile.b32 html
|
||||
|
||||
allps: wxps referencps portingps propps
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
make -f makefile.b32 ps
|
||||
cd $(THISDIR)
|
||||
|
||||
allpdfrtf: pdfrtf portingpdfrtf proppdfrtf
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
make -f makefile.b32 pdfrtf
|
||||
cd $(THISDIR)
|
||||
|
||||
# cd $(WXDIR)\utils\wxhelp\src
|
||||
# make -f makefile.b32 ps
|
||||
# cd $(WXDIR)\utils\tex2rtf\src
|
||||
# make -f makefile.b32 ps
|
||||
# cd $(WXDIR)\utils\wxgraph\src
|
||||
# make -f makefile.b32 ps
|
||||
# cd $(WXDIR)\utils\wxchart\src
|
||||
# make -f makefile.b32 ps
|
||||
# cd $(WXDIR)\utils\wxtree\src
|
||||
# make -f makefile.b32 ps
|
||||
# cd $(THISDIR)
|
||||
|
||||
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
|
||||
cd $(DOCDIR)/latex/wx
|
||||
-erase wx.ph
|
||||
hc wx
|
||||
move wx.hlp $(DOCDIR)\winhelp\wx.hlp
|
||||
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/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
|
||||
hc techref
|
||||
move techref.hlp $(DOCDIR)\winhelp\techref.hlp
|
||||
move techref.cnt $(DOCDIR)\winhelp\techref.cnt
|
||||
cd $(THISDIR)
|
||||
|
||||
$(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 $(WAITFLAG) 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 $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/latex/porting/porting.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 $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/prop.rtf -twice -winhelp
|
||||
cd $(THISDIR)
|
||||
|
||||
$(DOCDIR)/latex/techref/techref.rtf: $(DOCDIR)/latex/techref/techref.tex
|
||||
cd $(DOCDIR)\latex\techref
|
||||
-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 *.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/porting.rtf: $(DOCDIR)/latex/porting/porting.tex
|
||||
cd $(DOCDIR)\latex\porting
|
||||
-copy *.wmf $(DOCDIR)\pdf
|
||||
-copy *.bmp $(DOCDIR)\pdf
|
||||
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf
|
||||
cd $(THISDIR)
|
||||
|
||||
$(DOCDIR)/pdf/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
|
||||
-copy *.wmf $(DOCDIR)\pdf
|
||||
-copy *.bmp $(DOCDIR)\pdf
|
||||
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf
|
||||
cd $(THISDIR)
|
||||
|
||||
$(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex
|
||||
cd $(DOCDIR)\latex\techref
|
||||
-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 $(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\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
|
||||
cd $(DOCDIR)\html\wx
|
||||
-hhc wx.hhp
|
||||
cd $(THISDIR)
|
||||
|
||||
|
||||
$(DOCDIR)\html\porting\port.htm: $(DOCDIR)\latex\porting\porting.tex
|
||||
cd $(DOCDIR)\latex\porting
|
||||
-mkdir $(DOCDIR)\html\porting
|
||||
-start $(WAITFLAG) 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\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 $(WAITFLAG) 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)
|
||||
|
||||
$(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
|
||||
cd $(WXDIR)\docs\latex\wx
|
||||
-latex manual
|
||||
-latex manual
|
||||
-makeindx manual
|
||||
-bibtex manual
|
||||
-latex manual
|
||||
-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
|
||||
-latex referenc
|
||||
-makeindx referenc
|
||||
-bibtex referenc
|
||||
-latex referenc
|
||||
-latex referenc
|
||||
cd $(THISDIR)
|
||||
|
||||
$(WXDIR)\docs\ps\referenc.ps: $(WXDIR)\docs\latex\wx\referenc.dvi
|
||||
cd $(WXDIR)\docs\latex\wx
|
||||
-dvips32 -o referenc.ps referenc
|
||||
move referenc.ps $(WXDIR)\docs\ps\referenc.ps
|
||||
cd $(THISDIR)
|
||||
|
||||
# In order to force document reprocessing
|
||||
touchmanual:
|
||||
-touch $(WXDIR)\docs\latex\wx\manual.tex
|
||||
|
||||
updatedocs: touchmanual alldocs
|
||||
|
||||
# Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
|
||||
# Office StartUp folder, and PDFMaker should be installed.
|
||||
updatepdf: # touchmanual pdfrtf
|
||||
start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"
|
||||
|
||||
|
||||
MFTYPE=b32
|
||||
# Can't use this or we'll have to distribute all tmake files with wxWindows
|
||||
# makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
|
||||
|
||||
Loading…
Reference in New Issue
Block a user