File tree Expand file tree Collapse file tree 3 files changed +15
-5
lines changed Expand file tree Collapse file tree 3 files changed +15
-5
lines changed Original file line number Diff line number Diff line change @@ -498,6 +498,9 @@ endif
498
498
ifdef TK
499
499
FLAGS+ =-DTK
500
500
endif
501
+ ifdef TCL
502
+ FLAGS+ =-DTCL
503
+ endif
501
504
502
505
# this conditional ensure TCL is present before doing this stuff, as
503
506
# otherwise Make hangs
Original file line number Diff line number Diff line change 18
18
#include " plot.h"
19
19
#endif
20
20
21
+ #ifdef TCL
21
22
#include " tcl++.h"
23
+ #endif
22
24
23
25
#include < fstream>
24
26
#include < sstream>
@@ -40,7 +42,7 @@ int palette_class::size=0;
40
42
41
43
palette_class::palette_class ()
42
44
{
43
- Tcl_Size elemc;
45
+ // Tcl_Size elemc;
44
46
45
47
if (size==0 )
46
48
{
Original file line number Diff line number Diff line change 6
6
Open source licensed under the MIT license. See LICENSE for details.
7
7
*/
8
8
9
+ #ifdef TCL
9
10
#include " tcl++.h"
10
- #define TK 1
11
+ #endif
11
12
#undef None
12
13
#include " cairoSurfaceImage.h"
13
14
#undef None
@@ -87,8 +88,10 @@ void* ecolab::reallocSycl(void* pp,size_t s)
87
88
88
89
namespace ecolab
89
90
{
91
+ #ifdef TCL
90
92
bool interpExiting=false ;
91
93
void interpExitProc (ClientData cd) {}
94
+ #endif
92
95
93
96
#ifdef MPI_SUPPORT
94
97
unsigned myid () {return graphcode::myid ();}
@@ -99,13 +102,15 @@ namespace ecolab
99
102
#endif
100
103
101
104
105
+ #ifdef TCL
102
106
const char * TCL_args::str ()
103
107
#if (TCL_MAJOR_VERSION==8 && TCL_MINOR_VERSION==0)
104
108
{return Tcl_GetStringFromObj (pop_arg (),NULL );}
105
109
#else
106
110
{return Tcl_GetString (pop_arg ());}
107
111
#endif
108
-
112
+ #endif
113
+
109
114
int addEcoLabPath ()
110
115
{
111
116
if (Py_IsInitialized ())
@@ -246,7 +251,7 @@ namespace ecolab
246
251
247
252
CLASSDESC_PYTHON_MODULE (ecolab);
248
253
249
-
254
+ # ifdef TCL
250
255
// place for initialising any EcoLab extensions to the TCL
251
256
// interpreter, to be called by tkinter's Tk() object
252
257
extern " C" int Ecolab_Init (Tcl_Interp* interp)
@@ -257,4 +262,4 @@ extern "C" int Ecolab_Init(Tcl_Interp* interp)
257
262
258
263
// some linkers add an _
259
264
extern " C" int _Ecolab_Init (Tcl_Interp* interp) {return Ecolab_Init (interp);}
260
-
265
+ # endif
You can’t perform that action at this time.
0 commit comments