diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-06-13 09:33:54 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-06-13 09:33:54 (GMT) |
commit | 2be5f6c5c9a980c37debbf2c3fcb9fd723f01b61 (patch) | |
tree | 15173ce606cbedc4ebe4cdff43f2d1d17c417445 /generic | |
parent | feec89c9e58abd4d8dbc0535779ad72141d6dabc (diff) | |
download | tk-2be5f6c5c9a980c37debbf2c3fcb9fd723f01b61.zip tk-2be5f6c5c9a980c37debbf2c3fcb9fd723f01b61.tar.gz tk-2be5f6c5c9a980c37debbf2c3fcb9fd723f01b61.tar.bz2 |
Some more fixes for Cygwin32/64 in win32 GUI mode.
Now that this is fully working, eliminate all usage of WISH_BUILD_LIB_SPEC: TK_BUILD_LIB_SPEC can be used everywhere in stead.
Add tk.pc
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tkTest.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkTest.c b/generic/tkTest.c index 9fe2222..d06769d 100644 --- a/generic/tkTest.c +++ b/generic/tkTest.c @@ -164,7 +164,7 @@ static int TestfontObjCmd(ClientData dummy, Tcl_Obj *const objv[]); static int TestmakeexistCmd(ClientData dummy, Tcl_Interp *interp, int argc, const char **argv); -#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) +#if !(defined(__WIN32__) || defined(MAC_OSX_TK) || defined(__CYGWIN__)) static int TestmenubarCmd(ClientData dummy, Tcl_Interp *interp, int argc, const char **argv); #endif @@ -190,7 +190,7 @@ static void CustomOptionFree(ClientData clientData, Tk_Window tkwin, char *internalPtr); static int TestpropCmd(ClientData dummy, Tcl_Interp *interp, int argc, const char **argv); -#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) +#if !(defined(__WIN32__) || defined(MAC_OSX_TK) || defined(__CYGWIN__)) static int TestwrapperCmd(ClientData dummy, Tcl_Interp *interp, int argc, const char **argv); #endif @@ -277,7 +277,7 @@ Tktest_Init( #if defined(__WIN32__) || defined(MAC_OSX_TK) Tcl_CreateCommand(interp, "testmetrics", TestmetricsCmd, (ClientData) Tk_MainWindow(interp), NULL); -#else +#elif !defined(__CYGWIN__) Tcl_CreateCommand(interp, "testmenubar", TestmenubarCmd, (ClientData) Tk_MainWindow(interp), NULL); Tcl_CreateCommand(interp, "testsend", TkpTestsendCmd, @@ -1813,7 +1813,7 @@ TestmakeexistCmd( */ /* ARGSUSED */ -#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) +#if !(defined(__WIN32__) || defined(MAC_OSX_TK) || defined(__CYGWIN__)) static int TestmenubarCmd( ClientData clientData, /* Main window for application. */ @@ -2016,7 +2016,7 @@ TestpropCmd( return TCL_OK; } -#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) +#if !(defined(__WIN32__) || defined(MAC_OSX_TK) || defined(__CYGWIN__)) /* *---------------------------------------------------------------------- * |