AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1. some (benign) warnings fixed

Browse Source 
2. make dist/install fixes for wxBase


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2000-03-20 18:41:55 +00:00
parent b18cfdd9bd
commit dc3d889d0b
8 changed files with 60 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.in
View File

@ -494,6 +494,12 @@ ALL_DIST: distclean
mkdir $(DISTDIR)/lib mkdir $(DISTDIR)/lib
cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
mkdir $(DISTDIR)/src
mkdir $(DISTDIR)/src/zlib
cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
# this target is the common part of distribution script for all GUI toolkits, # this target is the common part of distribution script for all GUI toolkits,
# but is not used when building wxBase distribution # but is not used when building wxBase distribution
@ -518,7 +524,6 @@ ALL_GUI_DIST: ALL_DIST
cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
mkdir $(DISTDIR)/src
mkdir $(DISTDIR)/src/common mkdir $(DISTDIR)/src/common
mkdir $(DISTDIR)/src/generic mkdir $(DISTDIR)/src/generic
mkdir $(DISTDIR)/src/html mkdir $(DISTDIR)/src/html
@ -527,7 +532,6 @@ ALL_GUI_DIST: ALL_DIST
mkdir $(DISTDIR)/src/png mkdir $(DISTDIR)/src/png
mkdir $(DISTDIR)/src/jpeg mkdir $(DISTDIR)/src/jpeg
mkdir $(DISTDIR)/src/tiff mkdir $(DISTDIR)/src/tiff
mkdir $(DISTDIR)/src/zlib
mkdir $(DISTDIR)/src/iodbc mkdir $(DISTDIR)/src/iodbc
mkdir $(DISTDIR)/src/unix mkdir $(DISTDIR)/src/unix
cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@ cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
@ -549,10 +553,6 @@ ALL_GUI_DIST: ALL_DIST
cp $(PNGDIR)/*.h $(DISTDIR)/src/png cp $(PNGDIR)/*.h $(DISTDIR)/src/png
cp $(PNGDIR)/*.c $(DISTDIR)/src/png cp $(PNGDIR)/*.c $(DISTDIR)/src/png
cp $(PNGDIR)/README $(DISTDIR)/src/png cp $(PNGDIR)/README $(DISTDIR)/src/png
cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
@ -572,7 +572,6 @@ BASE_DIST: ALL_DIST
mkdir $(DISTDIR)/include/wx mkdir $(DISTDIR)/include/wx
mkdir $(DISTDIR)/include/wx/protocol mkdir $(DISTDIR)/include/wx/protocol
mkdir $(DISTDIR)/include/wx/unix mkdir $(DISTDIR)/include/wx/unix
mkdir $(DISTDIR)/src
mkdir $(DISTDIR)/src/common mkdir $(DISTDIR)/src/common
mkdir $(DISTDIR)/src/unix mkdir $(DISTDIR)/src/unix
cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@ cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
@ -584,6 +583,7 @@ BASE_DIST: ALL_DIST
cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
cp $(DOCDIR)/todo.txt $(DISTDIR)/TODO.txt cp $(DOCDIR)/todo.txt $(DISTDIR)/TODO.txt
cp $(SRCDIR)/*.in $(DISTDIR)/src cp $(SRCDIR)/*.in $(DISTDIR)/src
cp $(WXDIR)/src/common/unzip.h $(DISTDIR)/src/common/unzip.h
list='$(HEADERS)'; for p in $$list; do \ list='$(HEADERS)'; for p in $$list; do \
cp $(WXDIR)/include/wx/$$p $(DISTDIR)/include/wx/$$p; \ cp $(WXDIR)/include/wx/$$p $(DISTDIR)/include/wx/$$p; \
done done

38
configure vendored
View File

@ -12973,6 +12973,8 @@ EOF
fi fi
if test "$wxUSE_GUI" = "yes"; then
if test "$TOOLKIT" != "MSW"; then if test "$TOOLKIT" != "MSW"; then
if test "$wxUSE_JOYSTICK" = "yes"; then if test "$wxUSE_JOYSTICK" = "yes"; then
@ -12980,17 +12982,17 @@ if test "$wxUSE_JOYSTICK" = "yes"; then
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:12984: checking for $ac_hdr" >&5 echo "configure:12986: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12989 "configure" #line 12991 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:12994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:12996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@ -13018,7 +13020,7 @@ done
if test "$ac_cv_header_linux_joystick_h" != "yes"; then if test "$ac_cv_header_linux_joystick_h" != "yes"; then
wxUSE_JOYSTICK=no wxUSE_JOYSTICK=no
echo "configure: warning: Joystick not supported yb this system" 1>&2 echo "configure: warning: Joystick not supported by this system" 1>&2
fi fi
fi fi
@ -13032,6 +13034,8 @@ EOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
fi fi
fi
if test "$TOOLKIT" != "MSW"; then if test "$TOOLKIT" != "MSW"; then
@ -13041,12 +13045,12 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
for ac_func in dlopen for ac_func in dlopen
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:13045: checking for $ac_func" >&5 echo "configure:13049: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 13050 "configure" #line 13054 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -13069,7 +13073,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:13073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:13077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -13097,7 +13101,7 @@ EOF
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
echo "configure:13101: checking for dlopen in -ldl" >&5 echo "configure:13105: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -13105,7 +13109,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS" LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 13109 "configure" #line 13113 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -13116,7 +13120,7 @@ int main() {
dlopen() dlopen()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:13120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:13124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -13145,12 +13149,12 @@ else
for ac_func in shl_load for ac_func in shl_load
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:13149: checking for $ac_func" >&5 echo "configure:13153: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 13154 "configure" #line 13158 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -13173,7 +13177,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:13177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:13181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -13408,17 +13412,17 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:13412: checking for $ac_hdr" >&5 echo "configure:13416: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 13417 "configure" #line 13421 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:13422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:13426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@ -13970,7 +13974,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:13974: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo "configure:13978: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6

7
configure.in
View File

@ -3054,6 +3054,8 @@ dnl ---------------------------------------------------------------------------
dnl Joystick support dnl Joystick support
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
if test "$wxUSE_GUI" = "yes"; then
dnl under MSW we always have joystick support dnl under MSW we always have joystick support
if test "$TOOLKIT" != "MSW"; then if test "$TOOLKIT" != "MSW"; then
@ -3062,7 +3064,7 @@ if test "$wxUSE_JOYSTICK" = "yes"; then
AC_CHECK_HEADERS(linux/joystick.h) AC_CHECK_HEADERS(linux/joystick.h)
if test "$ac_cv_header_linux_joystick_h" != "yes"; then if test "$ac_cv_header_linux_joystick_h" != "yes"; then
wxUSE_JOYSTICK=no wxUSE_JOYSTICK=no
AC_MSG_WARN(Joystick not supported yb this system, disabled) AC_MSG_WARN(Joystick not supported by this system, disabled)
fi fi
fi fi
@ -3074,6 +3076,9 @@ if test "$wxUSE_JOYSTICK" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
fi fi
fi
dnl if wxUSE_GUI
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
dnl DLL support dnl DLL support
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------

2
distrib/msw/tmake/base.t
View File

@ -52,7 +52,7 @@
} }
foreach $file (sort keys %wxUNIXINCLUDE) { foreach $file (sort keys %wxUNIXINCLUDE) {
next unless $wxWXINCLUDE{$file} =~ /\bB\b/; next unless $wxUNIXINCLUDE{$file} =~ /\bB\b/;
$project{"BASE_HEADERS"} .= "unix/" . $file . " " $project{"BASE_HEADERS"} .= "unix/" . $file . " "
} }

16
distrib/msw/tmake/filelist.txt
View File

@ -611,7 +611,7 @@ geometry.h W
gifdecod.h W gifdecod.h W
glcanvas.h W glcanvas.h W
grid.h W grid.h W
gsocket.h W gsocket.h W B
hash.h W B hash.h W B
help.h W help.h W
helpbase.h W helpbase.h W
@ -630,7 +630,7 @@ imagjpeg.h W
imaglist.h W imaglist.h W
intl.h W B intl.h W B
ioswrap.h W B ioswrap.h W B
ipcbase.h W ipcbase.h W B
isql.h W isql.h W
isqlext.h W isqlext.h W
joystick.h W joystick.h W
@ -676,9 +676,9 @@ radiobut.h W
region.h W region.h W
resource.h W resource.h W
sashwin.h W sashwin.h W
sckaddr.h W sckaddr.h W B
sckipc.h W sckipc.h W B
sckstrm.h W sckstrm.h W B
scrolbar.h W scrolbar.h W
scrolwin.h W scrolwin.h W
serbase.h W B serbase.h W B
@ -686,7 +686,7 @@ settings.h W
setup.h W B setup.h W B
sizer.h W sizer.h W
slider.h W slider.h W
socket.h W socket.h W B
spinbutt.h W spinbutt.h W
spinctrl.h W spinctrl.h W
splitter.h W splitter.h W
@ -1050,10 +1050,10 @@ dataform.h 2
pnghand.h 2 pnghand.h 2
statbox.h 2 statbox.h 2
fontutil.h S
execute.h S execute.h S
fontutil.h S
gsockunx.h S B
mimetype.h S B mimetype.h S B
gsockunx.h S
file.h P B file.h P B
ftp.h P B ftp.h P B

18
src/files.lst
View File

@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 09:19, 2000/03/15 # This file was automatically generated by tmake at 19:26, 2000/03/20
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T!
ALL_SOURCES = \ ALL_SOURCES = \
common/init.cpp \ common/init.cpp \
@ -23,6 +23,7 @@ ALL_SOURCES = \
common/hash.cpp \ common/hash.cpp \
common/http.cpp \ common/http.cpp \
common/intl.cpp \ common/intl.cpp \
common/ipcbase.cpp \
common/list.cpp \ common/list.cpp \
common/log.cpp \ common/log.cpp \
common/longlong.cpp \ common/longlong.cpp \
@ -55,6 +56,7 @@ ALL_SOURCES = \
common/zipstrm.cpp \ common/zipstrm.cpp \
common/zstream.cpp \ common/zstream.cpp \
unix/dir.cpp \ unix/dir.cpp \
unix/gsocket.c \
unix/mimetype.cpp \ unix/mimetype.cpp \
unix/threadpsx.cpp \ unix/threadpsx.cpp \
unix/utilsunx.cpp unix/utilsunx.cpp
@ -70,6 +72,7 @@ ALL_HEADERS = \
datetime.h \ datetime.h \
datetime.inl \ datetime.inl \
datstrm.h \ datstrm.h \
dde.h \
debug.h \ debug.h \
defs.h \ defs.h \
dir.h \ dir.h \
@ -84,9 +87,11 @@ ALL_HEADERS = \
fs_inet.h \ fs_inet.h \
fs_mem.h \ fs_mem.h \
fs_zip.h \ fs_zip.h \
gsocket.h \
hash.h \ hash.h \
intl.h \ intl.h \
ioswrap.h \ ioswrap.h \
ipcbase.h \
list.h \ list.h \
listimpl.cpp \ listimpl.cpp \
log.h \ log.h \
@ -99,8 +104,12 @@ ALL_HEADERS = \
object.h \ object.h \
objstrm.h \ objstrm.h \
process.h \ process.h \
sckaddr.h \
sckipc.h \
sckstrm.h \
serbase.h \ serbase.h \
setup.h \ setup.h \
socket.h \
strconv.h \ strconv.h \
stream.h \ stream.h \
string.h \ string.h \
@ -120,6 +129,7 @@ ALL_HEADERS = \
wxprec.h \ wxprec.h \
zipstrm.h \ zipstrm.h \
zstream.h \ zstream.h \
unix/gsockunx.h \
unix/mimetype.h \ unix/mimetype.h \
protocol/file.h \ protocol/file.h \
protocol/ftp.h \ protocol/ftp.h \
@ -127,8 +137,6 @@ ALL_HEADERS = \
protocol/protocol.h protocol/protocol.h
BASE_OBJS = \ BASE_OBJS = \
ipcbase.o \
gsocket.o \
init.o \ init.o \
appcmn.o \ appcmn.o \
cmdline.o \ cmdline.o \
@ -151,6 +159,7 @@ BASE_OBJS = \
hash.o \ hash.o \
http.o \ http.o \
intl.o \ intl.o \
ipcbase.o \
list.o \ list.o \
log.o \ log.o \
longlong.o \ longlong.o \
@ -206,6 +215,7 @@ BASE_DEPS = \
hash.d \ hash.d \
http.d \ http.d \
intl.d \ intl.d \
ipcbase.d \
list.d \ list.d \
log.d \ log.d \
longlong.d \ longlong.d \
@ -240,6 +250,7 @@ BASE_DEPS = \
BASE_UNIX_OBJS = \ BASE_UNIX_OBJS = \
dir.o \ dir.o \
gsocket.o \
mimetype.o \ mimetype.o \
threadpsx.o \ threadpsx.o \
utilsunx.o utilsunx.o
@ -267,6 +278,7 @@ BASE_DEPS = \
hash.d \ hash.d \
http.d \ http.d \
intl.d \ intl.d \
ipcbase.d \
list.d \ list.d \
log.d \ log.d \
longlong.d \ longlong.d \

2
src/unix/dir.cpp
View File

@ -115,7 +115,7 @@ wxDirData::~wxDirData()
bool wxDirData::Read(wxString *filename) bool wxDirData::Read(wxString *filename)
{ {
dirent *de; dirent *de = (dirent *)NULL; // just to silent compiler warnings
bool matches = FALSE; bool matches = FALSE;
while ( !matches ) while ( !matches )

2
src/unix/utilsunx.cpp
View File

@ -848,7 +848,7 @@ long wxGetFreeMemory()
#include <signal.h> #include <signal.h>
static void wxFatalSignalHandler(int signal) static void wxFatalSignalHandler(int WXUNUSED(signal))
{ {
if ( wxTheApp ) if ( wxTheApp )
{ {