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)

2
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!
#

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 \

15
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
@@ -279,6 +279,7 @@ MSWOBJS = ..\msw\$D\accel.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 \
@@ -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
@@ -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

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) $<