Merge commit '71de048e44c7c0ffcdf0448d505613c9aedbf46c'

4 files changed, 14 insertions, 10 deletions

diff --git a/tkblt/configure b/tkblt/configure
index 052a60b..49d492f 100755
--- a/tkblt/configure
+++ b/tkblt/configure
@@ -5763,9 +5763,12 @@ generic/tkbltDecls.h
     done
 
 
-#if test "windows" = "${TEA_PLATFORM}"; then
-#TEA_ADD_CFLAGS([-TP -EHsc -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES])
-#fi
+if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes"; then
+
+    PKG_CFLAGS="$PKG_CFLAGS -TP -EHsc -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES"
+
+
+fi
 
     vars="tkbltStubLib.C"
     for i in $vars; do
diff --git a/tkblt/configure.ac b/tkblt/configure.ac
index 7e2d152..72d0fc5 100644
--- a/tkblt/configure.ac
+++ b/tkblt/configure.ac
@@ -128,9 +128,9 @@ generic/tkbltDecls.h
 ])
 TEA_ADD_INCLUDES([])
 TEA_ADD_LIBS([-lstdc++])
-#if test "windows" = "${TEA_PLATFORM}"; then
-#TEA_ADD_CFLAGS([-TP -EHsc -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES])
-#fi
+if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes"; then
+TEA_ADD_CFLAGS([-TP -EHsc -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES])
+fi
 TEA_ADD_STUB_SOURCES([tkbltStubLib.C])
 TEA_ADD_TCL_SOURCES([library/graph.tcl])
 
diff --git a/tkblt/generic/tkbltInt.C b/tkblt/generic/tkbltInt.C
index 5e9dde7..3f9c3ac 100644
--- a/tkblt/generic/tkbltInt.C
+++ b/tkblt/generic/tkbltInt.C
@@ -32,8 +32,8 @@
 using namespace std;
 
 extern "C" {
-Tcl_AppInitProc Tkblt_Init;
-Tcl_AppInitProc Tkblt_SafeInit;
+DLLEXPORT Tcl_AppInitProc Tkblt_Init;
+DLLEXPORT Tcl_AppInitProc Tkblt_SafeInit;
 };
 
 Tcl_AppInitProc Blt_VectorCmdInitProc;
@@ -41,7 +41,7 @@ Tcl_AppInitProc Blt_GraphCmdInitProc;
 
 #include "tkbltStubInit.c"
 
-int Tkblt_Init(Tcl_Interp* interp)
+DLLEXPORT int Tkblt_Init(Tcl_Interp* interp)
 {
   Tcl_Namespace *nsPtr;
 
@@ -68,7 +68,7 @@ int Tkblt_Init(Tcl_Interp* interp)
   return TCL_OK;
 }
 
-int Tkblt_SafeInit(Tcl_Interp* interp)
+DLLEXPORT int Tkblt_SafeInit(Tcl_Interp* interp)
 {
   return Tkblt_Init(interp);
 }
diff --git a/tkblt/generic/tkbltVecCmd.C b/tkblt/generic/tkbltVecCmd.C
index feaddab..8603d54 100644
--- a/tkblt/generic/tkbltVecCmd.C
+++ b/tkblt/generic/tkbltVecCmd.C
@@ -57,6 +57,7 @@
 #include "tkbltOp.h"
 #include "tkbltNsUtil.h"
 #include "tkbltSwitch.h"
+#include "tkbltInt.h"
 
 using namespace Blt;