diff options
author | William Joye <wjoye@cfa.harvard.edu> | 2017-09-06 15:11:10 (GMT) |
---|---|---|
committer | William Joye <wjoye@cfa.harvard.edu> | 2017-09-06 15:11:10 (GMT) |
commit | 71de048e44c7c0ffcdf0448d505613c9aedbf46c (patch) | |
tree | b5782e4666b8cc6fc14905e894ffa938b24668d3 | |
parent | 4773cc1128f60e83ba5721fe1ad3497b15078361 (diff) | |
download | blt-71de048e44c7c0ffcdf0448d505613c9aedbf46c.zip blt-71de048e44c7c0ffcdf0448d505613c9aedbf46c.tar.gz blt-71de048e44c7c0ffcdf0448d505613c9aedbf46c.tar.bz2 |
Squashed 'tkblt/' changes from c79bffe0..6b0ab029
6b0ab029 Merge pull request #12 from prs-de/export-tkblt-init
fe02ecfc Merge pull request #11 from prs-de/fix-empty-value-missing-include
a83b1f72 Merge pull request #10 from prs-de/build-windows-cygwin-cl
0cb740e4 Export Tkblt_Init and Tkblt_SafeInit symbols
791beb6f Add missing include defining NAN
89235e98 Set MSVC cflags on Cygwin when the compiler is not GCC
git-subtree-dir: tkblt
git-subtree-split: 6b0ab0298045c8c24ae0ab3627915b109001194b
-rwxr-xr-x | configure | 9 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | generic/tkbltInt.C | 8 | ||||
-rw-r--r-- | generic/tkbltVecCmd.C | 1 |
4 files changed, 14 insertions, 10 deletions
@@ -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/configure.ac b/configure.ac index 7e2d152..72d0fc5 100644 --- a/configure.ac +++ b/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/generic/tkbltInt.C b/generic/tkbltInt.C index 5e9dde7..3f9c3ac 100644 --- a/generic/tkbltInt.C +++ b/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/generic/tkbltVecCmd.C b/generic/tkbltVecCmd.C index feaddab..8603d54 100644 --- a/generic/tkbltVecCmd.C +++ b/generic/tkbltVecCmd.C @@ -57,6 +57,7 @@ #include "tkbltOp.h" #include "tkbltNsUtil.h" #include "tkbltSwitch.h" +#include "tkbltInt.h" using namespace Blt; |