Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. aapplied patch for bcc makefiles from Ricky Gonzales

Browse Source 
2. regenerated makefiles with tmake


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-03-14 14:57:16 +00:00
parent a1a4396142
commit 8e97b17bbd
19 changed files with 3114 additions and 1830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
distrib/msw/tmake/b32.t
View File

@@ -163,7 +163,7 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
default: wx
wx: $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
wx: $(CFG) $(LNKCFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
all: all_libs all_execs
@@ -357,7 +357,7 @@ $(CFG): makefile.b32
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
-I$(WXDIR)\include\wx\msw\gnuwin32
-L$(BCCDIR)\lib
-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
-D__WXWIN__
-D__WXMSW__
-D__WINDOWS__
@@ -367,6 +367,11 @@ $(DEBUG_FLAGS)
$(WIN95FLAG)
! $(CFG)
$(LNKCFG): makefile.b32
copy &&!
-L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
! $(LNKCFG)
#-I$(WXDIR)\src\common\wxxpm\libxpm.34b\lib
# -Oxt

8
docs/html/i18n.htm
View File

@@ -33,7 +33,7 @@ translations as of wxWindows 2.2.
<tr>
<td valign=center>Czech</td>
<td align=center valign=center><IMG SRC="icons/no.gif" ALT="Not yet"></td>
<td align=center valign=center><A HREF="v.slavik@volny.cz">Vaclav Slavik</A>
<td align=center valign=center><A HREF="mailto:v.slavik@volny.cz">Vaclav Slavik</A>
</td>
</tr>
@@ -54,7 +54,7 @@ translations as of wxWindows 2.2.
<td align=center valign=center><IMG SRC="icons/no.gif" ALT="Not yet"></td>
<td align=center valign=center><A HREF="mailto:Stephane.Junique@optics.kth.se">Stephane Junique</A>,
<A HREF="mailto:lionel.allorge@lunerouge.com">Lionel Allorge</A>
<A HREF="Gilles.Guyot@Krypton.be">Gilles Guyot</A>
<A HREF="mailto:Gilles.Guyot@Krypton.be">Gilles Guyot</A>
</td>
</tr>
@@ -71,7 +71,7 @@ translations as of wxWindows 2.2.
<tr>
<td valign=center>Hungarian</td>
<td align=center valign=center><IMG SRC="icons/no.gif" ALT="Not yet"></td>
<td align=center valign=center><A HREF="janos.vegh@sysdata.siemens.hu">V<EFBFBD>gh J<>nos Dr.</A>
<td align=center valign=center><A HREF="mailto:janos.vegh@sysdata.siemens.hu">V<EFBFBD>gh J<>nos Dr.</A>
</td>
</tr>
@@ -84,7 +84,7 @@ translations as of wxWindows 2.2.
<tr>
<td valign=center>Russian</td>
<td align=center valign=center><IMG SRC="icons/no.gif" ALT="Not yet"></td>
<td align=center valign=center><A HREF="rolinsky@mema.ucl.ac.be">Roman Rolinsky</A>
<td align=center valign=center><A HREF="mailto:rolinsky@mema.ucl.ac.be">Roman Rolinsky</A>
</td>
</tr>

4228
locale/de.po
View File

File diff suppressed because it is too large Load Diff

2
samples/calendar/calendar.cpp
View File

@@ -315,7 +315,7 @@ MyPanel::MyPanel(wxFrame *frame)
wxCAL_SHOW_HOLIDAYS |
wxRAISED_BORDER);
m_calendar->SetAutoLayout(TRUE);
//m_calendar->SetAutoLayout(TRUE);
//------------------
wxLayoutConstraints *c = new wxLayoutConstraints;
//------------------

4
samples/internat/internat.cpp
View File

