Mercurial > nand-ecoscentric
changeset 646:9af89f295088
* standalone/wxwin/makefile.gnu:
Use libtcl.a rather than libcygtcl83.a for Cygwin build
* standalone/wxwin/admindlg.cpp:
Accommodate const char * returned by Tcl_SetVar() and
Tcl_GetStringResult() in Tcl 8.4.
* standalone/wxwin/configtool.cpp: Call Tcl_FindExecutable().
| author | jld |
|---|---|
| date | Wed, 19 Feb 2003 09:29:24 +0000 |
| parents | a716206b0987 |
| children | bf939f3a422a |
| files | host/tools/configtool/ChangeLog host/tools/configtool/standalone/wxwin/admindlg.cpp host/tools/configtool/standalone/wxwin/configtool.cpp host/tools/configtool/standalone/wxwin/makefile.gnu |
| diffstat | 4 files changed, 19 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/host/tools/configtool/ChangeLog +++ b/host/tools/configtool/ChangeLog @@ -1,3 +1,14 @@ +2003-02-19 John Dallaway <jld@ecoscentric.com> + + * standalone/wxwin/makefile.gnu: + Use libtcl.a rather than libcygtcl83.a for Cygwin build + + * standalone/wxwin/admindlg.cpp: + Accommodate const char * returned by Tcl_SetVar() and + Tcl_GetStringResult() in Tcl 8.4. + + * standalone/wxwin/configtool.cpp: Call Tcl_FindExecutable(). + 2003-02-17 John Dallaway <jld@ecoscentric.com> * standalone/wxwin/mainwin.cpp: Update path to configtool HTML docs.
--- a/host/tools/configtool/standalone/wxwin/admindlg.cpp +++ b/host/tools/configtool/standalone/wxwin/admindlg.cpp @@ -529,12 +529,12 @@ bool ecAdminDialog::EvalTclFile(int narg Tcl_SetStdChannel (outchan, TCL_STDOUT); // direct standard output to NUL: #endif - char * pszStatus = Tcl_SetVar (interp, "argv0", (char*) argv0.c_str(), 0); + const char * pszStatus = Tcl_SetVar (interp, "argv0", (char*) argv0.c_str(), 0); pszStatus = Tcl_SetVar (interp, "argv", (char*) argv.c_str(), 0); pszStatus = Tcl_SetVar (interp, "argc", (char*) argc.c_str(), 0); pszStatus = Tcl_SetVar (interp, "gui_mode", "1", 0); // return errors in result string int nStatus = Tcl_EvalFile (interp, (char*) argv0.c_str()); - char* result = Tcl_GetStringResult (interp); + const char* result = Tcl_GetStringResult (interp); #ifdef __WXMSW__ Tcl_SetStdChannel (NULL, TCL_STDOUT);
--- a/host/tools/configtool/standalone/wxwin/configtool.cpp +++ b/host/tools/configtool/standalone/wxwin/configtool.cpp @@ -163,7 +163,7 @@ bool ecApp::OnInit() CeCosSocket::Init(); CeCosTestPlatform::Load(); - + wxHelpProvider::Set(new wxSimpleHelpProvider); //wxHelpProvider::Set(new wxHelpControllerHelpProvider(& m_helpController)); @@ -175,6 +175,9 @@ bool ecApp::OnInit() wxFileSystem::AddHandler(m_zipHandler); #endif + // Mandatory initialisation for Tcl 8.4 + Tcl_FindExecutable(argv[0]); + wxString currentDir = wxGetCwd(); // Use argv to get current app directory
--- a/host/tools/configtool/standalone/wxwin/makefile.gnu +++ b/host/tools/configtool/standalone/wxwin/makefile.gnu @@ -21,18 +21,17 @@ EXTRACPPFLAGS=\ -I$(ECOSSRCDIR)/tools/Utils/common \ -I$(ECOSSRCDIR)/tools/ecostest/common \ -DecUSE_EXPERIMENTAL_CODE=$(USEEXPERIMENTALCODE) +EXTRALDFLAGS=-L$(INSTALLDIR)/lib -lcdl -lcyginfra -ltcl ifeq "$(OSTYPE)" "cygwin" PROGRAM=configtool.exe CPPFLAGS=-I$(WXDIR)/include -I$(WXDIR)/lib/wx/include -DSTRICT -DWINVER=0x0400 -D_WIN32 -D__GNUWIN32__ -D__WIN95__ -D__WIN32__ -D_X86_=1 -DWIN32 LDFLAGS=-L$(WXDIR)/lib -lwx -lstdc++ -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32 -lglu32 -lgdi32 -lcomdlg32 -lole32 -luuid -lshlwapi -lpng -lzlib - EXTRALDFLAGS=-L$(INSTALLDIR)/lib -lcdl -lcyginfra -lcygtcl83 EXTRAOBJECTS=$(CTBUILDDIR)/configtoolres.o else PROGRAM=configtool - CPPFLAGS=-I$(WXDIR)/include -I$(WXDIR)/lib/wx/include -DGTK_NO_CHECK_CASTS -D__WXGTK__ + CPPFLAGS=-I$(WXDIR)/include -I$(WXDIR)/lib/wx/include -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D__USE_WXCONFIG__ LDFLAGS=-L$(WXDIR)/lib -L/usr/lib -L/usr/X11R6/lib -lwx_gtk -lgtk -lgdk -rdynamic -lgmodule -lgthread -lglib -lpthread -ldl -lXi -lXext -lX11 -lm - EXTRALDFLAGS=-L$(INSTALLDIR)/lib -lcdl -lcyginfra -ltcl EXTRAOBJECTS= endif