This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Allow the building of configtool against an alternative Tcl library
- From: John Dallaway <jld at ecoscentric dot com>
- To: ecos-patches at sources dot redhat dot com
- Date: Fri, 21 Feb 2003 16:31:05 +0000
- Subject: Allow the building of configtool against an alternative Tcl library
- Organization: eCosCentric Limited
The appended patch allows the configtool to be built against an alternative
installation of the Tcl/Tk libraries rather than the default installation on
the implicit path.
John Dallaway
eCosCentric Limited
--cut here--
Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/ChangeLog,v
retrieving revision 1.35
diff -u -5 -r1.35 ChangeLog
--- ChangeLog 19 Feb 2003 16:15:37 -0000 1.35
+++ ChangeLog 21 Feb 2003 15:42:22 -0000
@@ -1,5 +1,10 @@
+2003-02-21 John Dallaway <jld at ecoscentric dot com>
+
+ * standalone/wxwin/makefile.gnu: Allow a specific installation of Tcl/Tk
+ to be referenced using "make TCLDIR=/path/to/tcl".
+
2003-02-19 John Dallaway <jld at ecoscentric dot com>
* standalone/wxwin/platformeditordlg.cpp:
Fix erroneously disabled OK button and duplicate entries in prefix list.
Index: standalone/wxwin/makefile.gnu
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/makefile.gnu,v
retrieving revision 1.3
diff -u -5 -r1.3 makefile.gnu
--- standalone/wxwin/makefile.gnu 19 Feb 2003 09:29:24 -0000 1.3
+++ standalone/wxwin/makefile.gnu 21 Feb 2003 15:42:39 -0000
@@ -4,26 +4,28 @@
# Usage:
# cd emptydir
# make -f /path/to/this/makefile WXDIR=/path/to/wx/installation ECOSSRCDIR=/path/to/ecos/tools/src OSTYPE=$OSTYPE
+TCLDIR=/usr
WXDIR=WXDIR_not_defined
ECOSSRCDIR=ECOSSRCDIR_not_defined
CTBUILDDIR=$(shell pwd)
CTDIR=$(ECOSSRCDIR)/tools/configtool/standalone/wxwin
INSTALLDIR=$(ECOSSRCDIR)/..
LEVEL=release
USEEXPERIMENTALCODE=1
EXTRACPPFLAGS=\
+ -I$(TCLDIR)/include \
-I$(INSTALLDIR)/include \
-I$(ECOSSRCDIR)/tools/configtool/common/common \
-I$(ECOSSRCDIR)/tools/Utils/common \
-I$(ECOSSRCDIR)/tools/ecostest/common \
-DecUSE_EXPERIMENTAL_CODE=$(USEEXPERIMENTALCODE)
-EXTRALDFLAGS=-L$(INSTALLDIR)/lib -lcdl -lcyginfra -ltcl
+EXTRALDFLAGS=-L$(TCLDIR)/lib -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