Small makefile corrections.
Added test for endianness. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
f61757b17c
commit
239bca2e6d
@ -1051,6 +1051,9 @@ AC_CHECK_SIZEOF(int, 4)
|
|||||||
AC_CHECK_SIZEOF(long, 4)
|
AC_CHECK_SIZEOF(long, 4)
|
||||||
AC_CHECK_SIZEOF(long long, 0)
|
AC_CHECK_SIZEOF(long long, 0)
|
||||||
|
|
||||||
|
dnl for bytesex stuff
|
||||||
|
AC_C_BIGENDIAN
|
||||||
|
|
||||||
dnl check for iostream (as opposed to iostream.h) standard header
|
dnl check for iostream (as opposed to iostream.h) standard header
|
||||||
WX_CPP_NEW_HEADERS(, AC_DEFINE(wxUSE_IOSTREAMH))
|
WX_CPP_NEW_HEADERS(, AC_DEFINE(wxUSE_IOSTREAMH))
|
||||||
|
|
||||||
@ -1160,7 +1163,7 @@ if test "$wxUSE_THREADS" = "yes"; then
|
|||||||
CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
|
CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
|
||||||
|
|
||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
|
||||||
LTLIBOBJS="$LTLIBOBJS $THREADS_OBJ"
|
dnl LTLIBOBJS="$LTLIBOBJS $THREADS_OBJ"
|
||||||
|
|
||||||
dnl define autoconf macro to check for given function in both pthread and
|
dnl define autoconf macro to check for given function in both pthread and
|
||||||
dnl posix4 libraries
|
dnl posix4 libraries
|
||||||
@ -1581,9 +1584,6 @@ if test "$wxUSE_RESOURCES" = "yes" ; then
|
|||||||
if test "$wxUSE_PROLOGIO" = "yes" ; then
|
if test "$wxUSE_PROLOGIO" = "yes" ; then
|
||||||
AC_DEFINE(wxUSE_RESOURCES)
|
AC_DEFINE(wxUSE_RESOURCES)
|
||||||
LTLIBOBJS="$LTLIBOBJS resource.lo"
|
LTLIBOBJS="$LTLIBOBJS resource.lo"
|
||||||
if test "$wxUSE_GTK" = 1; then
|
|
||||||
LTLIBOBJS="$LTLIBOBJS utilsres.lo"
|
|
||||||
fi
|
|
||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
|
||||||
else
|
else
|
||||||
AC_MSG_WARN([wxWindows ressource system requires PrologIO and can't be compiled without it.])
|
AC_MSG_WARN([wxWindows ressource system requires PrologIO and can't be compiled without it.])
|
||||||
|
@ -156,7 +156,6 @@ libwx_gtk2_la_SOURCES = \
|
|||||||
gauge.cpp \
|
gauge.cpp \
|
||||||
gdiobj.cpp \
|
gdiobj.cpp \
|
||||||
icon.cpp \
|
icon.cpp \
|
||||||
joystick.cpp \
|
|
||||||
listbox.cpp \
|
listbox.cpp \
|
||||||
main.cpp \
|
main.cpp \
|
||||||
mdi.cpp \
|
mdi.cpp \
|
||||||
@ -178,8 +177,6 @@ libwx_gtk2_la_SOURCES = \
|
|||||||
stattext.cpp \
|
stattext.cpp \
|
||||||
tbargtk.cpp \
|
tbargtk.cpp \
|
||||||
textctrl.cpp \
|
textctrl.cpp \
|
||||||
threadno.cpp \
|
|
||||||
threadsgi.cpp \
|
|
||||||
timer.cpp \
|
timer.cpp \
|
||||||
tooltip.cpp \
|
tooltip.cpp \
|
||||||
treectrl.cpp \
|
treectrl.cpp \
|
||||||
|
@ -156,7 +156,6 @@ libwx_gtk2_la_SOURCES = \
|
|||||||
gauge.cpp \
|
gauge.cpp \
|
||||||
gdiobj.cpp \
|
gdiobj.cpp \
|
||||||
icon.cpp \
|
icon.cpp \
|
||||||
joystick.cpp \
|
|
||||||
listbox.cpp \
|
listbox.cpp \
|
||||||
main.cpp \
|
main.cpp \
|
||||||
mdi.cpp \
|
mdi.cpp \
|
||||||
@ -178,8 +177,6 @@ libwx_gtk2_la_SOURCES = \
|
|||||||
stattext.cpp \
|
stattext.cpp \
|
||||||
tbargtk.cpp \
|
tbargtk.cpp \
|
||||||
textctrl.cpp \
|
textctrl.cpp \
|
||||||
threadno.cpp \
|
|
||||||
threadsgi.cpp \
|
|
||||||
timer.cpp \
|
timer.cpp \
|
||||||
tooltip.cpp \
|
tooltip.cpp \
|
||||||
treectrl.cpp \
|
treectrl.cpp \
|
||||||
|
Loading…
Reference in New Issue
Block a user