@@ -114,7 +114,9 @@ bool MyApp::OnInit()
/* this catalog is installed in standard location on Linux systems,
it might not be installed on yours - just ignore the errrors
or comment out this line then */
// m_locale.AddCatalog("fileutils"); // 3) and another just for testing
#ifdef __LINUX__
m_locale.AddCatalog("fileutils"); // 3) and another just for testing
#endif
// Create the main frame window
MyFrame *frame = new MyFrame((wxFrame *) NULL, _("International wxWindows App"),

4
samples/notebook/test.cpp
View File

@@ -43,7 +43,7 @@ bool MyApp::OnInit()
// Quit immediately the dialog has been dismissed
return FALSE;
#else
frame = new MyFrame((wxFrame*) NULL, -1, "Notebook", wxPoint(-1, -1), wxSize(365, 390) );
frame = new MyFrame((wxFrame*) NULL, -1, "Notebook", wxPoint(-1, -1), wxSize(465, 390) );
// Problem with generic wxNotebook implementation whereby it doesn't size properly unless
// you set the size again
@@ -273,8 +273,6 @@ void MyFrame::Init()
c->bottom.SameAs(this, wxBottom);
m_panel->SetConstraints(c);
// Note, omit the wxTAB_STYLE_COLOUR_INTERIOR, so we will guarantee a match
// with the panel background, and save a bit of time.
m_notebook = new wxNotebook(m_panel, ID_NOTEBOOK);
c = new wxLayoutConstraints;

2
src/files.lst
View File

@@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 12:30, 2000/03/04
# This file was automatically generated by tmake at 15:55, 2000/03/14
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T!
ALL_SOURCES = \
common/init.cpp \

2
src/gtk/files.lst
View File

@@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 17:57, 2000/03/03
# This file was automatically generated by tmake at 15:55, 2000/03/14
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
ALL_SOURCES = \
generic/busyinfo.cpp \

2
src/gtk1/files.lst
View File

@@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 17:57, 2000/03/03
# This file was automatically generated by tmake at 15:55, 2000/03/14
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
ALL_SOURCES = \
generic/busyinfo.cpp \

8
src/makeb32.env
View File

@@ -2,14 +2,18 @@
WXDIR = $(WXWIN)
CFG = $(WXDIR)\src\msw\wxwin32.cfg
LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg
WXLIBDIR = $(WXDIR)\lib
WXLIBDIR2 = $(WXDIR)\contrib\lib
WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc
WIN95FLAG = -D__WIN95__ -D__WINDOWS__
# This should be changed to tlink32 if ilink32 is not available
# Available on C++ 5.02 and above
# This should be changed to tlink32 if ilink32 is not available.
# Ilink32 is available on BC++ 5.02 and above, and all
# versions of C++ Builder.
!ifndef LINK
LINK=ilink32
!endif
!ifndef FINAL
FINAL=0

4
src/makeprog.b32
View File

@@ -16,11 +16,11 @@ WXDIR = $(WXWIN)
LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
!if "$(FINAL)" == "0"
LINKFLAGS=/v /c /Tpe /L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
LINKFLAGS=/v /c /Tpe +$(LNKCFG) $(EXTRALINKFLAGS)
OPT = -Od
DEBUG_FLAGS= -v
!else
LINKFLAGS=/Tpe /L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS)
OPT = -Od
DEBUG_FLAGS =
!endif

2
src/motif/files.lst
View File

@@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 17:58, 2000/03/03
# This file was automatically generated by tmake at 15:55, 2000/03/14
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
ALL_SOURCES = \
generic/busyinfo.cpp \

14
src/msw/makefile.b32
View File

