1. fix for compiling samples with profile info

2. dir.h/.cpp added to the makefiles


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-12-08 15:20:22 +00:00
parent 68874acfed
commit e694c22c31
12 changed files with 343 additions and 297 deletions

View File

@ -1,5 +1,5 @@
#
# This file was automatically generated by tmake at 12:32, 1999/12/07
# This file was automatically generated by tmake at 16:18, 1999/12/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
#
@ -135,6 +135,7 @@ BASE_HEADERS = \
date.h \
debug.h \
defs.h \
dir.h \
dynarray.h \
dynlib.h \
event.h \
@ -208,6 +209,7 @@ WX_HEADERS = \
defs.h \
dialog.h \
dialup.h \
dir.h \
dirdlg.h \
dnd.h \
docmdi.h \
@ -1659,6 +1661,7 @@ MSW_GUIOBJS = \
dialup.o \
dib.o \
dibutils.o \
dir.o \
dragimag.o \
filedlg.o \
font.o \
@ -1750,6 +1753,7 @@ MSW_GUIDEPS = \
dialup.d \
dib.d \
dibutils.d \
dir.d \
dragimag.d \
filedlg.d \
font.d \
@ -1845,6 +1849,7 @@ BASE_OBJS = \
utilscmn.o \
variant.o \
wxchar.o \
dir.o \
threadpsx.o \
utilsunx.o
@ -1881,6 +1886,7 @@ BASE_DEPS = \
utilscmn.d \
variant.d \
wxchar.d \
dir.d \
threadpsx.d \
utilsunx.d
@ -1926,6 +1932,7 @@ HTMLDEPS = \
UNIX_OBJS = \
dialup.o \
dir.o \
fontenum.o \
fontutil.o \
gsocket.o \
@ -1934,6 +1941,7 @@ UNIX_OBJS = \
UNIX_DEPS = \
dialup.d \
dir.d \
fontenum.d \
fontutil.d \
gsocket.d \

