From 239bca2e6d38f4566e7bc6f93b8119a671f4a7dc Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Thu, 3 Jun 1999 22:14:38 +0000 Subject: [PATCH 1/1] Small makefile corrections. Added test for endianness. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure.in | 8 ++++---- src/gtk/Makefile.am | 3 --- src/gtk1/Makefile.am | 3 --- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/configure.in b/configure.in index 2abbf4a4cf..f5a215647a 100644 --- a/configure.in +++ b/configure.in @@ -1051,6 +1051,9 @@ AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(long, 4) AC_CHECK_SIZEOF(long long, 0) +dnl for bytesex stuff +AC_C_BIGENDIAN + dnl check for iostream (as opposed to iostream.h) standard header WX_CPP_NEW_HEADERS(, AC_DEFINE(wxUSE_IOSTREAMH)) @@ -1160,7 +1163,7 @@ if test "$wxUSE_THREADS" = "yes"; then CXXFLAGS="${CXXFLAGS} -D_REENTRANT" 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 posix4 libraries @@ -1581,9 +1584,6 @@ if test "$wxUSE_RESOURCES" = "yes" ; then if test "$wxUSE_PROLOGIO" = "yes" ; then AC_DEFINE(wxUSE_RESOURCES) LTLIBOBJS="$LTLIBOBJS resource.lo" - if test "$wxUSE_GTK" = 1; then - LTLIBOBJS="$LTLIBOBJS utilsres.lo" - fi SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" else AC_MSG_WARN([wxWindows ressource system requires PrologIO and can't be compiled without it.]) diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am index e9fc7542c5..389a549fa0 100644 --- a/src/gtk/Makefile.am +++ b/src/gtk/Makefile.am @@ -156,7 +156,6 @@ libwx_gtk2_la_SOURCES = \ gauge.cpp \ gdiobj.cpp \ icon.cpp \ - joystick.cpp \ listbox.cpp \ main.cpp \ mdi.cpp \ @@ -178,8 +177,6 @@ libwx_gtk2_la_SOURCES = \ stattext.cpp \ tbargtk.cpp \ textctrl.cpp \ - threadno.cpp \ - threadsgi.cpp \ timer.cpp \ tooltip.cpp \ treectrl.cpp \ diff --git a/src/gtk1/Makefile.am b/src/gtk1/Makefile.am index e9fc7542c5..389a549fa0 100644 --- a/src/gtk1/Makefile.am +++ b/src/gtk1/Makefile.am @@ -156,7 +156,6 @@ libwx_gtk2_la_SOURCES = \ gauge.cpp \ gdiobj.cpp \ icon.cpp \ - joystick.cpp \ listbox.cpp \ main.cpp \ mdi.cpp \ @@ -178,8 +177,6 @@ libwx_gtk2_la_SOURCES = \ stattext.cpp \ tbargtk.cpp \ textctrl.cpp \ - threadno.cpp \ - threadsgi.cpp \ timer.cpp \ tooltip.cpp \ treectrl.cpp \ -- 2.45.2