Merge pull request #6 from prs-de/master

Improve buildsystem + windows support + downcasts + multiple axis fix

1 files changed, 57 insertions, 56 deletions

diff --git a/configure b/configure
index 1ac516e..3e01d51 100755
--- a/configure
+++ b/configure
@@ -5644,55 +5644,55 @@ done
 
 
     vars="
-src/tkbltChain.C
-src/tkbltConfig.C
-src/tkbltGrAxis.C
-src/tkbltGrAxisOp.C
-src/tkbltGrAxisOption.C
-src/tkbltGrBind.C
-src/tkbltGrElemOp.C
-src/tkbltGrElemOption.C
-src/tkbltGrElem.C
-src/tkbltGrElemBar.C
-src/tkbltGrElemLine.C
-src/tkbltGrElemLineSpline.C
-src/tkbltGrHairs.C
-src/tkbltGrHairsOp.C
-src/tkbltGrLegd.C
-src/tkbltGrLegdOp.C
-src/tkbltGrMarkerOp.C
-src/tkbltGrMarkerOption.C
-src/tkbltGrMarker.C
-src/tkbltGrMarkerLine.C
-src/tkbltGrMarkerPolygon.C
-src/tkbltGrMarkerText.C
-src/tkbltGrMisc.C
-src/tkbltGrPenOp.C
-src/tkbltGrPenOption.C
-src/tkbltGrPen.C
-src/tkbltGrPenBar.C
-src/tkbltGrPenLine.C
-src/tkbltGrPostscript.C
-src/tkbltGrPostscriptOp.C
-src/tkbltGrPSOutput.C
-src/tkbltGrText.C
-src/tkbltGrXAxisOp.C
-src/tkbltGraph.C
-src/tkbltGraphBar.C
-src/tkbltGraphLine.C
-src/tkbltGraphOp.C
-src/tkbltGraphSup.C
-src/tkbltInt.C
-src/tkbltNsUtil.C
-src/tkbltParse.C
-src/tkbltOp.C
-src/tkbltStubInit.c
-src/tkbltStubLib.C
-src/tkbltSwitch.C
-src/tkbltVecCmd.C
-src/tkbltVecOp.C
-src/tkbltVecMath.C
-src/tkbltVector.C
+tkbltChain.C
+tkbltConfig.C
+tkbltGrAxis.C
+tkbltGrAxisOp.C
+tkbltGrAxisOption.C
+tkbltGrBind.C
+tkbltGrElemOp.C
+tkbltGrElemOption.C
+tkbltGrElem.C
+tkbltGrElemBar.C
+tkbltGrElemLine.C
+tkbltGrElemLineSpline.C
+tkbltGrHairs.C
+tkbltGrHairsOp.C
+tkbltGrLegd.C
+tkbltGrLegdOp.C
+tkbltGrMarkerOp.C
+tkbltGrMarkerOption.C
+tkbltGrMarker.C
+tkbltGrMarkerLine.C
+tkbltGrMarkerPolygon.C
+tkbltGrMarkerText.C
+tkbltGrMisc.C
+tkbltGrPenOp.C
+tkbltGrPenOption.C
+tkbltGrPen.C
+tkbltGrPenBar.C
+tkbltGrPenLine.C
+tkbltGrPostscript.C
+tkbltGrPostscriptOp.C
+tkbltGrPSOutput.C
+tkbltGrText.C
+tkbltGrXAxisOp.C
+tkbltGraph.C
+tkbltGraphBar.C
+tkbltGraphLine.C
+tkbltGraphOp.C
+tkbltGraphSup.C
+tkbltInt.C
+tkbltNsUtil.C
+tkbltParse.C
+tkbltOp.C
+tkbltStubInit.c
+tkbltStubLib.C
+tkbltSwitch.C
+tkbltVecCmd.C
+tkbltVecOp.C
+tkbltVecMath.C
+tkbltVector.C
 "
     for i in $vars; do
 	case $i in
@@ -5729,8 +5729,8 @@ src/tkbltVector.C
 
 
     vars="
-src/tkbltVector.h
-src/tkbltDecls.h
+generic/tkbltVector.h
+generic/tkbltDecls.h
 "
     for i in $vars; do
 	# check for existence, be strict because it is installed
@@ -5742,7 +5742,7 @@ src/tkbltDecls.h
 
 
 
-    vars="-I./src"
+    vars=""
     for i in $vars; do
 	PKG_INCLUDES="$PKG_INCLUDES $i"
     done
@@ -5763,12 +5763,14 @@ src/tkbltDecls.h
     done
 
 
+if test "windows" = "${TEA_PLATFORM}"; then
 
-    PKG_CFLAGS="$PKG_CFLAGS "
+    PKG_CFLAGS="$PKG_CFLAGS -TP -EHsc -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES"
 
 
+fi
 
-    vars="src/tkbltStubLib.C"
+    vars="tkbltStubLib.C"
     for i in $vars; do
 	# check for existence - allows for generic/win/unix VPATH
 	if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
@@ -5815,8 +5817,7 @@ src/tkbltDecls.h
 # TEA_ADD_* any platform specific compiler/build info here.
 #--------------------------------------------------------------------
 
-#CLEANFILES="$CLEANFILES pkgIndex.tcl"
-CLEANFILES="$CLEANFILES tkbltConfig.sh"
+CLEANFILES="$CLEANFILES"
 if test "${TEA_PLATFORM}" = "windows" ; then
     # Ensure no empty if clauses
     :