551
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -3008,6 +3008,8 @@ EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS | sed 's/ \\+/ /g'`
CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
LDFLAGS="$LDFLAGS $PROFILE"
if test "$wxUSE_GUI" = "yes"; then
dnl TODO add checks that these samples will really compile (i.e. all the
dnl library features they need are present)
@ -3082,7 +3084,8 @@ AC_SUBST(DOCS_SUBDIRS)
AC_SUBST(SAMPLES_SUBDIRS)
AC_SUBST(USER_SUBDIRS)
dnl additional libraries
dnl additional libraries and linker settings
AC_SUBST(LDFLAGS)
AC_SUBST(EXTRA_LIBS)
AC_SUBST(LIBS)
AC_SUBST(LD_LIBS)

View File

@ -219,6 +219,7 @@ dialog.cpp M
dialup.cpp M
dib.cpp M
dibutils.cpp M
dir.cpp M B
dirdlg.cpp M 32
dragimag.cpp M
dropsrc.cpp M O
@ -291,6 +292,7 @@ xpmhand.cpp M
gsocket.c M S
dialup.cpp U
dir.cpp U B
fontenum.cpp U
fontutil.cpp U
threadpsx.cpp U B
@ -469,6 +471,7 @@ debug.h W B
defs.h W B
dialog.h W
dialup.h W
dir.h W B
dirdlg.h W
dnd.h W
docmdi.h W

View File

@ -3,7 +3,8 @@
A wxFile performs raw file I/O. This is a very small class designed to
minimize the overhead of using it - in fact, there is hardly any overhead at
all, but using it brings you automatic error checking and hides differences
between platforms and compilers.
between platforms and compilers. wxFile also automatically closes the file in
its destructor making it unnecessary to worry about forgetting to do it.
\wxheading{Derived from}
@ -82,7 +83,7 @@ fail.
\func{}{wxFile}{\param{int}{ fd}}
Opens a file with the given file descriptor, which has already been opened.
Associates the file with the given file descriptor, which has already been opened.
\wxheading{Parameters}
@ -98,7 +99,7 @@ Opens a file with the given file descriptor, which has already been opened.
Destructor will close the file.
NB: it is not virtual so you should {\it not} derive from wxFile!
NB: it is not virtual so you should use wxFile polymorphically.
\membersection{wxFile::Access}\label{wxfileaccess}
@ -159,7 +160,8 @@ will return TRUE here only if an attempt has been made to read
\func{static bool}{Exists}{\param{const char*}{ filename}}
Returns TRUE if the given name specifies an existing regular file.
Returns TRUE if the given name specifies an existing regular file (not a
directory or a link)
\membersection{wxFile::Flush}\label{wxfileflush}

View File

@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 13:22, 1999/11/24
# This file was automatically generated by tmake at 16:18, 1999/12/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
#
@ -155,6 +155,7 @@ COMMONOBJS = \
$(MSWDIR)\imagpcx.obj \
$(MSWDIR)\imagpng.obj \
$(MSWDIR)\imagpnm.obj \
$(MSWDIR)\imagtiff.obj \
$(MSWDIR)\intl.obj \
$(MSWDIR)\ipcbase.obj \
$(MSWDIR)\layout.obj \
@ -232,8 +233,10 @@ MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\dcscreen.obj \
$(MSWDIR)\dde.obj \
$(MSWDIR)\dialog.obj \
$(MSWDIR)\dialup.obj \
$(MSWDIR)\dib.obj \
$(MSWDIR)\dibutils.obj \
$(MSWDIR)\dir.obj \
$(MSWDIR)\dirdlg.obj \
$(MSWDIR)\dragimag.obj \
$(MSWDIR)\dropsrc.obj \
@ -421,10 +424,14 @@ $(MSWDIR)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF)
$(MSWDIR)\dialog.obj: $(MSWDIR)\dialog.$(SRCSUFF)
$(MSWDIR)\dialup.obj: $(MSWDIR)\dialup.$(SRCSUFF)
$(MSWDIR)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF)
$(MSWDIR)\dibutils.obj: $(MSWDIR)\dibutils.$(SRCSUFF)
$(MSWDIR)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF)
$(MSWDIR)\dirdlg.obj: $(MSWDIR)\dirdlg.$(SRCSUFF)
$(MSWDIR)\dragimag.obj: $(MSWDIR)\dragimag.$(SRCSUFF)
@ -650,6 +657,8 @@ $(MSWDIR)\imagpng.obj: $(COMMDIR)\imagpng.$(SRCSUFF)
$(MSWDIR)\imagpnm.obj: $(COMMDIR)\imagpnm.$(SRCSUFF)
$(MSWDIR)\imagtiff.obj: $(COMMDIR)\imagtiff.$(SRCSUFF)
$(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF)
$(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF)

View File

@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 13:22, 1999/11/24
# This file was automatically generated by tmake at 16:18, 1999/12/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
#
@ -205,8 +205,10 @@ MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\dcscreen.obj \
$(MSWDIR)\dde.obj \
$(MSWDIR)\dialog.obj \
$(MSWDIR)\dialup.obj \
$(MSWDIR)\dib.obj \
$(MSWDIR)\dibutils.obj \
$(MSWDIR)\dir.obj \
$(MSWDIR)\dragimag.obj \
$(MSWDIR)\filedlg.obj \
$(MSWDIR)\font.obj \
@ -341,10 +343,14 @@ $(MSWDIR)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF)
$(MSWDIR)\dialog.obj: $(MSWDIR)\dialog.$(SRCSUFF)
$(MSWDIR)\dialup.obj: $(MSWDIR)\dialup.$(SRCSUFF)
$(MSWDIR)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF)
$(MSWDIR)\dibutils.obj: $(MSWDIR)\dibutils.$(SRCSUFF)
$(MSWDIR)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF)
$(MSWDIR)\dragimag.obj: $(MSWDIR)\dragimag.$(SRCSUFF)
$(MSWDIR)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF)

View File

@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 13:22, 1999/11/24
# This file was automatically generated by tmake at 16:18, 1999/12/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
#
@ -194,8 +194,10 @@ MSWOBJS1 = $(MSWDIR)\accel.obj \
$(MSWDIR)\dcscreen.obj \
$(MSWDIR)\dde.obj \
$(MSWDIR)\dialog.obj \
$(MSWDIR)\dialup.obj \
$(MSWDIR)\dib.obj \
$(MSWDIR)\dibutils.obj \
$(MSWDIR)\dir.obj \
$(MSWDIR)\dragimag.obj \
$(MSWDIR)\filedlg.obj \
$(MSWDIR)\font.obj \
@ -449,6 +451,11 @@ $(MSWDIR)/dialog.obj: $*.$(SRCSUFF)
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(MSWDIR)/dialup.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(MSWDIR)/dib.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@ -459,6 +466,11 @@ $(MSWDIR)/dibutils.obj: $*.$(SRCSUFF)
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(MSWDIR)/dir.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(MSWDIR)/dragimag.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)

View File

@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 13:22, 1999/11/24
# This file was automatically generated by tmake at 16:18, 1999/12/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
#
@ -118,6 +118,7 @@ COMMONOBJS = \
$(COMMDIR)/imagpcx.$(OBJSUFF) \
$(COMMDIR)/imagpng.$(OBJSUFF) \
$(COMMDIR)/imagpnm.$(OBJSUFF) \
$(COMMDIR)/imagtiff.$(OBJSUFF) \
$(COMMDIR)/intl.$(OBJSUFF) \
$(COMMDIR)/ipcbase.$(OBJSUFF) \
$(COMMDIR)/layout.$(OBJSUFF) \
@ -214,8 +215,10 @@ MSWOBJS = \
$(MSWDIR)/dcscreen.$(OBJSUFF) \
$(MSWDIR)/dde.$(OBJSUFF) \
$(MSWDIR)/dialog.$(OBJSUFF) \
$(MSWDIR)/dialup.$(OBJSUFF) \
$(MSWDIR)/dib.$(OBJSUFF) \
$(MSWDIR)/dibutils.$(OBJSUFF) \
$(MSWDIR)/dir.$(OBJSUFF) \
$(MSWDIR)/dragimag.$(OBJSUFF) \
$(MSWDIR)/filedlg.$(OBJSUFF) \
$(MSWDIR)/font.$(OBJSUFF) \

View File

@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 13:22, 1999/11/24
# This file was automatically generated by tmake at 16:18, 1999/12/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
# Symantec C++ makefile for the msw objects
@ -92,6 +92,7 @@ COMMONOBJS = \
$(COMMDIR)\imagpcx.obj \
$(COMMDIR)\imagpng.obj \
$(COMMDIR)\imagpnm.obj \
$(COMMDIR)\imagtiff.obj \
$(COMMDIR)\intl.obj \
$(COMMDIR)\ipcbase.obj \
$(COMMDIR)\layout.obj \
@ -170,8 +171,10 @@ MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\dcscreen.obj \
$(MSWDIR)\dde.obj \
$(MSWDIR)\dialog.obj \
$(MSWDIR)\dialup.obj \
$(MSWDIR)\dib.obj \
$(MSWDIR)\dibutils.obj \
$(MSWDIR)\dir.obj \
$(MSWDIR)\dirdlg.obj \
$(MSWDIR)\dragimag.obj \
$(MSWDIR)\ole\dropsrc.obj \

View File

@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 13:22, 1999/11/24
# This file was automatically generated by tmake at 16:18, 1999/12/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
# File: makefile.vc
@ -170,6 +170,7 @@ COMMONOBJS = \
..\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 \
@ -251,6 +252,7 @@ MSWOBJS = ..\msw\$D\accel.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 \

View File

@ -1,6 +1,6 @@
#!/binb/wmake.exe
# This file was automatically generated by tmake at 13:22, 1999/11/24
# This file was automatically generated by tmake at 16:18, 1999/12/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
#
@ -125,6 +125,7 @@ COMMONOBJS = &
imagpcx.obj &
imagpng.obj &
imagpnm.obj &
imagtiff.obj &
intl.obj &
ipcbase.obj &
layout.obj &
@ -203,8 +204,10 @@ MSWOBJS = accel.obj &
dcscreen.obj &
dde.obj &
dialog.obj &
dialup.obj &
dib.obj &
dibutils.obj &
dir.obj &
dirdlg.obj &
dragimag.obj &
dropsrc.obj &
@ -381,12 +384,18 @@ dde.obj: $(MSWDIR)\dde.cpp
dialog.obj: $(MSWDIR)\dialog.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dialup.obj: $(MSWDIR)\dialup.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dib.obj: $(MSWDIR)\dib.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dibutils.obj: $(MSWDIR)\dibutils.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dir.obj: $(MSWDIR)\dir.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dirdlg.obj: $(MSWDIR)\dirdlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@ -728,6 +737,9 @@ imagpng.obj: $(COMMDIR)\imagpng.cpp
imagpnm.obj: $(COMMDIR)\imagpnm.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
imagtiff.obj: $(COMMDIR)\imagtiff.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
intl.obj: $(COMMDIR)\intl.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<