Rearrange the linker flags/libs code in preparation for better static/shared
support. Added --static option to wx-config and removed most libs from --libs output unless it is used. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
74
configure
vendored
74
configure
vendored
@@ -9665,7 +9665,7 @@ echo "$ac_t""$wx_cv_w32api_win32_ie" 1>&6
|
||||
esac
|
||||
|
||||
if test "$wxUSE_ODBC" = "yes" ; then
|
||||
LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
|
||||
LIBS=" -lodbc32 -lole32 -loleaut32$LIBS"
|
||||
fi
|
||||
|
||||
RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
|
||||
@@ -9687,7 +9687,7 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||
|
||||
case "${host}" in
|
||||
*-*-mingw32* )
|
||||
EXTRA_LIBS="$EXTRA_LIBS -Wl,--subsystem,windows -mwindows"
|
||||
LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows"
|
||||
esac
|
||||
fi
|
||||
|
||||
@@ -10394,7 +10394,7 @@ else
|
||||
fi
|
||||
|
||||
|
||||
xpm_link=""
|
||||
xpm_link=
|
||||
echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
|
||||
echo "configure:10400: checking for Xpm library" >&5
|
||||
|
||||
@@ -10422,7 +10422,7 @@ EOF
|
||||
echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
|
||||
fi
|
||||
|
||||
mesa_link=""
|
||||
mesa_link=
|
||||
echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
|
||||
echo "configure:10428: checking for Mesa library" >&5
|
||||
|
||||
@@ -11416,7 +11416,7 @@ rm -f conftest*
|
||||
fi
|
||||
fi
|
||||
|
||||
xpm_link=""
|
||||
xpm_link=
|
||||
echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
|
||||
echo "configure:11422: checking for Xpm library" >&5
|
||||
|
||||
@@ -11494,12 +11494,12 @@ rm -f conftest*
|
||||
|
||||
if test "$wxUSE_MAC" = 1; then
|
||||
if test "$wxUSE_PRECOMP" = "yes"; then
|
||||
CPPFLAGS="${CPPFLAGS} -cpp-precomp"
|
||||
CPPFLAGS="$CPPFLAGS -cpp-precomp"
|
||||
fi
|
||||
CPPFLAGS="${CPPFLAGS} -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"
|
||||
CFLAGS="${CFLAGS} -fpascal-strings"
|
||||
CXXFLAGS="${CXXFLAGS} -fpascal-strings"
|
||||
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DTARGET_CARBON"
|
||||
CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"
|
||||
CFLAGS="$CFLAGS -fpascal-strings"
|
||||
CXXFLAGS="$CXXFLAGS -fpascal-strings"
|
||||
TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -DTARGET_CARBON"
|
||||
|
||||
TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile"
|
||||
TOOLKIT=MAC
|
||||
@@ -11820,7 +11820,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
case "${host}" in
|
||||
*-hp-hpux* )
|
||||
if test "$GCC" != "yes"; then
|
||||
LDFLAGS="-L/usr/lib"
|
||||
LDFLAGS="$LDFLAGS -L/usr/lib"
|
||||
|
||||
SHARED_LD="${CXX} -b -o"
|
||||
PIC_FLAG="+Z"
|
||||
@@ -11893,9 +11893,9 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6
|
||||
;;
|
||||
|
||||
*-*-darwin* )
|
||||
CFLAGS="${CFLAGS} -fno-common"
|
||||
CXXFLAGS="${CXXFLAGS} -fno-common"
|
||||
SHARED_LD="${CXX} -dynamiclib -o"
|
||||
CFLAGS="$CFLAGS -fno-common"
|
||||
CXXFLAGS="$CXXFLAGS -fno-common"
|
||||
SHARED_LD="$CXX -dynamiclib -o"
|
||||
PIC_FLAG="-dynamic -fPIC"
|
||||
;;
|
||||
|
||||
@@ -13605,7 +13605,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
#define HAVE_WCSLEN 1
|
||||
EOF
|
||||
|
||||
WCHAR_LINK=""
|
||||
WCHAR_LINK=
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
@@ -13695,7 +13695,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
#define HAVE_WCSLEN 1
|
||||
EOF
|
||||
|
||||
WCHAR_LINK=""
|
||||
WCHAR_LINK=
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
@@ -15884,9 +15884,9 @@ EOF
|
||||
THREADS_LINK=" -l$THREADS_LINK"
|
||||
|
||||
if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
|
||||
CPPFLAGS="${CFLAGS} -mt"
|
||||
CXXFLAGS="${CXXFLAGS} -mt"
|
||||
LDFLAGS="${LDFLAGS} -mt"
|
||||
CPPFLAGS="$CFLAGS -mt"
|
||||
CXXFLAGS="$CXXFLAGS -mt"
|
||||
LDFLAGS="$LDFLAGS -mt"
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -15899,7 +15899,7 @@ EOF
|
||||
|
||||
|
||||
if test "$USE_DARWIN" != 1; then
|
||||
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT"
|
||||
TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -D_REENTRANT"
|
||||
fi
|
||||
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
|
||||
@@ -15979,7 +15979,7 @@ EOF
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DMALLOC" = "yes" ; then
|
||||
DMALLOC_LINK="-ldmalloc"
|
||||
DMALLOC_LIBS="-ldmalloc"
|
||||
fi
|
||||
|
||||
PROFILE=
|
||||
@@ -15998,8 +15998,8 @@ if test "$GCC" = yes ; then
|
||||
CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
|
||||
fi
|
||||
if test "$wxUSE_NO_DEPS" = "no" ; then
|
||||
CFLAGS="-MMD ${CFLAGS}"
|
||||
CXXFLAGS="-MMD ${CXXFLAGS}"
|
||||
CFLAGS="-MMD $CFLAGS"
|
||||
CXXFLAGS="-MMD $CXXFLAGS"
|
||||
fi
|
||||
if test "$USE_WIN32" = 1 ; then
|
||||
# I'm not even really sure what this was ever added to solve,
|
||||
@@ -17071,7 +17071,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
EOF
|
||||
|
||||
HAVE_DL_FUNCS=1
|
||||
LIBS="$LIBS -ldl"
|
||||
DL_LINK=" -ldl$DL_LINK"
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
@@ -17171,7 +17171,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
|
||||
HAVE_SHL_FUNCS=1
|
||||
LIBS="$LIBS -ldld"
|
||||
DL_LINK=" -ldld$DL_LINK"
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
@@ -17561,7 +17561,7 @@ done
|
||||
if test "$GCC" = yes ; then
|
||||
ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
|
||||
CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
|
||||
LIBS="$LIBS -lrpcrt4 -loleaut32 -lole32 -luuid"
|
||||
LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define wxUSE_OLE 1
|
||||
EOF
|
||||
@@ -18274,16 +18274,18 @@ EOF
|
||||
|
||||
|
||||
|
||||
GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK"
|
||||
|
||||
EXTRA_LIBS="$EXTRA_LIBS $LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
|
||||
|
||||
if test "$wxUSE_MAC" = 1 ; then
|
||||
EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System"
|
||||
LDFLAGS="$LDFLAGS -framework Carbon -framework System"
|
||||
fi
|
||||
|
||||
|
||||
LIBS="$ZLIB_LINK$POSIX4_LINK$INET_LINK$WCHAR_LINK$THREADS_LINK$DL_LINK -lm$LIBS"
|
||||
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS"
|
||||
|
||||
LIBS=" $GUI_TK_LIBRARY$PNG_LINK$JPEG_LINK$TIFF_LINK$FREETYPE_LINK$LIBS"
|
||||
|
||||
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \
|
||||
@@ -18295,14 +18297,13 @@ else
|
||||
SAMPLES_SUBDIRS="console"
|
||||
fi
|
||||
|
||||
LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
|
||||
|
||||
INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \
|
||||
$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
|
||||
$FREETYPE_INCLUDE $TOOLKIT_INCLUDE"
|
||||
|
||||
if test "$wxUSE_GTK" = 1; then
|
||||
WXCONFIG_INCLUDE=""
|
||||
if test $wxUSE_GTK = 1; then
|
||||
WXCONFIG_INCLUDE=
|
||||
else
|
||||
WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
|
||||
fi
|
||||
@@ -18398,13 +18399,11 @@ 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 "configure:18408: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
echo "configure:18407: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
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
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -18674,10 +18673,9 @@ s%@DISTDIR@%$DISTDIR%g
|
||||
s%@RPM_SPEC@%$RPM_SPEC%g
|
||||
s%@RPM_FILES@%$RPM_FILES%g
|
||||
s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
|
||||
s%@EXTRA_LIBS@%$EXTRA_LIBS%g
|
||||
s%@OPENGL_LIBS@%$OPENGL_LIBS%g
|
||||
s%@DMALLOC_LIBS@%$DMALLOC_LIBS%g
|
||||
s%@EXTRADEFS@%$EXTRADEFS%g
|
||||
s%@LD_LIBS@%$LD_LIBS%g
|
||||
s%@RESFLAGS@%$RESFLAGS%g
|
||||
s%@RESPROGRAMOBJ@%$RESPROGRAMOBJ%g
|
||||
s%@WX_RESOURCES_MACOSX@%$WX_RESOURCES_MACOSX%g
|
||||
|
79
configure.in
79
configure.in
@@ -1913,7 +1913,7 @@ if test "$USE_WIN32" = 1 ; then
|
||||
|
||||
dnl add extra odbc libs if we have compiled in odbc
|
||||
if test "$wxUSE_ODBC" = "yes" ; then
|
||||
LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
|
||||
LIBS=" -lodbc32 -lole32 -loleaut32$LIBS"
|
||||
fi
|
||||
|
||||
RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
|
||||
@@ -1938,7 +1938,7 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||
dnl remove this comment :-)
|
||||
case "${host}" in
|
||||
*-*-mingw32* )
|
||||
EXTRA_LIBS="$EXTRA_LIBS -Wl,--subsystem,windows -mwindows"
|
||||
LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows"
|
||||
esac
|
||||
fi
|
||||
|
||||
@@ -2055,7 +2055,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
|
||||
AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
|
||||
])
|
||||
|
||||
xpm_link=""
|
||||
xpm_link=
|
||||
AC_MSG_CHECKING(for Xpm library)
|
||||
WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
|
||||
if test "$ac_find_libraries" != "" ; then
|
||||
@@ -2068,7 +2068,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
|
||||
AC_MSG_WARN(library will be compiled without support for images in XPM format)
|
||||
fi
|
||||
|
||||
mesa_link=""
|
||||
mesa_link=
|
||||
AC_MSG_CHECKING(for Mesa library)
|
||||
WX_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL)
|
||||
if test "$ac_find_libraries" != "" ; then
|
||||
@@ -2157,7 +2157,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
|
||||
fi
|
||||
fi
|
||||
|
||||
xpm_link=""
|
||||
xpm_link=
|
||||
AC_MSG_CHECKING(for Xpm library)
|
||||
WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
|
||||
if test "$ac_find_libraries" != "" ; then
|
||||
@@ -2196,12 +2196,12 @@ equivalent variable and GTK+ is version 1.2.3 or above.
|
||||
|
||||
if test "$wxUSE_MAC" = 1; then
|
||||
if test "$wxUSE_PRECOMP" = "yes"; then
|
||||
CPPFLAGS="${CPPFLAGS} -cpp-precomp"
|
||||
CPPFLAGS="$CPPFLAGS -cpp-precomp"
|
||||
fi
|
||||
CPPFLAGS="${CPPFLAGS} -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"
|
||||
CFLAGS="${CFLAGS} -fpascal-strings"
|
||||
CXXFLAGS="${CXXFLAGS} -fpascal-strings"
|
||||
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DTARGET_CARBON"
|
||||
CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"
|
||||
CFLAGS="$CFLAGS -fpascal-strings"
|
||||
CXXFLAGS="$CXXFLAGS -fpascal-strings"
|
||||
TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -DTARGET_CARBON"
|
||||
|
||||
TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile"
|
||||
TOOLKIT=MAC
|
||||
@@ -2444,7 +2444,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
dnl default settings are good for gcc but not for the native HP-UX
|
||||
if test "$GCC" != "yes"; then
|
||||
dnl no idea why it wants it, but it does
|
||||
LDFLAGS="-L/usr/lib"
|
||||
LDFLAGS="$LDFLAGS -L/usr/lib"
|
||||
|
||||
SHARED_LD="${CXX} -b -o"
|
||||
PIC_FLAG="+Z"
|
||||
@@ -2500,9 +2500,9 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
;;
|
||||
|
||||
*-*-darwin* )
|
||||
CFLAGS="${CFLAGS} -fno-common"
|
||||
CXXFLAGS="${CXXFLAGS} -fno-common"
|
||||
SHARED_LD="${CXX} -dynamiclib -o"
|
||||
CFLAGS="$CFLAGS -fno-common"
|
||||
CXXFLAGS="$CXXFLAGS -fno-common"
|
||||
SHARED_LD="$CXX -dynamiclib -o"
|
||||
PIC_FLAG="-dynamic -fPIC"
|
||||
;;
|
||||
|
||||
@@ -2817,7 +2817,7 @@ dnl ---------------------------------------------------------------------------
|
||||
dnl check for wcslen
|
||||
AC_CHECK_LIB(c, wcslen, [
|
||||
AC_DEFINE(HAVE_WCSLEN)
|
||||
WCHAR_LINK=""
|
||||
WCHAR_LINK=
|
||||
], [
|
||||
AC_CHECK_LIB(w, wcslen, [
|
||||
AC_DEFINE(HAVE_WCSLEN)
|
||||
@@ -2825,7 +2825,7 @@ AC_CHECK_LIB(c, wcslen, [
|
||||
], [
|
||||
AC_CHECK_LIB(msvcrt, wcslen, [
|
||||
AC_DEFINE(HAVE_WCSLEN)
|
||||
WCHAR_LINK=""
|
||||
WCHAR_LINK=
|
||||
])
|
||||
])
|
||||
])
|
||||
@@ -3369,9 +3369,9 @@ if test "$wxUSE_THREADS" = "yes" ; then
|
||||
dnl building MT programs under Solaris with the native compiler requires -mt
|
||||
dnl switch
|
||||
if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
|
||||
CPPFLAGS="${CFLAGS} -mt"
|
||||
CXXFLAGS="${CXXFLAGS} -mt"
|
||||
LDFLAGS="${LDFLAGS} -mt"
|
||||
CPPFLAGS="$CFLAGS -mt"
|
||||
CXXFLAGS="$CXXFLAGS -mt"
|
||||
LDFLAGS="$LDFLAGS -mt"
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -3383,7 +3383,7 @@ if test "$wxUSE_THREADS" = "yes"; then
|
||||
|
||||
dnl must define _REENTRANT for multithreaded code except for Darwin/Mac OS X
|
||||
if test "$USE_DARWIN" != 1; then
|
||||
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT"
|
||||
TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -D_REENTRANT"
|
||||
fi
|
||||
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
|
||||
@@ -3443,7 +3443,7 @@ if test "$wxUSE_MEM_TRACING" = "yes" ; then
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DMALLOC" = "yes" ; then
|
||||
DMALLOC_LINK="-ldmalloc"
|
||||
DMALLOC_LIBS="-ldmalloc"
|
||||
fi
|
||||
|
||||
PROFILE=
|
||||
@@ -3462,8 +3462,8 @@ if test "$GCC" = yes ; then
|
||||
CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
|
||||
fi
|
||||
if test "$wxUSE_NO_DEPS" = "no" ; then
|
||||
CFLAGS="-MMD ${CFLAGS}"
|
||||
CXXFLAGS="-MMD ${CXXFLAGS}"
|
||||
CFLAGS="-MMD $CFLAGS"
|
||||
CXXFLAGS="-MMD $CXXFLAGS"
|
||||
fi
|
||||
if test "$USE_WIN32" = 1 ; then
|
||||
# I'm not even really sure what this was ever added to solve,
|
||||
@@ -3931,7 +3931,7 @@ if test "$TOOLKIT" != "MSW"; then
|
||||
[
|
||||
AC_DEFINE(HAVE_DLOPEN)
|
||||
HAVE_DL_FUNCS=1
|
||||
LIBS="$LIBS -ldl"
|
||||
DL_LINK=" -ldl$DL_LINK"
|
||||
],
|
||||
[
|
||||
AC_CHECK_FUNCS(shl_load,
|
||||
@@ -3943,7 +3943,7 @@ if test "$TOOLKIT" != "MSW"; then
|
||||
AC_CHECK_LIB(shl_load, dld,
|
||||
[
|
||||
HAVE_SHL_FUNCS=1
|
||||
LIBS="$LIBS -ldld"
|
||||
DL_LINK=" -ldld$DL_LINK"
|
||||
])
|
||||
])
|
||||
])
|
||||
@@ -4117,7 +4117,7 @@ if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \
|
||||
if test "$GCC" = yes ; then
|
||||
ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
|
||||
CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
|
||||
LIBS="$LIBS -lrpcrt4 -loleaut32 -lole32 -luuid"
|
||||
LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
|
||||
AC_DEFINE(wxUSE_OLE)
|
||||
|
||||
fi
|
||||
@@ -4617,20 +4617,24 @@ dnl ---------------------------------------------------------------------------
|
||||
dnl Output the makefiles and such from the results found above
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK"
|
||||
|
||||
dnl all additional libraries (except wxWindows itself) we link with
|
||||
dnl
|
||||
|
||||
dnl note that we always link with -lm except for Mac OS X
|
||||
dnl extended.c uses floor() and is always linked in
|
||||
EXTRA_LIBS="$EXTRA_LIBS $LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
|
||||
|
||||
if test "$wxUSE_MAC" = 1 ; then
|
||||
EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System"
|
||||
LDFLAGS="$LDFLAGS -framework Carbon -framework System"
|
||||
fi
|
||||
|
||||
dnl FIXME: should this be covered by the conditional above
|
||||
dnl given the -lm comment there? Or should that comment (and
|
||||
dnl this one) be removed.. [ 7 Nov 2001 ]
|
||||
|
||||
LIBS="$ZLIB_LINK$POSIX4_LINK$INET_LINK$WCHAR_LINK$THREADS_LINK$DL_LINK -lm$LIBS"
|
||||
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS"
|
||||
|
||||
LIBS=" $GUI_TK_LIBRARY$PNG_LINK$JPEG_LINK$TIFF_LINK$FREETYPE_LINK$LIBS"
|
||||
|
||||
dnl TODO add checks that these samples will really compile (i.e. all the
|
||||
dnl library features they need are present)
|
||||
@@ -4647,9 +4651,6 @@ else
|
||||
SAMPLES_SUBDIRS="console"
|
||||
fi
|
||||
|
||||
dnl all the libraries needed to link wxWindows programs when using the
|
||||
dnl makefile system without libtool
|
||||
LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
|
||||
|
||||
dnl all -I options we must pass to the compiler
|
||||
INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \
|
||||
@@ -4657,8 +4658,8 @@ $REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
|
||||
$FREETYPE_INCLUDE $TOOLKIT_INCLUDE"
|
||||
|
||||
dnl wxGTK does not need TOOLKIT includes in wx-config
|
||||
if test "$wxUSE_GTK" = 1; then
|
||||
WXCONFIG_INCLUDE=""
|
||||
if test $wxUSE_GTK = 1; then
|
||||
WXCONFIG_INCLUDE=
|
||||
else
|
||||
WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
|
||||
fi
|
||||
@@ -4758,11 +4759,9 @@ AC_SUBST(SAMPLES_SUBDIRS)
|
||||
|
||||
dnl additional libraries and linker settings
|
||||
AC_SUBST(LDFLAGS)
|
||||
AC_SUBST(EXTRA_LIBS)
|
||||
AC_SUBST(OPENGL_LIBS)
|
||||
AC_SUBST(DMALLOC_LIBS)
|
||||
AC_SUBST(EXTRADEFS)
|
||||
AC_SUBST(LIBS)
|
||||
AC_SUBST(LD_LIBS)
|
||||
|
||||
dnl additional resurces settings
|
||||
AC_SUBST(RESCOMP)
|
||||
|
@@ -12,7 +12,7 @@
|
||||
####################### GENERAL SETTINGS ############################
|
||||
|
||||
# see comment near LDFLAGS at the end of file
|
||||
EXTRALIBS = @LDFLAGS@ @EXTRA_LIBS@
|
||||
EXTRALIBS = @LDFLAGS@ @LIBS@ @DMALLOC_LIBS@
|
||||
OPENGLLIBS = @OPENGL_LIBS@
|
||||
LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}
|
||||
|
||||
@@ -62,8 +62,7 @@ DLLTOOL = @DLLTOOL@
|
||||
|
||||
CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLCHAIN_DEFS@ @WXDEBUG_DEFINE@
|
||||
CFLAGS = ${APPEXTRACFLAGS} ${CPPFLAGS} @CODE_GEN_FLAGS@ @CFLAGS@
|
||||
CXXFLAGS = ${APPEXTRACXXFLAGS} ${CPPFLAGS} \
|
||||
@CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@ @CXXFLAGS@
|
||||
CXXFLAGS = ${APPEXTRACXXFLAGS} ${CPPFLAGS}@CODE_GEN_FLAGS@@CODE_GEN_FLAGS_CXX@ @CXXFLAGS@
|
||||
PICFLAGS = @PIC_FLAG@
|
||||
|
||||
# taking into account how SHARED_LD is defined, appending LDFLAGS to it
|
||||
|
14
wx-config.in
14
wx-config.in
@@ -8,11 +8,12 @@ CXX="@CXX@"
|
||||
LD="@SHARED_LD@"
|
||||
cross_compiling=@cross_compiling@
|
||||
target=@host_alias@
|
||||
static_flag=no
|
||||
|
||||
usage()
|
||||
{
|
||||
cat <<EOF
|
||||
Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version]
|
||||
Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--static]
|
||||
[--libs] [--gl-libs] [--cppflags] [--cflags] [--cxxflags] [--rezflags]
|
||||
[--cc] [--cxx] [--ld]
|
||||
|
||||
@@ -69,6 +70,9 @@ while test $# -gt 0; do
|
||||
--version)
|
||||
echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@
|
||||
;;
|
||||
--static)
|
||||
static_flag=yes
|
||||
;;
|
||||
--cppflags)
|
||||
cppflags
|
||||
;;
|
||||
@@ -88,7 +92,13 @@ while test $# -gt 0; do
|
||||
then
|
||||
libs="-L@libdir@"
|
||||
fi
|
||||
echo $libs @WXCONFIG_LIBS@ @EXTRA_LIBS@
|
||||
|
||||
if test $static_flag = yes ; then
|
||||
echo "-static $libs @LDFLAGS@ @WXCONFIG_LIBS@ @LIBS@ @DMALLOC_LIBS@"
|
||||
else
|
||||
echo $libs @LDFLAGS@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@
|
||||
fi
|
||||
|
||||
;;
|
||||
--gl-libs)
|
||||
echo @WXCONFIG_LIBS_GL@
|
||||
|
Reference in New Issue
Block a user