X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62d0491bf6620bbaec0ce3fc8821931e1b6ed29b..98e78a5eb45c4e7b90bb045b7ed7a0b234f4eea4:/wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 4bf5af839a..7ce8e5c361 100755
--- a/wx-config.in
+++ b/wx-config.in
@@ -14,7 +14,8 @@ usage()
 {
     cat <<EOF
 Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--static]
-                 [--libs] [--gl-libs] [--cppflags] [--cflags] [--cxxflags] [--rezflags]
+                 [--libs] [--gl-libs]
+                 [--cppflags] [--cflags] [--cxxflags] [--ldflags] [--rezflags]
                  [--cc] [--cxx] [--ld]
 
 wx-config returns configuration information about the installed
@@ -88,6 +89,9 @@ while test $# -gt 0; do
     --cxxflags)
       echo `cppflags` @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@
       ;;
+    --ldflags)
+      echo @LDFLAGS_EXE@
+      ;;
     --rezflags)
       echo @LIBWXMACRESWXCONFIG@
       ;;
@@ -100,14 +104,19 @@ while test $# -gt 0; do
       fi
 
       if test $static_flag = yes ; then
-          echo "$libs @LDFLAGS@ @WXCONFIG_LIBS@ @LIBS@ @DMALLOC_LIBS@"
+          echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@"
       else
-          echo $libs @LDFLAGS@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@
+          echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@
       fi
 
       ;;
     --gl-libs)
-      echo @LDFLAGS_GL@ @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