Added menu icon methods everywhere

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 478a243796988e239bb5052a31b740885f94dcf6..7ce8e5c361b8c95b651f9b81b9a2a88f10f645c6 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -6,12 +6,16 @@ exec_prefix_set=no
 CC="@CC@"
 CXX="@CXX@"
 LD="@SHARED_LD@"
 CC="@CC@"
 CXX="@CXX@"
 LD="@SHARED_LD@"

+cross_compiling=@cross_compiling@
+target=@host_alias@
+static_flag=no

 
 usage()
 {
     cat <<EOF
 
 usage()
 {
     cat <<EOF

-Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version]
-                 [--libs] [--cppflags] [--cflags] [--cxxflags]
+Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--static]
+                 [--libs] [--gl-libs]
+                 [--cppflags] [--cflags] [--cxxflags] [--ldflags] [--rezflags]

                  [--cc] [--cxx] [--ld]
 
 wx-config returns configuration information about the installed
                  [--cc] [--cxx] [--ld]
 
 wx-config returns configuration information about the installed


@@ -26,17 +30,25 @@ EOF
 
 cppflags()
 {
 
 cppflags()
 {

-    if test @includedir@ != /usr/include ; then
-        if test @includedir@ != /usr/include/c++ ; then
-            includes=-I@includedir@
-        fi
+    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"
+
+    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
     fi

-    includes="$includes -I@libdir@/wx/include -D__USE_WXCONFIG__"
-    echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @WXCONFIG_INCLUDE@

 }
 
 if test $# -eq 0; then
 }
 
 if test $# -eq 0; then

-      usage 1 1>&2
+    usage 1 1>&2

 fi
 
 while test $# -gt 0; do
 fi
 
 while test $# -gt 0; do


@@ -65,6 +77,9 @@ while test $# -gt 0; do
     --version)
       echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@
       ;;
     --version)
       echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@
       ;;

+    --static)
+      static_flag=yes
+      ;;

     --cppflags)
       cppflags
       ;;
     --cppflags)
       cppflags
       ;;


@@ -74,11 +89,34 @@ while test $# -gt 0; do
     --cxxflags)
       echo `cppflags` @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@
       ;;
     --cxxflags)
       echo `cppflags` @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@
       ;;

+    --ldflags)
+      echo @LDFLAGS_EXE@
+      ;;
+    --rezflags)
+      echo @LIBWXMACRESWXCONFIG@
+      ;;

     --libs)
     --libs)

-      if test @libdir@ != /usr/lib ; then
-        libs="-L@libdir@"
+      if test "@libdir@" != "/usr/lib" \
+              -a \( "${cross_compiling}" != "yes" \
+                    -o "@libdir@" != "/usr/${target}/lib" \) ;
+      then
+          libs="-L@libdir@"
+      fi
+
+      if test $static_flag = yes ; then
+          echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@"
+      else
+          echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@
+      fi
+
+      ;;
+    --gl-libs)
+      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
       fi

-      echo $libs -l@WX_LIBRARY@ @EXTRA_LIBS@
+      echo @LDFLAGS_GL@ "$gllibs"

       ;;
     --cc)
       echo $CC
       ;;
     --cc)
       echo $CC