added wx(U)int64, then added it to wxDataStream so contrib should

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index da8ffd42adb93378efc679dc910af95020f4f3b9..86218ba3ab0540274706e3962daf10a59b4927dd 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -36,8 +36,14 @@ cppflags()
     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
@@ -94,14 +100,19 @@ while test $# -gt 0; do
       fi
 
       if test $static_flag = yes ; then
-          echo "-static $libs @LDFLAGS@ @WXCONFIG_LIBS@ @LIBS@ @DMALLOC_LIBS@"
+          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