X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d345e841da6719c3de9de784220aafafb5eb1e93..78c49c5829433d36203e9c3bc04f2e803ecddc60:/wx-config.in diff --git a/wx-config.in b/wx-config.in index 5012430955..a89e5cf8b1 100755 --- a/wx-config.in +++ b/wx-config.in @@ -3,9 +3,12 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ exec_prefix_set=no +CC="@CC@" +CXX="@CXX@" +LD="@SHARED_LD@" usage="\ -Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]" +Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]" if test $# -eq 0; then echo "${usage}" 1>&2 @@ -36,18 +39,31 @@ while test $# -gt 0; do echo $exec_prefix ;; --version) - echo 2.1.0 + echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@ ;; --cflags) if test @includedir@ != /usr/include ; then - includes=-I@includedir@ + if test @includedir@ != /usr/include/c++ ; then + includes=-I@includedir@ + fi fi includes="$includes -I@libdir@/wx/include" - echo $includes -D@TOOLKIT_DEF@ @WXDEBUG_DEFINE@ - + echo $includes -D__USE_WXCONFIG__ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @WXCONFIG_INCLUDE@ ;; --libs) - echo -L@libdir@ @THREADS_LINK@ @WX_LINK@ @DL_LIBRARY@ @GUI_TK_LIBRARY@ @EXTRA_LINK@ @JPEG_LINK@ + if test @libdir@ != /usr/lib ; then + libs="-L@libdir@" + fi + echo $libs -l@WX_LIBRARY@ @EXTRA_LIBS@ + ;; + --cc) + echo $CC + ;; + --cxx) + echo $CXX + ;; + --ld) + echo $LD ;; *) echo "${usage}" 1>&2