@@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 05:31, 2000/03/08
# This file was automatically generated by tmake at 15:55, 2000/03/14
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
#
@@ -262,6 +262,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\gdiobj.obj \
$(MSWDIR)\glcanvas.obj \
$(MSWDIR)\gsocket.obj \
$(MSWDIR)\gsockmsw.obj \
$(MSWDIR)\helpwin.obj \
$(MSWDIR)\icon.obj \
$(MSWDIR)\imaglist.obj \
@@ -340,7 +341,7 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
default: wx
wx: $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
wx: $(CFG) $(LNKCFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
all: all_libs all_execs
@@ -477,6 +478,8 @@ $(MSWDIR)\glcanvas.obj: $(MSWDIR)\glcanvas.$(SRCSUFF)
$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
$(MSWDIR)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c
$(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
$(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
@@ -978,7 +981,7 @@ $(CFG): makefile.b32
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
-I$(WXDIR)\include\wx\msw\gnuwin32
-L$(BCCDIR)\lib
-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
-D__WXWIN__
-D__WXMSW__
-D__WINDOWS__
@@ -988,6 +991,11 @@ $(DEBUG_FLAGS)
$(WIN95FLAG)
! $(CFG)
$(LNKCFG): makefile.b32
copy &&!
-L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
! $(LNKCFG)
#-I$(WXDIR)\src\common\wxxpm\libxpm.34b\lib
# -Oxt

5
src/msw/makefile.bcc
View File

@@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 05:31, 2000/03/08
# This file was automatically generated by tmake at 15:55, 2000/03/14
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
#
@@ -231,6 +231,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\gdiobj.obj \
$(MSWDIR)\glcanvas.obj \
$(MSWDIR)\gsocket.obj \
$(MSWDIR)\gsockmsw.obj \
$(MSWDIR)\helpwin.obj \
$(MSWDIR)\icon.obj \
$(MSWDIR)\iniconf.obj \
@@ -386,6 +387,8 @@ $(MSWDIR)\glcanvas.obj: $(MSWDIR)\glcanvas.$(SRCSUFF)
$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
$(MSWDIR)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c
$(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
$(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)

8
src/msw/makefile.dos
View File

@@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 10:10, 2000/03/07
# This file was automatically generated by tmake at 15:55, 2000/03/14
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
#
@@ -220,6 +220,7 @@ MSWOBJS1 = $(MSWDIR)\accel.obj \
$(MSWDIR)\gdiobj.obj \
$(MSWDIR)\glcanvas.obj \
$(MSWDIR)\gsocket.obj \
$(MSWDIR)\gsockmsw.obj \
$(MSWDIR)\helpwin.obj \
$(MSWDIR)\icon.obj \
$(MSWDIR)\iniconf.obj \
@@ -542,6 +543,11 @@ $(MSWDIR)/gsocket.obj: $*.c
$(CPPFLAGS2) /Fo$@ /c /Tc $*.c
<<
$(MSWDIR)/gsockmsw.obj: $*.c
cl @<<
$(CPPFLAGS2) /Fo$@ /c /Tc $*.c
<<
$(MSWDIR)/helpwin.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)

6
src/msw/makefile.g95
View File

@@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 18:32, 2000/02/17
# This file was automatically generated by tmake at 15:55, 2000/03/14
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
#
@@ -550,9 +550,9 @@ $(OBJECTS): $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
$(COMMDIR)/y_tab.$(OBJSUFF): $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
$(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
$(COMMDIR)/y_tab.c: $(COMMDIR)/dosyacc.c
$(COMMDIR)/y_tab.c: $(COMMDIR)/dosyacc.c
$(COPY) ../common/dosyacc.c ../common/y_tab.c
$(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c
$(COPY) ../common/doslex.c ../common/lex_yy.c

7
src/msw/makefile.sc
View File

@@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 18:32, 2000/02/17
# This file was automatically generated by tmake at 15:55, 2000/03/14
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
# Symantec C++ makefile for the msw objects
@@ -29,7 +29,9 @@ MSWDIR=$(WXDIR)\src\msw
GENERICOBJS= $(GENDIR)\busyinfo.obj \
$(GENDIR)\calctrl.obj \
$(GENDIR)\choicdgg.obj \
$(GENDIR)\dragimgg.obj \
$(GENDIR)\grid.obj \
$(GENDIR)\gridsel.obj \
$(GENDIR)\laywin.obj \
$(GENDIR)\logg.obj \
$(GENDIR)\numdlgg.obj \
@@ -46,6 +48,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
$(GENDIR)\tbarsmpl.obj \
$(GENDIR)\textdlgg.obj \
$(GENDIR)\tipdlg.obj \
$(GENDIR)\treelay.obj \
$(GENDIR)\wizard.obj
COMMONOBJS = \
@@ -196,7 +199,9 @@ MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\gaugemsw.obj \
$(MSWDIR)\gdiimage.obj \
$(MSWDIR)\gdiobj.obj \
$(MSWDIR)\glcanvas.obj \
$(MSWDIR)\gsocket.obj \
$(MSWDIR)\gsockmsw.obj \
$(MSWDIR)\helpwin.obj \
$(MSWDIR)\icon.obj \
$(MSWDIR)\iniconf.obj \

623
src/msw/makefile.vc
View File

@@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 16:52, 2000/02/29
# This file was automatically generated by tmake at 15:55, 2000/03/14
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
# File: makefile.vc
@@ -49,309 +49,310 @@ DOCDIR = $(WXDIR)\docs
HTMLDIR = $(WXDIR)\src\html
{..\generic}.cpp{..\generic\$D}.obj:
cl @<<
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $<
<<
{..\common}.cpp{..\common\$D}.obj:
cl @<<
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $<
<<
{..\common}.c{..\common\$D}.obj:
cl @<<
cl @<<
$(CPPFLAGS2) /Fo$@ /c /Tc $<
<<
{..\msw}.cpp{..\msw\$D}.obj:
cl @<<
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $<
<<
{..\msw}.c{..\msw\$D}.obj:
cl @<<
cl @<<
$(CPPFLAGS2) /Fo$@ /c /Tc $<
<<
{..\msw\ole}.cpp{..\msw\ole\$D}.obj:
cl @<<
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $<
<<
{..\html}.cpp{..\html\$D}.obj:
cl @<<
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $<
<<
GENERICOBJS= ..\generic\$D\busyinfo.obj \
..\generic\$D\calctrl.obj \
..\generic\$D\choicdgg.obj \
..\generic\$D\dragimgg.obj \
..\generic\$D\grid.obj \
..\generic\$D\gridsel.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\treelay.obj \
..\generic\$D\wizard.obj
..\generic\$D\calctrl.obj \
..\generic\$D\choicdgg.obj \
..\generic\$D\dragimgg.obj \
..\generic\$D\grid.obj \
..\generic\$D\gridsel.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\treelay.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\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
..\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\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\dndcmn.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_mem.obj \
..\common\$D\fs_zip.obj \
..\common\$D\ftp.obj \
..\common\$D\gdicmn.obj \
..\common\$D\geometry.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
..\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\dndcmn.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_mem.obj \
..\common\$D\fs_zip.obj \
..\common\$D\ftp.obj \
..\common\$D\gdicmn.obj \
..\common\$D\geometry.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\glcanvas.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
..\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\glcanvas.obj \
..\msw\$D\gsocket.obj \
..\msw\$D\gsockmsw.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
..\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.
@@ -421,8 +422,8 @@ pch1: dirs $(DUMMYOBJ)
### Static library
$(WXDIR)\lib\$(WXLIBNAME).lib: $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS)
-erase $(LIBTARGET)
$(implib) @<<
-erase $(LIBTARGET)
$(implib) @<<
-out:$@
-machine:$(CPU)
$(OBJECTS) $(PERIPH_LIBS)
@@ -445,7 +446,7 @@ $(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 $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.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\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\xpm$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
<<
!endif
@@ -465,58 +466,58 @@ $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
# Compile certain files with no optimization (some files cause a
# compiler crash for buggy versions of VC++, e.g. 4.0)
noopt:
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\datetime.obj /c /Tp $(COMMDIR)\datetime.cpp
<<
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\encconv.obj /c /Tp $(COMMDIR)\encconv.cpp
<<
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\fileconf.obj /c /Tp $(COMMDIR)\fileconf.cpp
<<
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\resource.obj /c /Tp $(COMMDIR)\resource.cpp
<<
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\textfile.obj /c /Tp $(COMMDIR)\textfile.cpp
<<
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\choicdgg.obj /c /Tp $(GENDIR)\choicdgg.cpp
<<
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\grid.obj /c /Tp $(GENDIR)\grid.cpp
<<
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\logg.obj /c /Tp $(GENDIR)\logg.cpp
<<
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\proplist.obj /c /Tp $(GENDIR)\proplist.cpp
<<
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\clipbrd.obj /c /Tp $(MSWDIR)\clipbrd.cpp
<<
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\control.obj /c /Tp $(MSWDIR)\control.cpp
<<
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\listbox.obj /c /Tp $(MSWDIR)\listbox.cpp
<<
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\mdi.obj /c /Tp $(MSWDIR)\mdi.cpp
<<
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\menu.obj /c /Tp $(MSWDIR)\menu.cpp
<<
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\notebook.obj /c /Tp $(MSWDIR)\notebook.cpp
<<
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\tbar95.obj /c /Tp $(MSWDIR)\tbar95.cpp
<<
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\treectrl.obj /c /Tp $(MSWDIR)\treectrl.cpp
<<
cl @<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(HTMLDIR)\$D\helpfrm.obj /c /Tp $(HTMLDIR)\helpfrm.cpp
<<
@@ -541,7 +542,7 @@ $(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
..\common\lex_yy.c: ..\common\doslex.c
copy "..\common"\doslex.c "..\common"\lex_yy.c
$(OBJECTS): $(WXDIR)/include/wx/setup.h
$(OBJECTS): $(WXDIR)/include/wx/setup.h
..\common\$D\unzip.obj: ..\common\unzip.c
cl @<<
@@ -605,14 +606,17 @@ rcparser:
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\src\msw
clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg clean_tiff
-erase $(LIBTARGET)
-erase $(WXDIR)\lib\$(WXLIBNAME).pdb
cleanall: clean_png clean_zlib clean_xpm clean_jpeg clean_tiff
-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
clean: $(PERIPH_CLEAN_TARGET)
-erase $(LIBTARGET)
-erase $(WXDIR)\lib\$(WXLIBNAME).pdb
-erase *.pdb
-erase *.sbr
-erase $(WXLIBNAME).pch
@@ -639,7 +643,6 @@ clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg clean_ti
-rmdir ..\common\$(D)
-rmdir ..\html\$(D)
cleanall: clean
# Making documents
docs: allhlp allhtml allpdfrtf
@@ -650,12 +653,12 @@ refhlp: $(DOCDIR)/winhelp/techref.hlp
rtf: $(DOCDIR)/winhelp/wx.rtf
pdfrtf: $(DOCDIR)/pdf/wx.rtf
refpdfrtf: $(DOCDIR)/pdf/techref.rtf
html: wxhtml
wxhtml: $(DOCDIR)\html\wx\wx.htm
html: wxhtml
wxhtml: $(DOCDIR)\html\wx\wx.htm
htmlhelp: $(DOCDIR)\html\wx\wx.chm
ps: wxps referencps
wxps: $(WXDIR)\docs\ps\wx.ps
referencps: $(WXDIR)\docs\ps\referenc.ps
wxps: $(WXDIR)\docs\ps\wx.ps
referencps: $(WXDIR)\docs\ps\referenc.ps
allhlp: wxhlp
cd $(WXDIR)\utils\dialoged\src
@@ -771,12 +774,12 @@ $(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
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)
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
$(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
@@ -785,14 +788,14 @@ $(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/la
-latex manual
cd $(THISDIR)
$(WXDIR)\docs\ps\wx.ps: $(WXDIR)\docs\latex\wx\manual.dvi
cd $(WXDIR)\docs\latex\wx
$(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\latex\wx\referenc.dvi: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex
cd $(WXDIR)\docs\latex\wx
$(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
@@ -801,8 +804,8 @@ $(WXDIR)\docs\latex\wx\referenc.dvi: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)
-latex referenc
cd $(THISDIR)
$(WXDIR)\docs\ps\referenc.ps: $(WXDIR)\docs\latex\wx\referenc.dvi
cd $(WXDIR)\docs\latex\wx
$(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)
@@ -821,7 +824,7 @@ updatepdf: # touchmanual pdfrtf
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
cd $(WXWIN)\distrib\msw\tmake
tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
copy makefile.$(MFTYPE) $(WXWIN)\src\msw

6
src/msw/makefile.wat
View File

@@ -1,6 +1,6 @@
#!/binb/wmake.exe
# This file was automatically generated by tmake at 05:31, 2000/03/08
# This file was automatically generated by tmake at 15:55, 2000/03/14
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
#
@@ -235,6 +235,7 @@ MSWOBJS = accel.obj &
gdiobj.obj &
glcanvas.obj &
gsocket.obj &
gsockmsw.obj &
helpwin.obj &
icon.obj &
imaglist.obj &
@@ -460,6 +461,9 @@ glcanvas.obj: $(MSWDIR)\glcanvas.cpp
gsocket.obj: $(MSWDIR)\gsocket.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
gsockmsw.obj: $(MSWDIR)\gsockmsw.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
helpwin.obj: $(MSWDIR)\helpwin.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<