X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a922bb4bd8dbcb04e31e324648c2912e167e0cd..21a77f6e5008e7c6e15fc5615c917f13793e6136:/wx-config.in?ds=sidebyside diff --git a/wx-config.in b/wx-config.in index 7c9760b903..86218ba3ab 100755 --- a/wx-config.in +++ b/wx-config.in @@ -7,12 +7,14 @@ CC="@CC@" 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] - [--libs] [--gl-libs] [--cppflags] [--cflags] [--cxxflags] +Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--static] + [--libs] [--gl-libs] [--cppflags] [--cflags] [--cxxflags] [--rezflags] [--cc] [--cxx] [--ld] wx-config returns configuration information about the installed @@ -27,14 +29,21 @@ EOF cppflags() { - if test "${cross_compiling}" != "yes" \ - -a @includedir@ != /usr/include \ - -a @includedir@ != /usr/include/c++ ; + if test "@includedir@" != "/usr/include" \ + -a "@includedir@" != "/usr/include/c++" \ + -a \( "${cross_compiling}" != "yes" \ + -o "@includedir@" != "/usr/${target}/include" \) ; then includes=-I@includedir@ fi + includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@ $includes" - echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@ + + if test $static_flag = yes ; then + echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@ + else + echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @TOOLCHAIN_DLL_DEFS@ @WXCONFIG_INCLUDE@ + fi } if test $# -eq 0; then @@ -67,6 +76,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 ;; @@ -76,16 +88,31 @@ while test $# -gt 0; do --cxxflags) echo `cppflags` @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@ ;; + --rezflags) + echo @LIBWXMACRESWXCONFIG@ + ;; --libs) - if test "${cross_compiling}" != "yes" \ - -a @libdir@ != /usr/lib ; + if test "@libdir@" != "/usr/lib" \ + -a \( "${cross_compiling}" != "yes" \ + -o "@libdir@" != "/usr/${target}/lib" \) ; then libs="-L@libdir@" fi - echo $libs @WXCONFIG_LIBS@ @EXTRA_LIBS@ + + if test $static_flag = yes ; then + echo "$libs @LDFLAGS@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@" + else + echo $libs @LDFLAGS@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@ + fi + ;; --gl-libs) - echo @WXCONFIG_LIBS_GL@ + if test $static_flag = yes -a "x" != "x@WXCONFIG_LIBS_STATIC_GL@" ; then + gllibs="@libdir@/@WXCONFIG_LIBS_STATIC_GL@" + else + gllibs="@WXCONFIG_LIBS_GL@" + fi + echo @LDFLAGS_GL@ "$gllibs" ;; --cc) echo $CC