Please enter the commit message for your changes. Lines starting

[eos/base.git] / util / src / TclTk / Makefile

diff --git a/util/src/TclTk/Makefile b/util/src/TclTk/Makefile
index 66dd3b4..b0dfc8f 100755 (executable)
--- a/util/src/TclTk/Makefile
+++ b/util/src/TclTk/Makefile
@@ -30,9 +30,13 @@ TCLLIBWHERE=http://sourceforge.net/projects/tcllib/files/tcllib/$(TCLLIBVERSION/
 
 ### BLT
 BLTVERSION=2.5.3
+#BLTVERSION=3.2.23
+#BLTNAME=blt-src-$(BLTVERSION)
 BLTNAME=blt-src-$(BLTVERSION)
 BLTNAMEDIR=blt2.5
+#BLTNAMEDIR=wjoye-tkblt-2c9ea39
 BLTWHERE=http://sourceforge.net/projects/wize/files/$(BLTNAME).zip/download
+#BLTWHERE=https://sourceforge.net/projects/tkblt/files/V$(BLTVERSION)/V$(BLTVERSION).tar.gz
 
 ### VTK
 #VTKVERSION1=Nighty
@@ -43,6 +47,11 @@ VTKNAME=VTK-$(VTKVERSION)
 VTKWHERE=http://www.vtk.org/files/release/6.3/
 #VTKWHERE=http://www.vtk.org/files/release/6.2/
 
+help::
+       @echo "make tcl"
+       @echo "make tk"
+       @echo "make BLT"
+
 tcl::
        make TclCheck
        make TclConfig
@@ -84,8 +93,8 @@ TkImgCheck::
 BLTCheck::
        #@ln -s ../../src/TclTk/BLT$(BLTVERSION).tar.gz .
        #@gzip -dc BLT$(BLTVERSION).tar.gz | tar xvf - 
-       curl -L $(BLTWHERE) > $(BLTNAME).zip
-       unzip $(BLTNAME).zip
+       curl -L $(BLTWHERE) > $(BLTNAME).tar.gz
+       tar xvzf $(BLTNAME).tar.gz
 
 TcllibCheck::
        curl -L $(TCLLIBWHERE) > $(TCLLIBNAME).zip
@@ -106,7 +115,7 @@ VTKCheck::
 TclConfig::
        cd tcl$(TCLVERSION)/unix ; \
        ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
-                           --enable-shared --enable-threads
+                           --enable-shared --enable-threads --enable-symbols
        #./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
        #                   --enable-shared --enable-symbol \
        #                       --enable-threads
@@ -115,7 +124,7 @@ TkConfig::
        cd tk$(TKVERSION)/unix  ; \
        ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
                                --with-tcl=../../tcl$(TCLVERSION)/unix \
-                               --with-libtiff --enable-symbol --enable-shared \
+                               --with-libtiff --enable-symbol --enable-shared --enable-symbols \
                                --with-x --x-libraries=/opt/X11/lib --x-includes=/opt/X11/include --with-gnu-ld
 
 TkImgConfig::
@@ -125,9 +134,14 @@ TkImgConfig::
                                --with-tk=${EOS_HOME}/util/src$(OSTYPE)/TclTk/tk$(TKVERSION)/unix  \
 
 BLTConfig::
-       cd $(BLTNAMEDIR); \
-       $(MAKE) clean; \
-       ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
+       #cd $(BLTNAMEDIR); ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
+                               --with-tcl=${EOS_HOME}/util/$(OSTYPE)  \
+                               --with-tk=${EOS_HOME}/util/$(OSTYPE) \
+                               --enable-jpeg=${EOS_HOME}/util/$(OSTYPE) \
+                               --enable-shared \
+                               --with-cflags="-DUSE_INTERP_ERRORLINE -DUSE_INTERP_RESULT -DSIZEOF_VOID_P=8" \
+                               --with-x --x-libraries=/opt/X11/lib --x-includes=/opt/X11/include --with-gnu-ld
+       cd $(BLTNAMEDIR) ; ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
                                --with-tcl=../tcl$(TCLVERSION)/unix \
                                --with-tk=../tk$(TKVERSION)/unix  \
                                --enable-jpeg=${EOS_HOME}/util/$(OSTYPE) \
@@ -184,7 +198,7 @@ TkImg::
 
 BLTAll::
        @cd $(BLTNAMEDIR); \
-       CPPFLAGS="-DUSE_INTERP_ERRORLINE -DUSE_INTERP_RESULT" $(MAKE) install  ; \
+       CPPFLAGS="-DUSE_INTERP_ERRORLINE -DUSE_INTERP_RESULT -DSIZEOF_VOID_P=8" $(MAKE) install  ; \
        cp generic/bltOldConfig.h ${EOS_HOME}/util/$(OSTYPE)/include/ ; \
        # $(MAKE) INSTALL=${EOS_HOME}/sbin/eosinstall install 
 
@@ -218,7 +232,7 @@ TkCleanAll::
 
 
 BLTClean::
-       @cd blt$(BLTVERSION); \
+       @cd $(BLTNAMEDIR); \
        $(MAKE) distclean
 
 BLTCleanAll::