Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | add VecTcl to undroidwish build |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
80ab44a8d9ba0e6df93f07c233d7599c |
User & Date: | chw 2016-11-07 14:11:08.583 |
References
2016-11-07
| ||
19:16 | add missing file of check-in [80ab44a8d9] check-in: d472298464 user: chw tags: trunk | |
Context
2016-11-07
| ||
19:16 | add missing file of check-in [80ab44a8d9] check-in: d472298464 user: chw tags: trunk | |
14:11 | add VecTcl to undroidwish build check-in: 80ab44a8d9 user: chw tags: trunk | |
06:02 | update [undroidwish] win32 build scripts for libressl 2.4.3 check-in: a267606475 user: chw tags: trunk | |
Changes
Changes to assets/vectcl0.3/demo/vectcl2015demo.tcl.
1 2 3 4 5 6 7 8 9 10 11 12 | package require vectcl namespace import vectcl::* package require Tk package require Img package require vectcl::tk package require snit package require ctext catch { package require borg borg screenorientation landscape | < > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | package require vectcl namespace import vectcl::* package require Tk package require Img package require vectcl::tk package require snit package require ctext catch { package require borg borg screenorientation landscape bind all <Break> exit } if {[info command sdltk] eq "sdltk"} { wm attributes . -fullscreen 1 } set samplecode { ParametricPlot { code { # square grid. Pull the sliders 1 and 2 # to change the wavelength sin(r1.*x).*sin(r2.*y) |
︙ | ︙ |
Changes to jni/VecTcl/TkBridge/Makefile.in.
︙ | ︙ | |||
123 124 125 126 127 128 129 | #======================================================================== # TCLLIBPATH seeds the auto_path in Tcl's init.tcl so we can test our # package without installing. The other environment variables allow us # to test against an uninstalled Tcl. Add special env vars that you # require for testing here (like TCLX_LIBRARY). #======================================================================== | | | | | | 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 | #======================================================================== # TCLLIBPATH seeds the auto_path in Tcl's init.tcl so we can test our # package without installing. The other environment variables allow us # to test against an uninstalled Tcl. Add special env vars that you # require for testing here (like TCLX_LIBRARY). #======================================================================== #EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR) TCLLIBPATH = $(top_builddir) TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` PKG_ENV = @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \ PATH="$(EXTRA_PATH):$(PATH)" \ TCLLIBPATH="$(TCLLIBPATH)" TCLSH_PROG = @TCLSH_PROG@ TCLSH = $(PKG_ENV) $(TCLSH_ENV) $(TCLSH_PROG) #WISH_ENV = TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` #WISH_PROG = @WISH_PROG@ #WISH = $(PKG_ENV) $(TCLSH_ENV) $(WISH_ENV) $(WISH_PROG) SHARED_BUILD = @SHARED_BUILD@ #INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@ PKG_CFLAGS = @PKG_CFLAGS@ # TCL_DEFS is not strictly need here, but if you remove it, then you # must make sure that configure.in checks for the necessary components # that your library may use. TCL_DEFS can actually be a problem if # you do not compile with a similar machine setup as the Tcl core was |
︙ | ︙ |
Changes to jni/VecTcl/TkBridge/configure.
︙ | ︙ | |||
639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 | LDFLAGS_DEFAULT CFLAGS_DEFAULT LD_LIBRARY_PATH_VAR SHLIB_CFLAGS SHLIB_LD_LIBS SHLIB_LD STLIB_LD CFLAGS_WARNING CFLAGS_OPTIMIZE CFLAGS_DEBUG RC CELIB_DIR AR SHARED_BUILD TCL_THREADS TCL_INCLUDES PKG_OBJECTS PKG_SOURCES MATH_LIBS EGREP GREP RANLIB | > > | 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 | LDFLAGS_DEFAULT CFLAGS_DEFAULT LD_LIBRARY_PATH_VAR SHLIB_CFLAGS SHLIB_LD_LIBS SHLIB_LD STLIB_LD CC_OBJNAME CFLAGS_WARNING CFLAGS_OPTIMIZE CFLAGS_DEBUG RC CELIB_DIR AR SHARED_BUILD TCL_THREADS TK_INCLUDES TCL_INCLUDES PKG_OBJECTS PKG_SOURCES MATH_LIBS EGREP GREP RANLIB |
︙ | ︙ | |||
748 749 750 751 752 753 754 755 756 757 758 759 760 761 | SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking with_tcl with_tk with_tclinclude enable_threads enable_shared enable_64bit enable_64bit_vis enable_rpath enable_wince with_celib | > | 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 | SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking with_tcl with_tk with_tclinclude with_tkinclude enable_threads enable_shared enable_64bit enable_64bit_vis enable_rpath enable_wince with_celib |
︙ | ︙ | |||
1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 | Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-tcl directory containing tcl configuration (tclConfig.sh) --with-tk directory containing tk configuration (tkConfig.sh) --with-tclinclude directory containing the public Tcl header files --with-celib=DIR use Windows/CE support library from DIR --with-vectcl directory containing vectcl configuration (vectclConfig.sh) Some influential environment variables: CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a | > | 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 | Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-tcl directory containing tcl configuration (tclConfig.sh) --with-tk directory containing tk configuration (tkConfig.sh) --with-tclinclude directory containing the public Tcl header files --with-tkinclude directory containing the public Tk header files --with-celib=DIR use Windows/CE support library from DIR --with-vectcl directory containing vectcl configuration (vectclConfig.sh) Some influential environment variables: CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a |
︙ | ︙ | |||
3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself" >&5 $as_echo "$as_me: WARNING: --with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself" >&2;} with_tkconfig="`echo "${with_tkconfig}" | sed 's!/tkConfig\.sh$!!'`" fi ;; esac if test -f "${with_tkconfig}/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd "${with_tkconfig}"; pwd)`" else as_fn_error $? "${with_tkconfig} directory doesn't contain tkConfig.sh" "$LINENO" 5 fi fi # then check for a private Tk library if test x"${ac_cv_c_tkconfig}" = x ; then | > > | 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself" >&5 $as_echo "$as_me: WARNING: --with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself" >&2;} with_tkconfig="`echo "${with_tkconfig}" | sed 's!/tkConfig\.sh$!!'`" fi ;; esac if test -f "${with_tkconfig}/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd "${with_tkconfig}"; pwd)`" elif test -f "${with_tkconfig}/sdl2tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd "${with_tkconfig}"; pwd)`" else as_fn_error $? "${with_tkconfig} directory doesn't contain tkConfig.sh" "$LINENO" 5 fi fi # then check for a private Tk library if test x"${ac_cv_c_tkconfig}" = x ; then |
︙ | ︙ | |||
3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 | -a -f "$i/win/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/win; pwd)`" break fi if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/unix; pwd)`" break fi done fi # on Darwin, check in Framework installation locations if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tkconfig}" = x ; then for i in `ls -d ~/Library/Frameworks 2>/dev/null` \ | > > > > | 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 | -a -f "$i/win/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/win; pwd)`" break fi if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/unix; pwd)`" break fi if test -f "$i/sdl/sdl2tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/sdl; pwd)`" break fi done fi # on Darwin, check in Framework installation locations if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tkconfig}" = x ; then for i in `ls -d ~/Library/Frameworks 2>/dev/null` \ |
︙ | ︙ | |||
3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 | ac_cv_c_tkconfig="`(cd $i/win; pwd)`" break fi if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/unix; pwd)`" break fi done fi fi if test x"${ac_cv_c_tkconfig}" = x ; then | > > > > | 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 | ac_cv_c_tkconfig="`(cd $i/win; pwd)`" break fi if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/unix; pwd)`" break fi if test -f "$i/sdl/sdl2tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/sdl; pwd)`" break fi done fi fi if test x"${ac_cv_c_tkconfig}" = x ; then |
︙ | ︙ | |||
3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${TK_BIN_DIR}/tkConfig.sh" >&5 $as_echo_n "checking for existence of ${TK_BIN_DIR}/tkConfig.sh... " >&6; } if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 $as_echo "loading" >&6; } . "${TK_BIN_DIR}/tkConfig.sh" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not find ${TK_BIN_DIR}/tkConfig.sh" >&5 $as_echo "could not find ${TK_BIN_DIR}/tkConfig.sh" >&6; } fi # eval is required to do the TK_DBGX substitution eval "TK_LIB_FILE=\"${TK_LIB_FILE}\"" | > > > > | 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${TK_BIN_DIR}/tkConfig.sh" >&5 $as_echo_n "checking for existence of ${TK_BIN_DIR}/tkConfig.sh... " >&6; } if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 $as_echo "loading" >&6; } . "${TK_BIN_DIR}/tkConfig.sh" elif test -f "${TK_BIN_DIR}/sdl2tkConfig.sh" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 $as_echo "loading" >&6; } . "${TK_BIN_DIR}/sdl2tkConfig.sh" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not find ${TK_BIN_DIR}/tkConfig.sh" >&5 $as_echo "could not find ${TK_BIN_DIR}/tkConfig.sh" >&6; } fi # eval is required to do the TK_DBGX substitution eval "TK_LIB_FILE=\"${TK_LIB_FILE}\"" |
︙ | ︙ | |||
3609 3610 3611 3612 3613 3614 3615 | # eval is required to do the TK_DBGX substitution eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}\"" eval "TK_LIB_SPEC=\"${TK_LIB_SPEC}\"" eval "TK_STUB_LIB_FLAG=\"${TK_STUB_LIB_FLAG}\"" eval "TK_STUB_LIB_SPEC=\"${TK_STUB_LIB_SPEC}\"" # TEA specific: Ensure windowingsystem is defined | > > > > > > > > | | 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 | # eval is required to do the TK_DBGX substitution eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}\"" eval "TK_LIB_SPEC=\"${TK_LIB_SPEC}\"" eval "TK_STUB_LIB_FLAG=\"${TK_STUB_LIB_FLAG}\"" eval "TK_STUB_LIB_SPEC=\"${TK_STUB_LIB_SPEC}\"" # TEA specific: Ensure windowingsystem is defined case ${TK_DEFS} in *PLATFORM_SDL*) TEA_WINDOWINGSYSTEM="x11" TEA_USE_SDL=yes ;; esac if test "${TEA_USE_SDL}" = "yes" ; then true elif test "${TEA_PLATFORM}" = "unix" ; then case ${TK_DEFS} in *MAC_OSX_TK*) $as_echo "#define MAC_OSX_TK 1" >>confdefs.h TEA_WINDOWINGSYSTEM="aqua" ;; |
︙ | ︙ | |||
5543 5544 5545 5546 5547 5548 5549 | ;; *) # check for existence - allows for generic/win/unix VPATH # To add more dirs here (like 'src'), you have to update VPATH # in Makefile.in as well if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ | | | 5569 5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580 5581 5582 5583 | ;; *) # check for existence - allows for generic/win/unix VPATH # To add more dirs here (like 'src'), you have to update VPATH # in Makefile.in as well if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ -a ! -f "${srcdir}/macosx/$i" -a ! -f "${srcdir}/sdl/$i" \ ; then as_fn_error $? "could not find source file '$i'" "$LINENO" 5 fi PKG_SOURCES="$PKG_SOURCES $i" # this assumes it is in a VPATH dir i=`basename $i` # handle user calling this before or after TEA_SETUP_COMPILER |
︙ | ︙ | |||
5602 5603 5604 5605 5606 5607 5608 | vars="" for i in $vars; do # check for existence - allows for generic/win/unix VPATH if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ | | | 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642 | vars="" for i in $vars; do # check for existence - allows for generic/win/unix VPATH if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ -a ! -f "${srcdir}/macosx/$i" -a ! -f "${srcdir}/sdl/$i" \ ; then as_fn_error $? "could not find stub source file '$i'" "$LINENO" 5 fi PKG_STUB_SOURCES="$PKG_STUB_SOURCES $i" # this assumes it is in a VPATH dir i=`basename $i` # handle user calling this before or after TEA_SETUP_COMPILER |
︙ | ︙ | |||
5752 5753 5754 5755 5756 5757 5758 | TCL_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" #TEA_PRIVATE_TCL_HEADERS | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 5778 5779 5780 5781 5782 5783 5784 5785 5786 5787 5788 5789 5790 5791 5792 5793 5794 5795 5796 5797 5798 5799 5800 5801 5802 5803 5804 5805 5806 5807 5808 5809 5810 5811 5812 5813 5814 5815 5816 5817 5818 5819 5820 5821 5822 5823 5824 5825 5826 5827 5828 5829 5830 5831 5832 5833 5834 5835 5836 5837 5838 5839 5840 5841 5842 5843 5844 5845 5846 5847 5848 5849 5850 5851 5852 5853 5854 5855 5856 5857 5858 5859 5860 5861 5862 5863 5864 5865 5866 5867 5868 5869 5870 5871 5872 5873 5874 5875 5876 5877 5878 5879 5880 5881 5882 5883 5884 5885 5886 5887 5888 5889 5890 5891 | TCL_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" #TEA_PRIVATE_TCL_HEADERS { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tk public headers" >&5 $as_echo_n "checking for Tk public headers... " >&6; } # Check whether --with-tkinclude was given. if test "${with_tkinclude+set}" = set; then : withval=$with_tkinclude; with_tkinclude=${withval} fi if ${ac_cv_c_tkh+:} false; then : $as_echo_n "(cached) " >&6 else # Use the value from --with-tkinclude, if it was given if test x"${with_tkinclude}" != x ; then if test -f "${with_tkinclude}/tk.h" ; then ac_cv_c_tkh=${with_tkinclude} else as_fn_error $? "${with_tkinclude} directory does not contain tk.h" "$LINENO" 5 fi else list="" if test "`uname -s`" = "Darwin"; then # If Tk was built as a framework, attempt to use # the framework's Headers directory. case ${TK_DEFS} in *TK_FRAMEWORK*) list="`ls -d ${TK_BIN_DIR}/Headers 2>/dev/null`" ;; esac fi # Look in the source dir only if Tk is not installed, # and in that situation, look there before installed locations. if test -f "${TK_BIN_DIR}/Makefile" ; then list="$list `ls -d ${TK_SRC_DIR}/generic 2>/dev/null`" fi # Check order: pkg --prefix location, Tk's --prefix location, # relative to directory of tkConfig.sh, Tcl's --prefix location, # relative to directory of tclConfig.sh. eval "temp_includedir=${includedir}" list="$list \ `ls -d ${temp_includedir} 2>/dev/null` \ `ls -d ${TK_PREFIX}/include 2>/dev/null` \ `ls -d ${TK_BIN_DIR}/../include 2>/dev/null` \ `ls -d ${TCL_PREFIX}/include 2>/dev/null` \ `ls -d ${TCL_BIN_DIR}/../include 2>/dev/null`" if test "${TEA_PLATFORM}" != "windows" -o "$GCC" = "yes"; then list="$list /usr/local/include /usr/include" if test x"${TK_INCLUDE_SPEC}" != x ; then d=`echo "${TK_INCLUDE_SPEC}" | sed -e 's/^-I//'` list="$list `ls -d ${d} 2>/dev/null`" fi fi for i in $list ; do if test -f "$i/tk.h" ; then ac_cv_c_tkh=$i break fi done fi fi # Print a message based on how we determined the include path if test x"${ac_cv_c_tkh}" = x ; then as_fn_error $? "tk.h not found. Please specify its location with --with-tkinclude" "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_c_tkh}" >&5 $as_echo "${ac_cv_c_tkh}" >&6; } fi # Convert to a native path and substitute into the output files. INCLUDE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tkh}` TK_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" if test "${TEA_WINDOWINGSYSTEM}" != "x11" -o "${TEA_USE_SDL}" = "yes" ; then # On Windows and Aqua, we need the X compat headers { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 header files" >&5 $as_echo_n "checking for X11 header files... " >&6; } if test ! -r "${INCLUDE_DIR_NATIVE}/X11/Xlib.h"; then INCLUDE_DIR_NATIVE="`${CYGPATH} ${TK_SRC_DIR}/xlib`" TK_XINCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${INCLUDE_DIR_NATIVE}" >&5 $as_echo "${INCLUDE_DIR_NATIVE}" >&6; } fi #TEA_PRIVATE_TK_HEADERS #TEA_PATH_X #-------------------------------------------------------------------- # Check whether --enable-threads or --disable-threads was given. # This auto-enables if Tcl was compiled threaded. #-------------------------------------------------------------------- |
︙ | ︙ | |||
6395 6396 6397 6398 6399 6400 6401 6402 6403 6404 6405 6406 6407 6408 | else CFLAGS_OPTIMIZE=-O CFLAGS_WARNING="" fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 | > | 6520 6521 6522 6523 6524 6525 6526 6527 6528 6529 6530 6531 6532 6533 6534 | else CFLAGS_OPTIMIZE=-O CFLAGS_WARNING="" fi CC_OBJNAME="-o \$@" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 |
︙ | ︙ | |||
6887 6888 6889 6890 6891 6892 6893 6894 6895 6896 6897 6898 6899 6900 | # For information on what debugtype is most useful, see: # http://msdn.microsoft.com/library/en-us/dnvc60/html/gendepdebug.asp # and also # http://msdn2.microsoft.com/en-us/library/y0zzbyt4%28VS.80%29.aspx # This essentially turns it all on. LDFLAGS_DEBUG="-debug -debugtype:cv" LDFLAGS_OPTIMIZE="-release" if test "$doWince" != "no" ; then LDFLAGS_CONSOLE="-link ${lflags}" LDFLAGS_WINDOW=${LDFLAGS_CONSOLE} else LDFLAGS_CONSOLE="-link -subsystem:console ${lflags}" LDFLAGS_WINDOW="-link -subsystem:windows ${lflags}" fi | > > > | 7013 7014 7015 7016 7017 7018 7019 7020 7021 7022 7023 7024 7025 7026 7027 7028 7029 | # For information on what debugtype is most useful, see: # http://msdn.microsoft.com/library/en-us/dnvc60/html/gendepdebug.asp # and also # http://msdn2.microsoft.com/en-us/library/y0zzbyt4%28VS.80%29.aspx # This essentially turns it all on. LDFLAGS_DEBUG="-debug -debugtype:cv" LDFLAGS_OPTIMIZE="-release" CFLAGS_DEBUG="${CFLAGS_DEBUG} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" CC_OBJNAME="-Fo\$@" if test "$doWince" != "no" ; then LDFLAGS_CONSOLE="-link ${lflags}" LDFLAGS_WINDOW=${LDFLAGS_CONSOLE} else LDFLAGS_CONSOLE="-link -subsystem:console ${lflags}" LDFLAGS_WINDOW="-link -subsystem:windows ${lflags}" fi |
︙ | ︙ | |||
7278 7279 7280 7281 7282 7283 7284 | SHLIB_SUFFIX=".so" # TEA specific: CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT}' | > > > > > > > > > > | > | 7407 7408 7409 7410 7411 7412 7413 7414 7415 7416 7417 7418 7419 7420 7421 7422 7423 7424 7425 7426 7427 7428 7429 7430 7431 7432 | SHLIB_SUFFIX=".so" # TEA specific: CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT}' # workaround when cross-compiling for Win32: no -fPIC and -Wl,... if test "${TCL_SHLIB_SUFFIX}" = ".dll" ; then SHLIB_CFLAGS="" SHLIB_SUFFIX=".dll" DL_OBJS="" DL_LIBS="" TCL_LIB_VERSIONS_OK=nodots SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.dll' UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' else LDFLAGS="$LDFLAGS -Wl,--export-dynamic" fi if test $doRpath = yes; then : CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' fi LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} if test "`uname -m`" = "alpha"; then : CFLAGS="$CFLAGS -mieee" |
︙ | ︙ | |||
8262 8263 8264 8265 8266 8267 8268 8269 8270 8271 8272 8273 8274 8275 | # These must be called after we do the basic CFLAGS checks and # verify any possible 64-bit or similar switches are necessary { $as_echo "$as_me:${as_lineno-$LINENO}: checking for required early compiler flags" >&5 $as_echo_n "checking for required early compiler flags... " >&6; } tcl_flags="" | > | 8402 8403 8404 8405 8406 8407 8408 8409 8410 8411 8412 8413 8414 8415 8416 | # These must be called after we do the basic CFLAGS checks and # verify any possible 64-bit or similar switches are necessary { $as_echo "$as_me:${as_lineno-$LINENO}: checking for required early compiler flags" >&5 $as_echo_n "checking for required early compiler flags... " >&6; } tcl_flags="" |
︙ | ︙ | |||
8955 8956 8957 8958 8959 8960 8961 | $EGREP "manifest needed" >/dev/null 2>&1; then : # Could do a CHECK_PROG for mt, but should always be with MSVC8+ VC_MANIFEST_EMBED_DLL="if test -f \$@.manifest ; then mt.exe -nologo -manifest \$@.manifest -outputresource:\$@\;2 ; fi" VC_MANIFEST_EMBED_EXE="if test -f \$@.manifest ; then mt.exe -nologo -manifest \$@.manifest -outputresource:\$@\;1 ; fi" MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}" | > > > > > | | 9096 9097 9098 9099 9100 9101 9102 9103 9104 9105 9106 9107 9108 9109 9110 9111 9112 9113 9114 9115 | $EGREP "manifest needed" >/dev/null 2>&1; then : # Could do a CHECK_PROG for mt, but should always be with MSVC8+ VC_MANIFEST_EMBED_DLL="if test -f \$@.manifest ; then mt.exe -nologo -manifest \$@.manifest -outputresource:\$@\;2 ; fi" VC_MANIFEST_EMBED_EXE="if test -f \$@.manifest ; then mt.exe -nologo -manifest \$@.manifest -outputresource:\$@\;1 ; fi" MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}" # Don't clean .manifest provided by the package (see TEA_ADD_MANIFEST) # or one created by Makefile or configure. Could use the /manifest:filename # linker option to explicitly set the linker-generated filename. eval eval "manifest=${PACKAGE_NAME}${SHARED_LIB_SUFFIX}.manifest" CLEANFILES="$CLEANFILES $manifest" fi rm -f conftest* MAKE_STUB_LIB="\${STLIB_LD} -nodefaultlib -out:\$@ \$(PKG_STUB_OBJECTS)" else |
︙ | ︙ |
Changes to jni/VecTcl/TkBridge/configure.in.
︙ | ︙ | |||
112 113 114 115 116 117 118 | # notice. # This MUST be called after TEA_LOAD_TCLCONFIG / TEA_LOAD_TKCONFIG #-------------------------------------------------------------------- TEA_PUBLIC_TCL_HEADERS #TEA_PRIVATE_TCL_HEADERS | | | 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | # notice. # This MUST be called after TEA_LOAD_TCLCONFIG / TEA_LOAD_TKCONFIG #-------------------------------------------------------------------- TEA_PUBLIC_TCL_HEADERS #TEA_PRIVATE_TCL_HEADERS TEA_PUBLIC_TK_HEADERS #TEA_PRIVATE_TK_HEADERS #TEA_PATH_X #-------------------------------------------------------------------- # Check whether --enable-threads or --disable-threads was given. # This auto-enables if Tcl was compiled threaded. #-------------------------------------------------------------------- |
︙ | ︙ |
Changes to jni/VecTcl/TkBridge/tclconfig/README.txt.
︙ | ︙ | |||
19 20 21 22 23 24 25 | README.txt This file install-sh Program used for copying binaries and script files to their install locations. tcl.m4 Collection of Tcl autoconf macros. Included by a package's | | | 19 20 21 22 23 24 25 26 | README.txt This file install-sh Program used for copying binaries and script files to their install locations. tcl.m4 Collection of Tcl autoconf macros. Included by a package's aclocal.m4 to define SC_* macros. |
Changes to jni/VecTcl/TkBridge/tclconfig/tcl.m4.
︙ | ︙ | |||
221 222 223 224 225 226 227 228 229 230 231 232 233 234 | if test -f "${with_tkconfig}"; then AC_MSG_WARN([--with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself]) with_tkconfig="`echo "${with_tkconfig}" | sed 's!/tkConfig\.sh$!!'`" fi ;; esac if test -f "${with_tkconfig}/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd "${with_tkconfig}"; pwd)`" else AC_MSG_ERROR([${with_tkconfig} directory doesn't contain tkConfig.sh]) fi fi # then check for a private Tk library if test x"${ac_cv_c_tkconfig}" = x ; then | > > | 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 | if test -f "${with_tkconfig}"; then AC_MSG_WARN([--with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself]) with_tkconfig="`echo "${with_tkconfig}" | sed 's!/tkConfig\.sh$!!'`" fi ;; esac if test -f "${with_tkconfig}/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd "${with_tkconfig}"; pwd)`" elif test -f "${with_tkconfig}/sdl2tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd "${with_tkconfig}"; pwd)`" else AC_MSG_ERROR([${with_tkconfig} directory doesn't contain tkConfig.sh]) fi fi # then check for a private Tk library if test x"${ac_cv_c_tkconfig}" = x ; then |
︙ | ︙ | |||
249 250 251 252 253 254 255 256 257 258 259 260 261 262 | -a -f "$i/win/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/win; pwd)`" break fi if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/unix; pwd)`" break fi done fi # on Darwin, check in Framework installation locations if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tkconfig}" = x ; then for i in `ls -d ~/Library/Frameworks 2>/dev/null` \ | > > > > | 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 | -a -f "$i/win/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/win; pwd)`" break fi if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/unix; pwd)`" break fi if test -f "$i/sdl/sdl2tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/sdl; pwd)`" break fi done fi # on Darwin, check in Framework installation locations if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tkconfig}" = x ; then for i in `ls -d ~/Library/Frameworks 2>/dev/null` \ |
︙ | ︙ | |||
312 313 314 315 316 317 318 319 320 321 322 323 324 325 | -a -f "$i/win/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/win; pwd)`" break fi if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/unix; pwd)`" break fi done fi ]) if test x"${ac_cv_c_tkconfig}" = x ; then TK_BIN_DIR="# no Tk configs found" | > > > > | 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 | -a -f "$i/win/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/win; pwd)`" break fi if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/unix; pwd)`" break fi if test -f "$i/sdl/sdl2tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/sdl; pwd)`" break fi done fi ]) if test x"${ac_cv_c_tkconfig}" = x ; then TK_BIN_DIR="# no Tk configs found" |
︙ | ︙ | |||
465 466 467 468 469 470 471 472 473 474 475 476 477 478 | AC_DEFUN([TEA_LOAD_TKCONFIG], [ AC_MSG_CHECKING([for existence of ${TK_BIN_DIR}/tkConfig.sh]) if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then AC_MSG_RESULT([loading]) . "${TK_BIN_DIR}/tkConfig.sh" else AC_MSG_RESULT([could not find ${TK_BIN_DIR}/tkConfig.sh]) fi # eval is required to do the TK_DBGX substitution eval "TK_LIB_FILE=\"${TK_LIB_FILE}\"" eval "TK_STUB_LIB_FILE=\"${TK_STUB_LIB_FILE}\"" | > > > | 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 | AC_DEFUN([TEA_LOAD_TKCONFIG], [ AC_MSG_CHECKING([for existence of ${TK_BIN_DIR}/tkConfig.sh]) if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then AC_MSG_RESULT([loading]) . "${TK_BIN_DIR}/tkConfig.sh" elif test -f "${TK_BIN_DIR}/sdl2tkConfig.sh" ; then AC_MSG_RESULT([loading]) . "${TK_BIN_DIR}/sdl2tkConfig.sh" else AC_MSG_RESULT([could not find ${TK_BIN_DIR}/tkConfig.sh]) fi # eval is required to do the TK_DBGX substitution eval "TK_LIB_FILE=\"${TK_LIB_FILE}\"" eval "TK_STUB_LIB_FILE=\"${TK_STUB_LIB_FILE}\"" |
︙ | ︙ | |||
513 514 515 516 517 518 519 | # eval is required to do the TK_DBGX substitution eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}\"" eval "TK_LIB_SPEC=\"${TK_LIB_SPEC}\"" eval "TK_STUB_LIB_FLAG=\"${TK_STUB_LIB_FLAG}\"" eval "TK_STUB_LIB_SPEC=\"${TK_STUB_LIB_SPEC}\"" # TEA specific: Ensure windowingsystem is defined | > > > > > > > > | | 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 | # eval is required to do the TK_DBGX substitution eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}\"" eval "TK_LIB_SPEC=\"${TK_LIB_SPEC}\"" eval "TK_STUB_LIB_FLAG=\"${TK_STUB_LIB_FLAG}\"" eval "TK_STUB_LIB_SPEC=\"${TK_STUB_LIB_SPEC}\"" # TEA specific: Ensure windowingsystem is defined case ${TK_DEFS} in *PLATFORM_SDL*) TEA_WINDOWINGSYSTEM="x11" TEA_USE_SDL=yes ;; esac if test "${TEA_USE_SDL}" = "yes" ; then true elif test "${TEA_PLATFORM}" = "unix" ; then case ${TK_DEFS} in *MAC_OSX_TK*) AC_DEFINE(MAC_OSX_TK, 1, [Are we building against Mac OS X TkAqua?]) TEA_WINDOWINGSYSTEM="aqua" ;; *) TEA_WINDOWINGSYSTEM="x11" |
︙ | ︙ | |||
1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 | AS_IF([test "$GCC" = yes], [ CFLAGS_OPTIMIZE=-O2 CFLAGS_WARNING="-Wall" ], [ CFLAGS_OPTIMIZE=-O CFLAGS_WARNING="" ]) AC_CHECK_TOOL(AR, ar) STLIB_LD='${AR} cr' LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH" AS_IF([test "x$SHLIB_VERSION" = x],[SHLIB_VERSION="1.0"]) case $system in # TEA specific: windows) | > | 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 | AS_IF([test "$GCC" = yes], [ CFLAGS_OPTIMIZE=-O2 CFLAGS_WARNING="-Wall" ], [ CFLAGS_OPTIMIZE=-O CFLAGS_WARNING="" ]) CC_OBJNAME="-o \[$]@" AC_CHECK_TOOL(AR, ar) STLIB_LD='${AR} cr' LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH" AS_IF([test "x$SHLIB_VERSION" = x],[SHLIB_VERSION="1.0"]) case $system in # TEA specific: windows) |
︙ | ︙ | |||
1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 | # For information on what debugtype is most useful, see: # http://msdn.microsoft.com/library/en-us/dnvc60/html/gendepdebug.asp # and also # http://msdn2.microsoft.com/en-us/library/y0zzbyt4%28VS.80%29.aspx # This essentially turns it all on. LDFLAGS_DEBUG="-debug -debugtype:cv" LDFLAGS_OPTIMIZE="-release" if test "$doWince" != "no" ; then LDFLAGS_CONSOLE="-link ${lflags}" LDFLAGS_WINDOW=${LDFLAGS_CONSOLE} else LDFLAGS_CONSOLE="-link -subsystem:console ${lflags}" LDFLAGS_WINDOW="-link -subsystem:windows ${lflags}" fi | > > > | 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 | # For information on what debugtype is most useful, see: # http://msdn.microsoft.com/library/en-us/dnvc60/html/gendepdebug.asp # and also # http://msdn2.microsoft.com/en-us/library/y0zzbyt4%28VS.80%29.aspx # This essentially turns it all on. LDFLAGS_DEBUG="-debug -debugtype:cv" LDFLAGS_OPTIMIZE="-release" CFLAGS_DEBUG="${CFLAGS_DEBUG} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" CC_OBJNAME="-Fo\[$]@" if test "$doWince" != "no" ; then LDFLAGS_CONSOLE="-link ${lflags}" LDFLAGS_WINDOW=${LDFLAGS_CONSOLE} else LDFLAGS_CONSOLE="-link -subsystem:console ${lflags}" LDFLAGS_WINDOW="-link -subsystem:windows ${lflags}" fi |
︙ | ︙ | |||
1544 1545 1546 1547 1548 1549 1550 | SHLIB_SUFFIX=".so" # TEA specific: CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT}' | > > > > > > > > > > | > | 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 | SHLIB_SUFFIX=".so" # TEA specific: CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT}' # workaround when cross-compiling for Win32: no -fPIC and -Wl,... if test "${TCL_SHLIB_SUFFIX}" = ".dll" ; then SHLIB_CFLAGS="" SHLIB_SUFFIX=".dll" DL_OBJS="" DL_LIBS="" TCL_LIB_VERSIONS_OK=nodots SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.dll' UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' else LDFLAGS="$LDFLAGS -Wl,--export-dynamic" fi AS_IF([test $doRpath = yes], [ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) AS_IF([test $do64bit = yes], [ AC_CACHE_CHECK([if compiler accepts -m64 flag], tcl_cv_cc_m64, [ hold_cflags=$CFLAGS |
︙ | ︙ | |||
2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 | AC_DEFINE(HAVE_CAST_TO_UNION, 1, [Defined when compiler supports casting to union type.]) fi AC_SUBST(CFLAGS_DEBUG) AC_SUBST(CFLAGS_OPTIMIZE) AC_SUBST(CFLAGS_WARNING) AC_SUBST(STLIB_LD) AC_SUBST(SHLIB_LD) AC_SUBST(SHLIB_LD_LIBS) AC_SUBST(SHLIB_CFLAGS) | > | 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 | AC_DEFINE(HAVE_CAST_TO_UNION, 1, [Defined when compiler supports casting to union type.]) fi AC_SUBST(CFLAGS_DEBUG) AC_SUBST(CFLAGS_OPTIMIZE) AC_SUBST(CFLAGS_WARNING) AC_SUBST(CC_OBJNAME) AC_SUBST(STLIB_LD) AC_SUBST(SHLIB_LD) AC_SUBST(SHLIB_LD_LIBS) AC_SUBST(SHLIB_CFLAGS) |
︙ | ︙ | |||
2360 2361 2362 2363 2364 2365 2366 | # Sets the following vars: # XINCLUDES # XLIBSW # PKG_LIBS (appends to) #-------------------------------------------------------------------- AC_DEFUN([TEA_PATH_X], [ | | | 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 | # Sets the following vars: # XINCLUDES # XLIBSW # PKG_LIBS (appends to) #-------------------------------------------------------------------- AC_DEFUN([TEA_PATH_X], [ if test "${TEA_WINDOWINGSYSTEM}" = "x11" -a "${TEA_USE_SDL}" != "yes" ; then TEA_PATH_UNIX_X fi ]) AC_DEFUN([TEA_PATH_UNIX_X], [ AC_PATH_X not_really_there="" |
︙ | ︙ | |||
2949 2950 2951 2952 2953 2954 2955 | ;; *) # check for existence - allows for generic/win/unix VPATH # To add more dirs here (like 'src'), you have to update VPATH # in Makefile.in as well if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ | | | 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 | ;; *) # check for existence - allows for generic/win/unix VPATH # To add more dirs here (like 'src'), you have to update VPATH # in Makefile.in as well if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ -a ! -f "${srcdir}/macosx/$i" -a ! -f "${srcdir}/sdl/$i" \ ; then AC_MSG_ERROR([could not find source file '$i']) fi PKG_SOURCES="$PKG_SOURCES $i" # this assumes it is in a VPATH dir i=`basename $i` # handle user calling this before or after TEA_SETUP_COMPILER |
︙ | ︙ | |||
2993 2994 2995 2996 2997 2998 2999 | #------------------------------------------------------------------------ AC_DEFUN([TEA_ADD_STUB_SOURCES], [ vars="$@" for i in $vars; do # check for existence - allows for generic/win/unix VPATH if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ | | | 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 | #------------------------------------------------------------------------ AC_DEFUN([TEA_ADD_STUB_SOURCES], [ vars="$@" for i in $vars; do # check for existence - allows for generic/win/unix VPATH if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ -a ! -f "${srcdir}/macosx/$i" -a ! -f "${srcdir}/sdl/$i" \ ; then AC_MSG_ERROR([could not find stub source file '$i']) fi PKG_STUB_SOURCES="$PKG_STUB_SOURCES $i" # this assumes it is in a VPATH dir i=`basename $i` # handle user calling this before or after TEA_SETUP_COMPILER |
︙ | ︙ | |||
3321 3322 3323 3324 3325 3326 3327 | print("manifest needed") #endif ], [ # Could do a CHECK_PROG for mt, but should always be with MSVC8+ VC_MANIFEST_EMBED_DLL="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;2 ; fi" VC_MANIFEST_EMBED_EXE="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;1 ; fi" MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}" | > > > > > | | 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 | print("manifest needed") #endif ], [ # Could do a CHECK_PROG for mt, but should always be with MSVC8+ VC_MANIFEST_EMBED_DLL="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;2 ; fi" VC_MANIFEST_EMBED_EXE="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;1 ; fi" MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}" # Don't clean .manifest provided by the package (see TEA_ADD_MANIFEST) # or one created by Makefile or configure. Could use the /manifest:filename # linker option to explicitly set the linker-generated filename. eval eval "manifest=${PACKAGE_NAME}${SHARED_LIB_SUFFIX}.manifest" TEA_ADD_CLEANFILES([$manifest]) ]) MAKE_STUB_LIB="\${STLIB_LD} -nodefaultlib -out:\[$]@ \$(PKG_STUB_OBJECTS)" else MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(PKG_OBJECTS)" MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}" MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \$(PKG_STUB_OBJECTS)" fi |
︙ | ︙ | |||
3669 3670 3671 3672 3673 3674 3675 | TK_SRC_DIR_NATIVE=`${CYGPATH} ${TK_SRC_DIR}` TK_TOP_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}\" # Check to see if tk<Plat>Port.h isn't already with the public headers # Don't look for tkInt.h because that resides with tk.h in the core # sources, but the <plat>Port headers are in a different directory | > > | > > > > > | | | 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 | TK_SRC_DIR_NATIVE=`${CYGPATH} ${TK_SRC_DIR}` TK_TOP_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}\" # Check to see if tk<Plat>Port.h isn't already with the public headers # Don't look for tkInt.h because that resides with tk.h in the core # sources, but the <plat>Port headers are in a different directory if test -f "${ac_cv_c_tkh}/tkSDLPort.h"; then result="private headers found with public headers" elif test "${TEA_PLATFORM}" = "windows" -a \ -f "${ac_cv_c_tkh}/tkWinPort.h"; then result="private headers found with public headers" elif test "${TEA_PLATFORM}" = "unix" -a \ -f "${ac_cv_c_tkh}/tkUnixPort.h"; then result="private headers found with public headers" else TK_GENERIC_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/generic\" TK_XLIB_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/xlib\" if test "${TEA_PLATFORM}" = "windows"; then TK_PLATFORM_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/win\" else TK_PLATFORM_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/unix\" fi case ${TK_DEFS} in *PLATFORM_SDL*) TK_PLATFORM_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/sdl\" ;; esac # Overwrite the previous TK_INCLUDES as this should capture both # public and private headers in the same set. # We want to ensure these are substituted so as not to require # any *_NATIVE vars be defined in the Makefile TK_INCLUDES="-I${TK_GENERIC_DIR_NATIVE} -I${TK_PLATFORM_DIR_NATIVE}" # Detect and add ttk subdir if test -d "${TK_SRC_DIR}/generic/ttk"; then TK_INCLUDES="${TK_INCLUDES} -I\"${TK_SRC_DIR_NATIVE}/generic/ttk\"" fi if test "${TEA_WINDOWINGSYSTEM}" != "x11" -o "${TEA_USE_SDL}" = "yes" ; then TK_INCLUDES="${TK_INCLUDES} -I${TK_XLIB_DIR_NATIVE}" fi if test "${TEA_WINDOWINGSYSTEM}" = "aqua"; then TK_INCLUDES="${TK_INCLUDES} -I\"${TK_SRC_DIR_NATIVE}/macosx\"" fi if test "`uname -s`" = "Darwin"; then # If Tk was built as a framework, attempt to use # the framework's Headers and PrivateHeaders directories |
︙ | ︙ | |||
3822 3823 3824 3825 3826 3827 3828 | INCLUDE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tkh}` TK_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" AC_SUBST(TK_INCLUDES) | | | 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 | INCLUDE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tkh}` TK_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" AC_SUBST(TK_INCLUDES) if test "${TEA_WINDOWINGSYSTEM}" != "x11" -o "${TEA_USE_SDL}" = "yes" ; then # On Windows and Aqua, we need the X compat headers AC_MSG_CHECKING([for X11 header files]) if test ! -r "${INCLUDE_DIR_NATIVE}/X11/Xlib.h"; then INCLUDE_DIR_NATIVE="`${CYGPATH} ${TK_SRC_DIR}/xlib`" TK_XINCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" AC_SUBST(TK_XINCLUDES) fi |
︙ | ︙ | |||
4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 | no_celib= CELIB_DIR=${ac_cv_c_celibconfig} CELIB_DIR=`echo "$CELIB_DIR" | sed -e 's!\\\!/!g'` AC_MSG_RESULT([found $CELIB_DIR]) fi fi ]) # Local Variables: # mode: autoconf # End: | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 | no_celib= CELIB_DIR=${ac_cv_c_celibconfig} CELIB_DIR=`echo "$CELIB_DIR" | sed -e 's!\\\!/!g'` AC_MSG_RESULT([found $CELIB_DIR]) fi fi ]) #-------------------------------------------------------------------- # TEA_EMBED_MANIFEST # # Figure out if we can embed the manifest where necessary # # Arguments: # An optional manifest to merge into DLL/EXE. # # Results: # Will define the following vars: # VC_MANIFEST_EMBED_DLL # VC_MANIFEST_EMBED_EXE # #-------------------------------------------------------------------- AC_DEFUN([TEA_EMBED_MANIFEST], [ AC_MSG_CHECKING(whether to embed manifest) AC_ARG_ENABLE(embedded-manifest, AC_HELP_STRING([--enable-embedded-manifest], [embed manifest if possible (default: yes)]), [embed_ok=$enableval], [embed_ok=yes]) VC_MANIFEST_EMBED_DLL= VC_MANIFEST_EMBED_EXE= result=no if test "$embed_ok" = "yes" -a "${SHARED_BUILD}" = "1" \ -a "$GCC" != "yes" ; then # Add the magic to embed the manifest into the dll/exe AC_EGREP_CPP([manifest needed], [ #if defined(_MSC_VER) && _MSC_VER >= 1400 print("manifest needed") #endif ], [ # Could do a CHECK_PROG for mt, but should always be with MSVC8+ # Could add 'if test -f' check, but manifest should be created # in this compiler case # Add in a manifest argument that may be specified VC_MANIFEST_EMBED_DLL="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest $1 -outputresource:\[$]@\;2 ; fi" VC_MANIFEST_EMBED_EXE="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest $1 -outputresource:\[$]@\;1 ; fi" result=yes if test "x$1" != x ; then result="yes ($1)" fi ]) fi AC_MSG_RESULT([$result]) AC_SUBST(VC_MANIFEST_EMBED_DLL) AC_SUBST(VC_MANIFEST_EMBED_EXE) ]) # Local Variables: # mode: autoconf # End: |
Changes to jni/VecTcl/WavReader/tclconfig/README.txt.
︙ | ︙ | |||
19 20 21 22 23 24 25 | README.txt This file install-sh Program used for copying binaries and script files to their install locations. tcl.m4 Collection of Tcl autoconf macros. Included by a package's | | | 19 20 21 22 23 24 25 26 | README.txt This file install-sh Program used for copying binaries and script files to their install locations. tcl.m4 Collection of Tcl autoconf macros. Included by a package's aclocal.m4 to define SC_* macros. |
Changes to jni/VecTcl/WavReader/tclconfig/tcl.m4.
︙ | ︙ | |||
221 222 223 224 225 226 227 228 229 230 231 232 233 234 | if test -f "${with_tkconfig}"; then AC_MSG_WARN([--with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself]) with_tkconfig="`echo "${with_tkconfig}" | sed 's!/tkConfig\.sh$!!'`" fi ;; esac if test -f "${with_tkconfig}/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd "${with_tkconfig}"; pwd)`" else AC_MSG_ERROR([${with_tkconfig} directory doesn't contain tkConfig.sh]) fi fi # then check for a private Tk library if test x"${ac_cv_c_tkconfig}" = x ; then | > > | 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 | if test -f "${with_tkconfig}"; then AC_MSG_WARN([--with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself]) with_tkconfig="`echo "${with_tkconfig}" | sed 's!/tkConfig\.sh$!!'`" fi ;; esac if test -f "${with_tkconfig}/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd "${with_tkconfig}"; pwd)`" elif test -f "${with_tkconfig}/sdl2tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd "${with_tkconfig}"; pwd)`" else AC_MSG_ERROR([${with_tkconfig} directory doesn't contain tkConfig.sh]) fi fi # then check for a private Tk library if test x"${ac_cv_c_tkconfig}" = x ; then |
︙ | ︙ | |||
249 250 251 252 253 254 255 256 257 258 259 260 261 262 | -a -f "$i/win/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/win; pwd)`" break fi if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/unix; pwd)`" break fi done fi # on Darwin, check in Framework installation locations if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tkconfig}" = x ; then for i in `ls -d ~/Library/Frameworks 2>/dev/null` \ | > > > > | 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 | -a -f "$i/win/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/win; pwd)`" break fi if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/unix; pwd)`" break fi if test -f "$i/sdl/sdl2tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/sdl; pwd)`" break fi done fi # on Darwin, check in Framework installation locations if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tkconfig}" = x ; then for i in `ls -d ~/Library/Frameworks 2>/dev/null` \ |
︙ | ︙ | |||
312 313 314 315 316 317 318 319 320 321 322 323 324 325 | -a -f "$i/win/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/win; pwd)`" break fi if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/unix; pwd)`" break fi done fi ]) if test x"${ac_cv_c_tkconfig}" = x ; then TK_BIN_DIR="# no Tk configs found" | > > > > | 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 | -a -f "$i/win/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/win; pwd)`" break fi if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/unix; pwd)`" break fi if test -f "$i/sdl/sdl2tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/sdl; pwd)`" break fi done fi ]) if test x"${ac_cv_c_tkconfig}" = x ; then TK_BIN_DIR="# no Tk configs found" |
︙ | ︙ | |||
465 466 467 468 469 470 471 472 473 474 475 476 477 478 | AC_DEFUN([TEA_LOAD_TKCONFIG], [ AC_MSG_CHECKING([for existence of ${TK_BIN_DIR}/tkConfig.sh]) if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then AC_MSG_RESULT([loading]) . "${TK_BIN_DIR}/tkConfig.sh" else AC_MSG_RESULT([could not find ${TK_BIN_DIR}/tkConfig.sh]) fi # eval is required to do the TK_DBGX substitution eval "TK_LIB_FILE=\"${TK_LIB_FILE}\"" eval "TK_STUB_LIB_FILE=\"${TK_STUB_LIB_FILE}\"" | > > > | 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 | AC_DEFUN([TEA_LOAD_TKCONFIG], [ AC_MSG_CHECKING([for existence of ${TK_BIN_DIR}/tkConfig.sh]) if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then AC_MSG_RESULT([loading]) . "${TK_BIN_DIR}/tkConfig.sh" elif test -f "${TK_BIN_DIR}/sdl2tkConfig.sh" ; then AC_MSG_RESULT([loading]) . "${TK_BIN_DIR}/sdl2tkConfig.sh" else AC_MSG_RESULT([could not find ${TK_BIN_DIR}/tkConfig.sh]) fi # eval is required to do the TK_DBGX substitution eval "TK_LIB_FILE=\"${TK_LIB_FILE}\"" eval "TK_STUB_LIB_FILE=\"${TK_STUB_LIB_FILE}\"" |
︙ | ︙ | |||
513 514 515 516 517 518 519 | # eval is required to do the TK_DBGX substitution eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}\"" eval "TK_LIB_SPEC=\"${TK_LIB_SPEC}\"" eval "TK_STUB_LIB_FLAG=\"${TK_STUB_LIB_FLAG}\"" eval "TK_STUB_LIB_SPEC=\"${TK_STUB_LIB_SPEC}\"" # TEA specific: Ensure windowingsystem is defined | > > > > > > > > | | 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 | # eval is required to do the TK_DBGX substitution eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}\"" eval "TK_LIB_SPEC=\"${TK_LIB_SPEC}\"" eval "TK_STUB_LIB_FLAG=\"${TK_STUB_LIB_FLAG}\"" eval "TK_STUB_LIB_SPEC=\"${TK_STUB_LIB_SPEC}\"" # TEA specific: Ensure windowingsystem is defined case ${TK_DEFS} in *PLATFORM_SDL*) TEA_WINDOWINGSYSTEM="x11" TEA_USE_SDL=yes ;; esac if test "${TEA_USE_SDL}" = "yes" ; then true elif test "${TEA_PLATFORM}" = "unix" ; then case ${TK_DEFS} in *MAC_OSX_TK*) AC_DEFINE(MAC_OSX_TK, 1, [Are we building against Mac OS X TkAqua?]) TEA_WINDOWINGSYSTEM="aqua" ;; *) TEA_WINDOWINGSYSTEM="x11" |
︙ | ︙ | |||
1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 | AS_IF([test "$GCC" = yes], [ CFLAGS_OPTIMIZE=-O2 CFLAGS_WARNING="-Wall" ], [ CFLAGS_OPTIMIZE=-O CFLAGS_WARNING="" ]) AC_CHECK_TOOL(AR, ar) STLIB_LD='${AR} cr' LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH" AS_IF([test "x$SHLIB_VERSION" = x],[SHLIB_VERSION="1.0"]) case $system in # TEA specific: windows) | > | 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 | AS_IF([test "$GCC" = yes], [ CFLAGS_OPTIMIZE=-O2 CFLAGS_WARNING="-Wall" ], [ CFLAGS_OPTIMIZE=-O CFLAGS_WARNING="" ]) CC_OBJNAME="-o \[$]@" AC_CHECK_TOOL(AR, ar) STLIB_LD='${AR} cr' LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH" AS_IF([test "x$SHLIB_VERSION" = x],[SHLIB_VERSION="1.0"]) case $system in # TEA specific: windows) |
︙ | ︙ | |||
1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 | # For information on what debugtype is most useful, see: # http://msdn.microsoft.com/library/en-us/dnvc60/html/gendepdebug.asp # and also # http://msdn2.microsoft.com/en-us/library/y0zzbyt4%28VS.80%29.aspx # This essentially turns it all on. LDFLAGS_DEBUG="-debug -debugtype:cv" LDFLAGS_OPTIMIZE="-release" if test "$doWince" != "no" ; then LDFLAGS_CONSOLE="-link ${lflags}" LDFLAGS_WINDOW=${LDFLAGS_CONSOLE} else LDFLAGS_CONSOLE="-link -subsystem:console ${lflags}" LDFLAGS_WINDOW="-link -subsystem:windows ${lflags}" fi | > > > | 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 | # For information on what debugtype is most useful, see: # http://msdn.microsoft.com/library/en-us/dnvc60/html/gendepdebug.asp # and also # http://msdn2.microsoft.com/en-us/library/y0zzbyt4%28VS.80%29.aspx # This essentially turns it all on. LDFLAGS_DEBUG="-debug -debugtype:cv" LDFLAGS_OPTIMIZE="-release" CFLAGS_DEBUG="${CFLAGS_DEBUG} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" CC_OBJNAME="-Fo\[$]@" if test "$doWince" != "no" ; then LDFLAGS_CONSOLE="-link ${lflags}" LDFLAGS_WINDOW=${LDFLAGS_CONSOLE} else LDFLAGS_CONSOLE="-link -subsystem:console ${lflags}" LDFLAGS_WINDOW="-link -subsystem:windows ${lflags}" fi |
︙ | ︙ | |||
1544 1545 1546 1547 1548 1549 1550 | SHLIB_SUFFIX=".so" # TEA specific: CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT}' | > > > > > > > > > > | > | 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 | SHLIB_SUFFIX=".so" # TEA specific: CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT}' # workaround when cross-compiling for Win32: no -fPIC and -Wl,... if test "${TCL_SHLIB_SUFFIX}" = ".dll" ; then SHLIB_CFLAGS="" SHLIB_SUFFIX=".dll" DL_OBJS="" DL_LIBS="" TCL_LIB_VERSIONS_OK=nodots SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.dll' UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' else LDFLAGS="$LDFLAGS -Wl,--export-dynamic" fi AS_IF([test $doRpath = yes], [ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) AS_IF([test $do64bit = yes], [ AC_CACHE_CHECK([if compiler accepts -m64 flag], tcl_cv_cc_m64, [ hold_cflags=$CFLAGS |
︙ | ︙ | |||
2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 | AC_DEFINE(HAVE_CAST_TO_UNION, 1, [Defined when compiler supports casting to union type.]) fi AC_SUBST(CFLAGS_DEBUG) AC_SUBST(CFLAGS_OPTIMIZE) AC_SUBST(CFLAGS_WARNING) AC_SUBST(STLIB_LD) AC_SUBST(SHLIB_LD) AC_SUBST(SHLIB_LD_LIBS) AC_SUBST(SHLIB_CFLAGS) | > | 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 | AC_DEFINE(HAVE_CAST_TO_UNION, 1, [Defined when compiler supports casting to union type.]) fi AC_SUBST(CFLAGS_DEBUG) AC_SUBST(CFLAGS_OPTIMIZE) AC_SUBST(CFLAGS_WARNING) AC_SUBST(CC_OBJNAME) AC_SUBST(STLIB_LD) AC_SUBST(SHLIB_LD) AC_SUBST(SHLIB_LD_LIBS) AC_SUBST(SHLIB_CFLAGS) |
︙ | ︙ | |||
2360 2361 2362 2363 2364 2365 2366 | # Sets the following vars: # XINCLUDES # XLIBSW # PKG_LIBS (appends to) #-------------------------------------------------------------------- AC_DEFUN([TEA_PATH_X], [ | | | 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 | # Sets the following vars: # XINCLUDES # XLIBSW # PKG_LIBS (appends to) #-------------------------------------------------------------------- AC_DEFUN([TEA_PATH_X], [ if test "${TEA_WINDOWINGSYSTEM}" = "x11" -a "${TEA_USE_SDL}" != "yes" ; then TEA_PATH_UNIX_X fi ]) AC_DEFUN([TEA_PATH_UNIX_X], [ AC_PATH_X not_really_there="" |
︙ | ︙ | |||
2949 2950 2951 2952 2953 2954 2955 | ;; *) # check for existence - allows for generic/win/unix VPATH # To add more dirs here (like 'src'), you have to update VPATH # in Makefile.in as well if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ | | | 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 | ;; *) # check for existence - allows for generic/win/unix VPATH # To add more dirs here (like 'src'), you have to update VPATH # in Makefile.in as well if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ -a ! -f "${srcdir}/macosx/$i" -a ! -f "${srcdir}/sdl/$i" \ ; then AC_MSG_ERROR([could not find source file '$i']) fi PKG_SOURCES="$PKG_SOURCES $i" # this assumes it is in a VPATH dir i=`basename $i` # handle user calling this before or after TEA_SETUP_COMPILER |
︙ | ︙ | |||
2993 2994 2995 2996 2997 2998 2999 | #------------------------------------------------------------------------ AC_DEFUN([TEA_ADD_STUB_SOURCES], [ vars="$@" for i in $vars; do # check for existence - allows for generic/win/unix VPATH if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ | | | 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 | #------------------------------------------------------------------------ AC_DEFUN([TEA_ADD_STUB_SOURCES], [ vars="$@" for i in $vars; do # check for existence - allows for generic/win/unix VPATH if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ -a ! -f "${srcdir}/macosx/$i" -a ! -f "${srcdir}/sdl/$i" \ ; then AC_MSG_ERROR([could not find stub source file '$i']) fi PKG_STUB_SOURCES="$PKG_STUB_SOURCES $i" # this assumes it is in a VPATH dir i=`basename $i` # handle user calling this before or after TEA_SETUP_COMPILER |
︙ | ︙ | |||
3321 3322 3323 3324 3325 3326 3327 | print("manifest needed") #endif ], [ # Could do a CHECK_PROG for mt, but should always be with MSVC8+ VC_MANIFEST_EMBED_DLL="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;2 ; fi" VC_MANIFEST_EMBED_EXE="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;1 ; fi" MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}" | > > > > > | | 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 | print("manifest needed") #endif ], [ # Could do a CHECK_PROG for mt, but should always be with MSVC8+ VC_MANIFEST_EMBED_DLL="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;2 ; fi" VC_MANIFEST_EMBED_EXE="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;1 ; fi" MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}" # Don't clean .manifest provided by the package (see TEA_ADD_MANIFEST) # or one created by Makefile or configure. Could use the /manifest:filename # linker option to explicitly set the linker-generated filename. eval eval "manifest=${PACKAGE_NAME}${SHARED_LIB_SUFFIX}.manifest" TEA_ADD_CLEANFILES([$manifest]) ]) MAKE_STUB_LIB="\${STLIB_LD} -nodefaultlib -out:\[$]@ \$(PKG_STUB_OBJECTS)" else MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(PKG_OBJECTS)" MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}" MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \$(PKG_STUB_OBJECTS)" fi |
︙ | ︙ | |||
3669 3670 3671 3672 3673 3674 3675 | TK_SRC_DIR_NATIVE=`${CYGPATH} ${TK_SRC_DIR}` TK_TOP_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}\" # Check to see if tk<Plat>Port.h isn't already with the public headers # Don't look for tkInt.h because that resides with tk.h in the core # sources, but the <plat>Port headers are in a different directory | > > | > > > > > | | | 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 | TK_SRC_DIR_NATIVE=`${CYGPATH} ${TK_SRC_DIR}` TK_TOP_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}\" # Check to see if tk<Plat>Port.h isn't already with the public headers # Don't look for tkInt.h because that resides with tk.h in the core # sources, but the <plat>Port headers are in a different directory if test -f "${ac_cv_c_tkh}/tkSDLPort.h"; then result="private headers found with public headers" elif test "${TEA_PLATFORM}" = "windows" -a \ -f "${ac_cv_c_tkh}/tkWinPort.h"; then result="private headers found with public headers" elif test "${TEA_PLATFORM}" = "unix" -a \ -f "${ac_cv_c_tkh}/tkUnixPort.h"; then result="private headers found with public headers" else TK_GENERIC_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/generic\" TK_XLIB_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/xlib\" if test "${TEA_PLATFORM}" = "windows"; then TK_PLATFORM_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/win\" else TK_PLATFORM_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/unix\" fi case ${TK_DEFS} in *PLATFORM_SDL*) TK_PLATFORM_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/sdl\" ;; esac # Overwrite the previous TK_INCLUDES as this should capture both # public and private headers in the same set. # We want to ensure these are substituted so as not to require # any *_NATIVE vars be defined in the Makefile TK_INCLUDES="-I${TK_GENERIC_DIR_NATIVE} -I${TK_PLATFORM_DIR_NATIVE}" # Detect and add ttk subdir if test -d "${TK_SRC_DIR}/generic/ttk"; then TK_INCLUDES="${TK_INCLUDES} -I\"${TK_SRC_DIR_NATIVE}/generic/ttk\"" fi if test "${TEA_WINDOWINGSYSTEM}" != "x11" -o "${TEA_USE_SDL}" = "yes" ; then TK_INCLUDES="${TK_INCLUDES} -I${TK_XLIB_DIR_NATIVE}" fi if test "${TEA_WINDOWINGSYSTEM}" = "aqua"; then TK_INCLUDES="${TK_INCLUDES} -I\"${TK_SRC_DIR_NATIVE}/macosx\"" fi if test "`uname -s`" = "Darwin"; then # If Tk was built as a framework, attempt to use # the framework's Headers and PrivateHeaders directories |
︙ | ︙ | |||
3822 3823 3824 3825 3826 3827 3828 | INCLUDE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tkh}` TK_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" AC_SUBST(TK_INCLUDES) | | | 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 | INCLUDE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tkh}` TK_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" AC_SUBST(TK_INCLUDES) if test "${TEA_WINDOWINGSYSTEM}" != "x11" -o "${TEA_USE_SDL}" = "yes" ; then # On Windows and Aqua, we need the X compat headers AC_MSG_CHECKING([for X11 header files]) if test ! -r "${INCLUDE_DIR_NATIVE}/X11/Xlib.h"; then INCLUDE_DIR_NATIVE="`${CYGPATH} ${TK_SRC_DIR}/xlib`" TK_XINCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" AC_SUBST(TK_XINCLUDES) fi |
︙ | ︙ | |||
4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 | no_celib= CELIB_DIR=${ac_cv_c_celibconfig} CELIB_DIR=`echo "$CELIB_DIR" | sed -e 's!\\\!/!g'` AC_MSG_RESULT([found $CELIB_DIR]) fi fi ]) # Local Variables: # mode: autoconf # End: | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 | no_celib= CELIB_DIR=${ac_cv_c_celibconfig} CELIB_DIR=`echo "$CELIB_DIR" | sed -e 's!\\\!/!g'` AC_MSG_RESULT([found $CELIB_DIR]) fi fi ]) #-------------------------------------------------------------------- # TEA_EMBED_MANIFEST # # Figure out if we can embed the manifest where necessary # # Arguments: # An optional manifest to merge into DLL/EXE. # # Results: # Will define the following vars: # VC_MANIFEST_EMBED_DLL # VC_MANIFEST_EMBED_EXE # #-------------------------------------------------------------------- AC_DEFUN([TEA_EMBED_MANIFEST], [ AC_MSG_CHECKING(whether to embed manifest) AC_ARG_ENABLE(embedded-manifest, AC_HELP_STRING([--enable-embedded-manifest], [embed manifest if possible (default: yes)]), [embed_ok=$enableval], [embed_ok=yes]) VC_MANIFEST_EMBED_DLL= VC_MANIFEST_EMBED_EXE= result=no if test "$embed_ok" = "yes" -a "${SHARED_BUILD}" = "1" \ -a "$GCC" != "yes" ; then # Add the magic to embed the manifest into the dll/exe AC_EGREP_CPP([manifest needed], [ #if defined(_MSC_VER) && _MSC_VER >= 1400 print("manifest needed") #endif ], [ # Could do a CHECK_PROG for mt, but should always be with MSVC8+ # Could add 'if test -f' check, but manifest should be created # in this compiler case # Add in a manifest argument that may be specified VC_MANIFEST_EMBED_DLL="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest $1 -outputresource:\[$]@\;2 ; fi" VC_MANIFEST_EMBED_EXE="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest $1 -outputresource:\[$]@\;1 ; fi" result=yes if test "x$1" != x ; then result="yes ($1)" fi ]) fi AC_MSG_RESULT([$result]) AC_SUBST(VC_MANIFEST_EMBED_DLL) AC_SUBST(VC_MANIFEST_EMBED_EXE) ]) # Local Variables: # mode: autoconf # End: |
Changes to jni/VecTcl/configure.
︙ | ︙ | |||
644 645 646 647 648 649 650 651 652 653 654 655 656 657 | LDFLAGS_DEFAULT CFLAGS_DEFAULT LD_LIBRARY_PATH_VAR SHLIB_CFLAGS SHLIB_LD_LIBS SHLIB_LD STLIB_LD CFLAGS_WARNING CFLAGS_OPTIMIZE CFLAGS_DEBUG RC CELIB_DIR AR SHARED_BUILD | > | 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 | LDFLAGS_DEFAULT CFLAGS_DEFAULT LD_LIBRARY_PATH_VAR SHLIB_CFLAGS SHLIB_LD_LIBS SHLIB_LD STLIB_LD CC_OBJNAME CFLAGS_WARNING CFLAGS_OPTIMIZE CFLAGS_DEBUG RC CELIB_DIR AR SHARED_BUILD |
︙ | ︙ | |||
5411 5412 5413 5414 5415 5416 5417 | ;; *) # check for existence - allows for generic/win/unix VPATH # To add more dirs here (like 'src'), you have to update VPATH # in Makefile.in as well if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ | | | 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424 5425 5426 | ;; *) # check for existence - allows for generic/win/unix VPATH # To add more dirs here (like 'src'), you have to update VPATH # in Makefile.in as well if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ -a ! -f "${srcdir}/macosx/$i" -a ! -f "${srcdir}/sdl/$i" \ ; then as_fn_error $? "could not find source file '$i'" "$LINENO" 5 fi PKG_SOURCES="$PKG_SOURCES $i" # this assumes it is in a VPATH dir i=`basename $i` # handle user calling this before or after TEA_SETUP_COMPILER |
︙ | ︙ | |||
5470 5471 5472 5473 5474 5475 5476 | vars="vectclapi.c" for i in $vars; do # check for existence - allows for generic/win/unix VPATH if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ | | | 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 | vars="vectclapi.c" for i in $vars; do # check for existence - allows for generic/win/unix VPATH if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ -a ! -f "${srcdir}/macosx/$i" -a ! -f "${srcdir}/sdl/$i" \ ; then as_fn_error $? "could not find stub source file '$i'" "$LINENO" 5 fi PKG_STUB_SOURCES="$PKG_STUB_SOURCES $i" # this assumes it is in a VPATH dir i=`basename $i` # handle user calling this before or after TEA_SETUP_COMPILER |
︙ | ︙ | |||
6263 6264 6265 6266 6267 6268 6269 6270 6271 6272 6273 6274 6275 6276 | else CFLAGS_OPTIMIZE=-O CFLAGS_WARNING="" fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 | > | 6264 6265 6266 6267 6268 6269 6270 6271 6272 6273 6274 6275 6276 6277 6278 | else CFLAGS_OPTIMIZE=-O CFLAGS_WARNING="" fi CC_OBJNAME="-o \$@" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 |
︙ | ︙ | |||
6755 6756 6757 6758 6759 6760 6761 6762 6763 6764 6765 6766 6767 6768 | # For information on what debugtype is most useful, see: # http://msdn.microsoft.com/library/en-us/dnvc60/html/gendepdebug.asp # and also # http://msdn2.microsoft.com/en-us/library/y0zzbyt4%28VS.80%29.aspx # This essentially turns it all on. LDFLAGS_DEBUG="-debug -debugtype:cv" LDFLAGS_OPTIMIZE="-release" if test "$doWince" != "no" ; then LDFLAGS_CONSOLE="-link ${lflags}" LDFLAGS_WINDOW=${LDFLAGS_CONSOLE} else LDFLAGS_CONSOLE="-link -subsystem:console ${lflags}" LDFLAGS_WINDOW="-link -subsystem:windows ${lflags}" fi | > > > | 6757 6758 6759 6760 6761 6762 6763 6764 6765 6766 6767 6768 6769 6770 6771 6772 6773 | # For information on what debugtype is most useful, see: # http://msdn.microsoft.com/library/en-us/dnvc60/html/gendepdebug.asp # and also # http://msdn2.microsoft.com/en-us/library/y0zzbyt4%28VS.80%29.aspx # This essentially turns it all on. LDFLAGS_DEBUG="-debug -debugtype:cv" LDFLAGS_OPTIMIZE="-release" CFLAGS_DEBUG="${CFLAGS_DEBUG} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" CC_OBJNAME="-Fo\$@" if test "$doWince" != "no" ; then LDFLAGS_CONSOLE="-link ${lflags}" LDFLAGS_WINDOW=${LDFLAGS_CONSOLE} else LDFLAGS_CONSOLE="-link -subsystem:console ${lflags}" LDFLAGS_WINDOW="-link -subsystem:windows ${lflags}" fi |
︙ | ︙ | |||
7146 7147 7148 7149 7150 7151 7152 | SHLIB_SUFFIX=".so" # TEA specific: CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT}' | > > > > > > > > > > | > | 7151 7152 7153 7154 7155 7156 7157 7158 7159 7160 7161 7162 7163 7164 7165 7166 7167 7168 7169 7170 7171 7172 7173 7174 7175 7176 | SHLIB_SUFFIX=".so" # TEA specific: CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT}' # workaround when cross-compiling for Win32: no -fPIC and -Wl,... if test "${TCL_SHLIB_SUFFIX}" = ".dll" ; then SHLIB_CFLAGS="" SHLIB_SUFFIX=".dll" DL_OBJS="" DL_LIBS="" TCL_LIB_VERSIONS_OK=nodots SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.dll' UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' else LDFLAGS="$LDFLAGS -Wl,--export-dynamic" fi if test $doRpath = yes; then : CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' fi LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} if test "`uname -m`" = "alpha"; then : CFLAGS="$CFLAGS -mieee" |
︙ | ︙ | |||
7284 7285 7286 7287 7288 7289 7290 7291 7292 7293 7294 7295 7296 7297 7298 7299 7300 7301 7302 7303 7304 | fi ;; FreeBSD-*) # This configuration from FreeBSD Ports. SHLIB_CFLAGS="-fPIC" SHLIB_LD="${CC} -shared" TCL_SHLIB_LD_EXTRAS="-Wl,-soname=\$@" SHLIB_SUFFIX=".so" LDFLAGS="" if test $doRpath = yes; then : CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' fi if test "${TCL_THREADS}" = "1"; then : # The -pthread needs to go in the LDFLAGS, not LIBS LIBS=`echo $LIBS | sed s/-pthread//` CFLAGS="$CFLAGS $PTHREAD_CFLAGS" LDFLAGS="$LDFLAGS $PTHREAD_LIBS" fi | > > > | | | | | > > | 7300 7301 7302 7303 7304 7305 7306 7307 7308 7309 7310 7311 7312 7313 7314 7315 7316 7317 7318 7319 7320 7321 7322 7323 7324 7325 7326 7327 7328 7329 7330 7331 7332 7333 7334 7335 7336 7337 | fi ;; FreeBSD-*) # This configuration from FreeBSD Ports. SHLIB_CFLAGS="-fPIC" SHLIB_LD="${CC} -shared" TCL_SHLIB_LD_EXTRAS="-Wl,-soname=\$@" TK_SHLIB_LD_EXTRAS="-Wl,-soname,\$@" SHLIB_SUFFIX=".so" LDFLAGS="" if test $doRpath = yes; then : CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' fi if test "${TCL_THREADS}" = "1"; then : # The -pthread needs to go in the LDFLAGS, not LIBS LIBS=`echo $LIBS | sed s/-pthread//` CFLAGS="$CFLAGS $PTHREAD_CFLAGS" LDFLAGS="$LDFLAGS $PTHREAD_LIBS" fi case $system in FreeBSD-3.*) # Version numbers are dot-stripped by system policy. TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' TCL_LIB_VERSIONS_OK=nodots ;; esac ;; Darwin-*) CFLAGS_OPTIMIZE="-Os" SHLIB_CFLAGS="-fno-common" # To avoid discrepancies between what headers configure sees during # preprocessing tests and compiling tests, move any -isysroot and # -mmacosx-version-min flags from CFLAGS to CPPFLAGS: |
︙ | ︙ | |||
7664 7665 7666 7667 7668 7669 7670 | if test "$GCC" = yes; then : SHLIB_CFLAGS="-fPIC -melf" LDFLAGS="$LDFLAGS -melf -Wl,-Bexport" else | | | | 7685 7686 7687 7688 7689 7690 7691 7692 7693 7694 7695 7696 7697 7698 7699 7700 | if test "$GCC" = yes; then : SHLIB_CFLAGS="-fPIC -melf" LDFLAGS="$LDFLAGS -melf -Wl,-Bexport" else SHLIB_CFLAGS="-Kpic -belf" LDFLAGS="$LDFLAGS -belf -Wl,-Bexport" fi SHLIB_LD="ld -G" SHLIB_LD_LIBS="" SHLIB_SUFFIX=".so" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" |
︙ | ︙ | |||
8125 8126 8127 8128 8129 8130 8131 8132 8133 8134 8135 8136 8137 8138 | # These must be called after we do the basic CFLAGS checks and # verify any possible 64-bit or similar switches are necessary { $as_echo "$as_me:${as_lineno-$LINENO}: checking for required early compiler flags" >&5 $as_echo_n "checking for required early compiler flags... " >&6; } tcl_flags="" | > | 8146 8147 8148 8149 8150 8151 8152 8153 8154 8155 8156 8157 8158 8159 8160 | # These must be called after we do the basic CFLAGS checks and # verify any possible 64-bit or similar switches are necessary { $as_echo "$as_me:${as_lineno-$LINENO}: checking for required early compiler flags" >&5 $as_echo_n "checking for required early compiler flags... " >&6; } tcl_flags="" |
︙ | ︙ | |||
8563 8564 8565 8566 8567 8568 8569 | $EGREP "manifest needed" >/dev/null 2>&1; then : # Could do a CHECK_PROG for mt, but should always be with MSVC8+ VC_MANIFEST_EMBED_DLL="if test -f \$@.manifest ; then mt.exe -nologo -manifest \$@.manifest -outputresource:\$@\;2 ; fi" VC_MANIFEST_EMBED_EXE="if test -f \$@.manifest ; then mt.exe -nologo -manifest \$@.manifest -outputresource:\$@\;1 ; fi" MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}" | > > > > > | | 8585 8586 8587 8588 8589 8590 8591 8592 8593 8594 8595 8596 8597 8598 8599 8600 8601 8602 8603 8604 | $EGREP "manifest needed" >/dev/null 2>&1; then : # Could do a CHECK_PROG for mt, but should always be with MSVC8+ VC_MANIFEST_EMBED_DLL="if test -f \$@.manifest ; then mt.exe -nologo -manifest \$@.manifest -outputresource:\$@\;2 ; fi" VC_MANIFEST_EMBED_EXE="if test -f \$@.manifest ; then mt.exe -nologo -manifest \$@.manifest -outputresource:\$@\;1 ; fi" MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}" # Don't clean .manifest provided by the package (see TEA_ADD_MANIFEST) # or one created by Makefile or configure. Could use the /manifest:filename # linker option to explicitly set the linker-generated filename. eval eval "manifest=${PACKAGE_NAME}${SHARED_LIB_SUFFIX}.manifest" CLEANFILES="$CLEANFILES $manifest" fi rm -f conftest* MAKE_STUB_LIB="\${STLIB_LD} -nodefaultlib -out:\$@ \$(PKG_STUB_OBJECTS)" else |
︙ | ︙ |
Changes to jni/VecTcl/tclconfig/README.txt.
︙ | ︙ | |||
19 20 21 22 23 24 25 | README.txt This file install-sh Program used for copying binaries and script files to their install locations. tcl.m4 Collection of Tcl autoconf macros. Included by a package's | | | 19 20 21 22 23 24 25 26 | README.txt This file install-sh Program used for copying binaries and script files to their install locations. tcl.m4 Collection of Tcl autoconf macros. Included by a package's aclocal.m4 to define SC_* macros. |
Changes to jni/VecTcl/tclconfig/tcl.m4.
︙ | ︙ | |||
221 222 223 224 225 226 227 228 229 230 231 232 233 234 | if test -f "${with_tkconfig}"; then AC_MSG_WARN([--with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself]) with_tkconfig="`echo "${with_tkconfig}" | sed 's!/tkConfig\.sh$!!'`" fi ;; esac if test -f "${with_tkconfig}/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd "${with_tkconfig}"; pwd)`" else AC_MSG_ERROR([${with_tkconfig} directory doesn't contain tkConfig.sh]) fi fi # then check for a private Tk library if test x"${ac_cv_c_tkconfig}" = x ; then | > > | 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 | if test -f "${with_tkconfig}"; then AC_MSG_WARN([--with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself]) with_tkconfig="`echo "${with_tkconfig}" | sed 's!/tkConfig\.sh$!!'`" fi ;; esac if test -f "${with_tkconfig}/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd "${with_tkconfig}"; pwd)`" elif test -f "${with_tkconfig}/sdl2tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd "${with_tkconfig}"; pwd)`" else AC_MSG_ERROR([${with_tkconfig} directory doesn't contain tkConfig.sh]) fi fi # then check for a private Tk library if test x"${ac_cv_c_tkconfig}" = x ; then |
︙ | ︙ | |||
249 250 251 252 253 254 255 256 257 258 259 260 261 262 | -a -f "$i/win/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/win; pwd)`" break fi if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/unix; pwd)`" break fi done fi # on Darwin, check in Framework installation locations if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tkconfig}" = x ; then for i in `ls -d ~/Library/Frameworks 2>/dev/null` \ | > > > > | 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 | -a -f "$i/win/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/win; pwd)`" break fi if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/unix; pwd)`" break fi if test -f "$i/sdl/sdl2tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/sdl; pwd)`" break fi done fi # on Darwin, check in Framework installation locations if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tkconfig}" = x ; then for i in `ls -d ~/Library/Frameworks 2>/dev/null` \ |
︙ | ︙ | |||
312 313 314 315 316 317 318 319 320 321 322 323 324 325 | -a -f "$i/win/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/win; pwd)`" break fi if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/unix; pwd)`" break fi done fi ]) if test x"${ac_cv_c_tkconfig}" = x ; then TK_BIN_DIR="# no Tk configs found" | > > > > | 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 | -a -f "$i/win/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/win; pwd)`" break fi if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/unix; pwd)`" break fi if test -f "$i/sdl/sdl2tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/sdl; pwd)`" break fi done fi ]) if test x"${ac_cv_c_tkconfig}" = x ; then TK_BIN_DIR="# no Tk configs found" |
︙ | ︙ | |||
465 466 467 468 469 470 471 472 473 474 475 476 477 478 | AC_DEFUN([TEA_LOAD_TKCONFIG], [ AC_MSG_CHECKING([for existence of ${TK_BIN_DIR}/tkConfig.sh]) if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then AC_MSG_RESULT([loading]) . "${TK_BIN_DIR}/tkConfig.sh" else AC_MSG_RESULT([could not find ${TK_BIN_DIR}/tkConfig.sh]) fi # eval is required to do the TK_DBGX substitution eval "TK_LIB_FILE=\"${TK_LIB_FILE}\"" eval "TK_STUB_LIB_FILE=\"${TK_STUB_LIB_FILE}\"" | > > > | 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 | AC_DEFUN([TEA_LOAD_TKCONFIG], [ AC_MSG_CHECKING([for existence of ${TK_BIN_DIR}/tkConfig.sh]) if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then AC_MSG_RESULT([loading]) . "${TK_BIN_DIR}/tkConfig.sh" elif test -f "${TK_BIN_DIR}/sdl2tkConfig.sh" ; then AC_MSG_RESULT([loading]) . "${TK_BIN_DIR}/sdl2tkConfig.sh" else AC_MSG_RESULT([could not find ${TK_BIN_DIR}/tkConfig.sh]) fi # eval is required to do the TK_DBGX substitution eval "TK_LIB_FILE=\"${TK_LIB_FILE}\"" eval "TK_STUB_LIB_FILE=\"${TK_STUB_LIB_FILE}\"" |
︙ | ︙ | |||
513 514 515 516 517 518 519 | # eval is required to do the TK_DBGX substitution eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}\"" eval "TK_LIB_SPEC=\"${TK_LIB_SPEC}\"" eval "TK_STUB_LIB_FLAG=\"${TK_STUB_LIB_FLAG}\"" eval "TK_STUB_LIB_SPEC=\"${TK_STUB_LIB_SPEC}\"" # TEA specific: Ensure windowingsystem is defined | > > > > > > > > | | 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 | # eval is required to do the TK_DBGX substitution eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}\"" eval "TK_LIB_SPEC=\"${TK_LIB_SPEC}\"" eval "TK_STUB_LIB_FLAG=\"${TK_STUB_LIB_FLAG}\"" eval "TK_STUB_LIB_SPEC=\"${TK_STUB_LIB_SPEC}\"" # TEA specific: Ensure windowingsystem is defined case ${TK_DEFS} in *PLATFORM_SDL*) TEA_WINDOWINGSYSTEM="x11" TEA_USE_SDL=yes ;; esac if test "${TEA_USE_SDL}" = "yes" ; then true elif test "${TEA_PLATFORM}" = "unix" ; then case ${TK_DEFS} in *MAC_OSX_TK*) AC_DEFINE(MAC_OSX_TK, 1, [Are we building against Mac OS X TkAqua?]) TEA_WINDOWINGSYSTEM="aqua" ;; *) TEA_WINDOWINGSYSTEM="x11" |
︙ | ︙ | |||
1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 | AS_IF([test "$GCC" = yes], [ CFLAGS_OPTIMIZE=-O2 CFLAGS_WARNING="-Wall" ], [ CFLAGS_OPTIMIZE=-O CFLAGS_WARNING="" ]) AC_CHECK_TOOL(AR, ar) STLIB_LD='${AR} cr' LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH" AS_IF([test "x$SHLIB_VERSION" = x],[SHLIB_VERSION="1.0"]) case $system in # TEA specific: windows) | > | 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 | AS_IF([test "$GCC" = yes], [ CFLAGS_OPTIMIZE=-O2 CFLAGS_WARNING="-Wall" ], [ CFLAGS_OPTIMIZE=-O CFLAGS_WARNING="" ]) CC_OBJNAME="-o \[$]@" AC_CHECK_TOOL(AR, ar) STLIB_LD='${AR} cr' LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH" AS_IF([test "x$SHLIB_VERSION" = x],[SHLIB_VERSION="1.0"]) case $system in # TEA specific: windows) |
︙ | ︙ | |||
1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 | # For information on what debugtype is most useful, see: # http://msdn.microsoft.com/library/en-us/dnvc60/html/gendepdebug.asp # and also # http://msdn2.microsoft.com/en-us/library/y0zzbyt4%28VS.80%29.aspx # This essentially turns it all on. LDFLAGS_DEBUG="-debug -debugtype:cv" LDFLAGS_OPTIMIZE="-release" if test "$doWince" != "no" ; then LDFLAGS_CONSOLE="-link ${lflags}" LDFLAGS_WINDOW=${LDFLAGS_CONSOLE} else LDFLAGS_CONSOLE="-link -subsystem:console ${lflags}" LDFLAGS_WINDOW="-link -subsystem:windows ${lflags}" fi | > > > | 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 | # For information on what debugtype is most useful, see: # http://msdn.microsoft.com/library/en-us/dnvc60/html/gendepdebug.asp # and also # http://msdn2.microsoft.com/en-us/library/y0zzbyt4%28VS.80%29.aspx # This essentially turns it all on. LDFLAGS_DEBUG="-debug -debugtype:cv" LDFLAGS_OPTIMIZE="-release" CFLAGS_DEBUG="${CFLAGS_DEBUG} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" CC_OBJNAME="-Fo\[$]@" if test "$doWince" != "no" ; then LDFLAGS_CONSOLE="-link ${lflags}" LDFLAGS_WINDOW=${LDFLAGS_CONSOLE} else LDFLAGS_CONSOLE="-link -subsystem:console ${lflags}" LDFLAGS_WINDOW="-link -subsystem:windows ${lflags}" fi |
︙ | ︙ | |||
1544 1545 1546 1547 1548 1549 1550 | SHLIB_SUFFIX=".so" # TEA specific: CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT}' | > > > > > > > > > > | > | 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 | SHLIB_SUFFIX=".so" # TEA specific: CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT}' # workaround when cross-compiling for Win32: no -fPIC and -Wl,... if test "${TCL_SHLIB_SUFFIX}" = ".dll" ; then SHLIB_CFLAGS="" SHLIB_SUFFIX=".dll" DL_OBJS="" DL_LIBS="" TCL_LIB_VERSIONS_OK=nodots SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.dll' UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' else LDFLAGS="$LDFLAGS -Wl,--export-dynamic" fi AS_IF([test $doRpath = yes], [ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) AS_IF([test $do64bit = yes], [ AC_CACHE_CHECK([if compiler accepts -m64 flag], tcl_cv_cc_m64, [ hold_cflags=$CFLAGS |
︙ | ︙ | |||
1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 | ]) ;; FreeBSD-*) # This configuration from FreeBSD Ports. SHLIB_CFLAGS="-fPIC" SHLIB_LD="${CC} -shared" TCL_SHLIB_LD_EXTRAS="-Wl,-soname=\$[@]" SHLIB_SUFFIX=".so" LDFLAGS="" AS_IF([test $doRpath = yes], [ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) AS_IF([test "${TCL_THREADS}" = "1"], [ # The -pthread needs to go in the LDFLAGS, not LIBS LIBS=`echo $LIBS | sed s/-pthread//` CFLAGS="$CFLAGS $PTHREAD_CFLAGS" LDFLAGS="$LDFLAGS $PTHREAD_LIBS"]) | > > > | | | | | > > | 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 | ]) ;; FreeBSD-*) # This configuration from FreeBSD Ports. SHLIB_CFLAGS="-fPIC" SHLIB_LD="${CC} -shared" TCL_SHLIB_LD_EXTRAS="-Wl,-soname=\$[@]" TK_SHLIB_LD_EXTRAS="-Wl,-soname,\$[@]" SHLIB_SUFFIX=".so" LDFLAGS="" AS_IF([test $doRpath = yes], [ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) AS_IF([test "${TCL_THREADS}" = "1"], [ # The -pthread needs to go in the LDFLAGS, not LIBS LIBS=`echo $LIBS | sed s/-pthread//` CFLAGS="$CFLAGS $PTHREAD_CFLAGS" LDFLAGS="$LDFLAGS $PTHREAD_LIBS"]) case $system in FreeBSD-3.*) # Version numbers are dot-stripped by system policy. TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' TCL_LIB_VERSIONS_OK=nodots ;; esac ;; Darwin-*) CFLAGS_OPTIMIZE="-Os" SHLIB_CFLAGS="-fno-common" # To avoid discrepancies between what headers configure sees during # preprocessing tests and compiling tests, move any -isysroot and # -mmacosx-version-min flags from CFLAGS to CPPFLAGS: |
︙ | ︙ | |||
1822 1823 1824 1825 1826 1827 1828 | LD_SEARCH_FLAGS="" ;; SCO_SV-3.2*) AS_IF([test "$GCC" = yes], [ SHLIB_CFLAGS="-fPIC -melf" LDFLAGS="$LDFLAGS -melf -Wl,-Bexport" ], [ | | | | 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 | LD_SEARCH_FLAGS="" ;; SCO_SV-3.2*) AS_IF([test "$GCC" = yes], [ SHLIB_CFLAGS="-fPIC -melf" LDFLAGS="$LDFLAGS -melf -Wl,-Bexport" ], [ SHLIB_CFLAGS="-Kpic -belf" LDFLAGS="$LDFLAGS -belf -Wl,-Bexport" ]) SHLIB_LD="ld -G" SHLIB_LD_LIBS="" SHLIB_SUFFIX=".so" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; |
︙ | ︙ | |||
2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 | AC_DEFINE(HAVE_CAST_TO_UNION, 1, [Defined when compiler supports casting to union type.]) fi AC_SUBST(CFLAGS_DEBUG) AC_SUBST(CFLAGS_OPTIMIZE) AC_SUBST(CFLAGS_WARNING) AC_SUBST(STLIB_LD) AC_SUBST(SHLIB_LD) AC_SUBST(SHLIB_LD_LIBS) AC_SUBST(SHLIB_CFLAGS) | > | 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 | AC_DEFINE(HAVE_CAST_TO_UNION, 1, [Defined when compiler supports casting to union type.]) fi AC_SUBST(CFLAGS_DEBUG) AC_SUBST(CFLAGS_OPTIMIZE) AC_SUBST(CFLAGS_WARNING) AC_SUBST(CC_OBJNAME) AC_SUBST(STLIB_LD) AC_SUBST(SHLIB_LD) AC_SUBST(SHLIB_LD_LIBS) AC_SUBST(SHLIB_CFLAGS) |
︙ | ︙ | |||
2355 2356 2357 2358 2359 2360 2361 | # Sets the following vars: # XINCLUDES # XLIBSW # PKG_LIBS (appends to) #-------------------------------------------------------------------- AC_DEFUN([TEA_PATH_X], [ | | | 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 | # Sets the following vars: # XINCLUDES # XLIBSW # PKG_LIBS (appends to) #-------------------------------------------------------------------- AC_DEFUN([TEA_PATH_X], [ if test "${TEA_WINDOWINGSYSTEM}" = "x11" -a "${TEA_USE_SDL}" != "yes" ; then TEA_PATH_UNIX_X fi ]) AC_DEFUN([TEA_PATH_UNIX_X], [ AC_PATH_X not_really_there="" |
︙ | ︙ | |||
2944 2945 2946 2947 2948 2949 2950 | ;; *) # check for existence - allows for generic/win/unix VPATH # To add more dirs here (like 'src'), you have to update VPATH # in Makefile.in as well if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ | | | 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 | ;; *) # check for existence - allows for generic/win/unix VPATH # To add more dirs here (like 'src'), you have to update VPATH # in Makefile.in as well if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ -a ! -f "${srcdir}/macosx/$i" -a ! -f "${srcdir}/sdl/$i" \ ; then AC_MSG_ERROR([could not find source file '$i']) fi PKG_SOURCES="$PKG_SOURCES $i" # this assumes it is in a VPATH dir i=`basename $i` # handle user calling this before or after TEA_SETUP_COMPILER |
︙ | ︙ | |||
2988 2989 2990 2991 2992 2993 2994 | #------------------------------------------------------------------------ AC_DEFUN([TEA_ADD_STUB_SOURCES], [ vars="$@" for i in $vars; do # check for existence - allows for generic/win/unix VPATH if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ | | | 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 | #------------------------------------------------------------------------ AC_DEFUN([TEA_ADD_STUB_SOURCES], [ vars="$@" for i in $vars; do # check for existence - allows for generic/win/unix VPATH if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ -a ! -f "${srcdir}/macosx/$i" -a ! -f "${srcdir}/sdl/$i" \ ; then AC_MSG_ERROR([could not find stub source file '$i']) fi PKG_STUB_SOURCES="$PKG_STUB_SOURCES $i" # this assumes it is in a VPATH dir i=`basename $i` # handle user calling this before or after TEA_SETUP_COMPILER |
︙ | ︙ | |||
3316 3317 3318 3319 3320 3321 3322 | print("manifest needed") #endif ], [ # Could do a CHECK_PROG for mt, but should always be with MSVC8+ VC_MANIFEST_EMBED_DLL="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;2 ; fi" VC_MANIFEST_EMBED_EXE="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;1 ; fi" MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}" | > > > > > | | 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 | print("manifest needed") #endif ], [ # Could do a CHECK_PROG for mt, but should always be with MSVC8+ VC_MANIFEST_EMBED_DLL="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;2 ; fi" VC_MANIFEST_EMBED_EXE="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;1 ; fi" MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}" # Don't clean .manifest provided by the package (see TEA_ADD_MANIFEST) # or one created by Makefile or configure. Could use the /manifest:filename # linker option to explicitly set the linker-generated filename. eval eval "manifest=${PACKAGE_NAME}${SHARED_LIB_SUFFIX}.manifest" TEA_ADD_CLEANFILES([$manifest]) ]) MAKE_STUB_LIB="\${STLIB_LD} -nodefaultlib -out:\[$]@ \$(PKG_STUB_OBJECTS)" else MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(PKG_OBJECTS)" MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}" MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \$(PKG_STUB_OBJECTS)" fi |
︙ | ︙ | |||
3664 3665 3666 3667 3668 3669 3670 | TK_SRC_DIR_NATIVE=`${CYGPATH} ${TK_SRC_DIR}` TK_TOP_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}\" # Check to see if tk<Plat>Port.h isn't already with the public headers # Don't look for tkInt.h because that resides with tk.h in the core # sources, but the <plat>Port headers are in a different directory | > > | > > > > > | | | 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 | TK_SRC_DIR_NATIVE=`${CYGPATH} ${TK_SRC_DIR}` TK_TOP_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}\" # Check to see if tk<Plat>Port.h isn't already with the public headers # Don't look for tkInt.h because that resides with tk.h in the core # sources, but the <plat>Port headers are in a different directory if test -f "${ac_cv_c_tkh}/tkSDLPort.h"; then result="private headers found with public headers" elif test "${TEA_PLATFORM}" = "windows" -a \ -f "${ac_cv_c_tkh}/tkWinPort.h"; then result="private headers found with public headers" elif test "${TEA_PLATFORM}" = "unix" -a \ -f "${ac_cv_c_tkh}/tkUnixPort.h"; then result="private headers found with public headers" else TK_GENERIC_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/generic\" TK_XLIB_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/xlib\" if test "${TEA_PLATFORM}" = "windows"; then TK_PLATFORM_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/win\" else TK_PLATFORM_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/unix\" fi case ${TK_DEFS} in *PLATFORM_SDL*) TK_PLATFORM_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/sdl\" ;; esac # Overwrite the previous TK_INCLUDES as this should capture both # public and private headers in the same set. # We want to ensure these are substituted so as not to require # any *_NATIVE vars be defined in the Makefile TK_INCLUDES="-I${TK_GENERIC_DIR_NATIVE} -I${TK_PLATFORM_DIR_NATIVE}" # Detect and add ttk subdir if test -d "${TK_SRC_DIR}/generic/ttk"; then TK_INCLUDES="${TK_INCLUDES} -I\"${TK_SRC_DIR_NATIVE}/generic/ttk\"" fi if test "${TEA_WINDOWINGSYSTEM}" != "x11" -o "${TEA_USE_SDL}" = "yes" ; then TK_INCLUDES="${TK_INCLUDES} -I${TK_XLIB_DIR_NATIVE}" fi if test "${TEA_WINDOWINGSYSTEM}" = "aqua"; then TK_INCLUDES="${TK_INCLUDES} -I\"${TK_SRC_DIR_NATIVE}/macosx\"" fi if test "`uname -s`" = "Darwin"; then # If Tk was built as a framework, attempt to use # the framework's Headers and PrivateHeaders directories |
︙ | ︙ | |||
3817 3818 3819 3820 3821 3822 3823 | INCLUDE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tkh}` TK_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" AC_SUBST(TK_INCLUDES) | | | 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 | INCLUDE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tkh}` TK_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" AC_SUBST(TK_INCLUDES) if test "${TEA_WINDOWINGSYSTEM}" != "x11" -o "${TEA_USE_SDL}" = "yes" ; then # On Windows and Aqua, we need the X compat headers AC_MSG_CHECKING([for X11 header files]) if test ! -r "${INCLUDE_DIR_NATIVE}/X11/Xlib.h"; then INCLUDE_DIR_NATIVE="`${CYGPATH} ${TK_SRC_DIR}/xlib`" TK_XINCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" AC_SUBST(TK_XINCLUDES) fi |
︙ | ︙ | |||
4155 4156 4157 4158 4159 4160 4161 | CELIB_DIR=${ac_cv_c_celibconfig} CELIB_DIR=`echo "$CELIB_DIR" | sed -e 's!\\\!/!g'` AC_MSG_RESULT([found $CELIB_DIR]) fi fi ]) | > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 | CELIB_DIR=${ac_cv_c_celibconfig} CELIB_DIR=`echo "$CELIB_DIR" | sed -e 's!\\\!/!g'` AC_MSG_RESULT([found $CELIB_DIR]) fi fi ]) #-------------------------------------------------------------------- # TEA_EMBED_MANIFEST # # Figure out if we can embed the manifest where necessary # # Arguments: # An optional manifest to merge into DLL/EXE. # # Results: # Will define the following vars: # VC_MANIFEST_EMBED_DLL # VC_MANIFEST_EMBED_EXE # #-------------------------------------------------------------------- AC_DEFUN([TEA_EMBED_MANIFEST], [ AC_MSG_CHECKING(whether to embed manifest) AC_ARG_ENABLE(embedded-manifest, AC_HELP_STRING([--enable-embedded-manifest], [embed manifest if possible (default: yes)]), [embed_ok=$enableval], [embed_ok=yes]) VC_MANIFEST_EMBED_DLL= VC_MANIFEST_EMBED_EXE= result=no if test "$embed_ok" = "yes" -a "${SHARED_BUILD}" = "1" \ -a "$GCC" != "yes" ; then # Add the magic to embed the manifest into the dll/exe AC_EGREP_CPP([manifest needed], [ #if defined(_MSC_VER) && _MSC_VER >= 1400 print("manifest needed") #endif ], [ # Could do a CHECK_PROG for mt, but should always be with MSVC8+ # Could add 'if test -f' check, but manifest should be created # in this compiler case # Add in a manifest argument that may be specified VC_MANIFEST_EMBED_DLL="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest $1 -outputresource:\[$]@\;2 ; fi" VC_MANIFEST_EMBED_EXE="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest $1 -outputresource:\[$]@\;1 ; fi" result=yes if test "x$1" != x ; then result="yes ($1)" fi ]) fi AC_MSG_RESULT([$result]) AC_SUBST(VC_MANIFEST_EMBED_DLL) AC_SUBST(VC_MANIFEST_EMBED_EXE) ]) # Local Variables: # mode: autoconf # End: |
Changes to undroid/build-undroidwish-generic.sh.
︙ | ︙ | |||
62 63 64 65 66 67 68 | NM=nm export STRIP AR RANLIB CC CXX RC NM SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml" SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint tcl-augeas" | | | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | NM=nm export STRIP AR RANLIB CC CXX RC NM SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml" SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint tcl-augeas" SUBDIRS="${SUBDIRS} snack tkvnc tksvg VecTcl" ACTION="$1" if test -z "$ACTION" ; then ACTION=build fi clean_build_stamps() { |
︙ | ︙ | |||
93 94 95 96 97 98 99 100 101 102 103 104 105 106 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/unix/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } | > > > > > | 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/unix/build-stamp ;; VecTcl) rm -f VecTcl/WavReader/build-stamp rm -f VecTcl/TkBridge/build-stamp rm -f VecTcl/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } |
︙ | ︙ | |||
185 186 187 188 189 190 191 192 193 194 195 196 197 198 | ;; snack) ( exec >> build.log 2>&1 make -C snack/unix ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac | > > > > > > > > | 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 | ;; snack) ( exec >> build.log 2>&1 make -C snack/unix ${ACTION} || true ) || true ;; VecTcl) ( exec >> build.log 2>&1 make -C VecTcl/WavReader ${ACTION} || true make -C VecTcl/TkBridge ${ACTION} || true make -C VecTcl ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac |
︙ | ︙ | |||
901 902 903 904 905 906 907 908 909 910 911 912 913 914 | --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/sdl \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/sdl2wish* ${PFX_HERE}/lib/*/*.so | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 | --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/sdl \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTcl ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl test -e build-stamp && echo >&3 "already done" && exit 0 # already preprocessed, no need to expand touch generic/vectcl.[ch] generic/compathack.[ch] DESTDIR=${HERE} ./configure --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTclTk ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/TkBridge test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/sdl \ --with-vectcl=${PFX_HERE}/lib/vectcl0.3 --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build WavReader ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/WavReader test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --with-vectcl=${PFX_HERE}/lib/vectcl0.3 \ --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/sdl2wish* ${PFX_HERE}/lib/*/*.so |
︙ | ︙ | |||
994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 | cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* if test -d assets/v4l2* ; then cp -rp ${HERE}/v4l2*/demos assets/v4l2* fi if test -d assets/tcluvc* ; then cp -rp ${HERE}/tcluvc*/demos assets/tcluvc* fi # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' | > > > > | 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 | cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* if test -d assets/v4l2* ; then cp -rp ${HERE}/v4l2*/demos assets/v4l2* fi if test -d assets/tcluvc* ; then cp -rp ${HERE}/tcluvc*/demos assets/tcluvc* fi cp -rp ${PFX_HERE}/lib/vectcl0* assets cp -rp ${PFX_HERE}/lib/vectcltk0* assets cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk* cp -rp ${PFX_HERE}/lib/WavReader* assets # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' |
︙ | ︙ |
Changes to undroid/build-undroidwish-linux32.sh.
︙ | ︙ | |||
63 64 65 66 67 68 69 | NM=nm export STRIP AR RANLIB CC CXX RC NM SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml" SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint tcl-augeas" | | | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | NM=nm export STRIP AR RANLIB CC CXX RC NM SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml" SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint tcl-augeas" SUBDIRS="${SUBDIRS} snack tkvnc tksvg VecTcl" ACTION="$1" if test -z "$ACTION" ; then ACTION=build fi clean_build_stamps() { |
︙ | ︙ | |||
94 95 96 97 98 99 100 101 102 103 104 105 106 107 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/unix/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } | > > > > > | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/unix/build-stamp ;; VecTcl) rm -f VecTcl/WavReader/build-stamp rm -f VecTcl/TkBridge/build-stamp rm -f VecTcl/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } |
︙ | ︙ | |||
186 187 188 189 190 191 192 193 194 195 196 197 198 199 | ;; snack) ( exec >> build.log 2>&1 make -C snack/unix ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac | > > > > > > > > | 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 | ;; snack) ( exec >> build.log 2>&1 make -C snack/unix ${ACTION} || true ) || true ;; VecTcl) ( exec >> build.log 2>&1 make -C VecTcl/WavReader ${ACTION} || true make -C VecTcl/TkBridge ${ACTION} || true make -C VecTcl ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac |
︙ | ︙ | |||
904 905 906 907 908 909 910 911 912 913 914 915 916 917 | --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/sdl \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/sdl2wish* ${PFX_HERE}/lib/*/*.so | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 | --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/sdl \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTcl ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl test -e build-stamp && echo >&3 "already done" && exit 0 # already preprocessed, no need to expand touch generic/vectcl.[ch] generic/compathack.[ch] DESTDIR=${HERE} ./configure --build=i586-linux-gnu --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTclTk ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/TkBridge test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --build=i586-linux-gnu --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/sdl \ --with-vectcl=${PFX_HERE}/lib/vectcl0.3 --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build WavReader ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/WavReader test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --build=i586-linux-gnu --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --with-vectcl=${PFX_HERE}/lib/vectcl0.3 \ --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/sdl2wish* ${PFX_HERE}/lib/*/*.so |
︙ | ︙ | |||
997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 | cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* if test -d assets/v4l2* ; then cp -rp ${HERE}/v4l2*/demos assets/v4l2* fi if test -d assets/tcluvc* ; then cp -rp ${HERE}/tcluvc*/demos assets/tcluvc* fi # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' | > > > > | 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 | cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* if test -d assets/v4l2* ; then cp -rp ${HERE}/v4l2*/demos assets/v4l2* fi if test -d assets/tcluvc* ; then cp -rp ${HERE}/tcluvc*/demos assets/tcluvc* fi cp -rp ${PFX_HERE}/lib/vectcl0* assets cp -rp ${PFX_HERE}/lib/vectcltk0* assets cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk* cp -rp ${PFX_HERE}/lib/WavReader* assets # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' |
︙ | ︙ |
Changes to undroid/build-undroidwish-linux64.sh.
︙ | ︙ | |||
63 64 65 66 67 68 69 | NM=nm export STRIP AR RANLIB CC CXX RC NM SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml" SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint tcl-augeas" | | | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | NM=nm export STRIP AR RANLIB CC CXX RC NM SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml" SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint tcl-augeas" SUBDIRS="${SUBDIRS} snack tkvnc tksvg VecTcl" ACTION="$1" if test -z "$ACTION" ; then ACTION=build fi clean_build_stamps() { |
︙ | ︙ | |||
94 95 96 97 98 99 100 101 102 103 104 105 106 107 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/unix/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } | > > > > > | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/unix/build-stamp ;; VecTcl) rm -f VecTcl/WavReader/build-stamp rm -f VecTcl/TkBridge/build-stamp rm -f VecTcl/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } |
︙ | ︙ | |||
186 187 188 189 190 191 192 193 194 195 196 197 198 199 | ;; snack) ( exec >> build.log 2>&1 make -C snack/unix ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac | > > > > > > > > | 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 | ;; snack) ( exec >> build.log 2>&1 make -C snack/unix ${ACTION} || true ) || true ;; VecTcl) ( exec >> build.log 2>&1 make -C VecTcl/WavReader ${ACTION} || true make -C VecTcl/TkBridge ${ACTION} || true make -C VecTcl ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac |
︙ | ︙ | |||
904 905 906 907 908 909 910 911 912 913 914 915 916 917 | --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/sdl \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/sdl2wish* ${PFX_HERE}/lib/*/*.so | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 | --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/sdl \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTcl ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl test -e build-stamp && echo >&3 "already done" && exit 0 # already preprocessed, no need to expand touch generic/vectcl.[ch] generic/compathack.[ch] DESTDIR=${HERE} ./configure --build=x86_64-linux-gnu --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTclTk ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/TkBridge test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --build=x86_64-linux-gnu --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/sdl \ --with-vectcl=${PFX_HERE}/lib/vectcl0.3 --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build WavReader ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/WavReader test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --build=x86_64-linux-gnu --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --with-vectcl=${PFX_HERE}/lib/vectcl0.3 \ --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/sdl2wish* ${PFX_HERE}/lib/*/*.so |
︙ | ︙ | |||
997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 | cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* if test -d assets/v4l2* ; then cp -rp ${HERE}/v4l2*/demos assets/v4l2* fi if test -d assets/tcluvc* ; then cp -rp ${HERE}/tcluvc*/demos assets/tcluvc* fi # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' | > > > > | 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 | cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* if test -d assets/v4l2* ; then cp -rp ${HERE}/v4l2*/demos assets/v4l2* fi if test -d assets/tcluvc* ; then cp -rp ${HERE}/tcluvc*/demos assets/tcluvc* fi cp -rp ${PFX_HERE}/lib/vectcl0* assets cp -rp ${PFX_HERE}/lib/vectcltk0* assets cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk* cp -rp ${PFX_HERE}/lib/WavReader* assets # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' |
︙ | ︙ |
Changes to undroid/build-undroidwish-win32.sh.
︙ | ︙ | |||
103 104 105 106 107 108 109 | TWAPI_LDFLAGS="-L${AWDIR}/undroid/compat/win32/lib32" export STRIP AR RANLIB CC CXX RC NM TWAPI_LDFLAGS fi SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk tkhtml twapi" | | | 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 | TWAPI_LDFLAGS="-L${AWDIR}/undroid/compat/win32/lib32" export STRIP AR RANLIB CC CXX RC NM TWAPI_LDFLAGS fi SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk tkhtml twapi" SUBDIRS="${SUBDIRS} tclwmf libdmtx ZBar zint snack tkvnc tksvg VecTcl" ACTION="$1" if test -z "$ACTION" ; then ACTION=build fi clean_build_stamps() { |
︙ | ︙ | |||
134 135 136 137 138 139 140 141 142 143 144 145 146 147 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/win/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } | > > > > > | 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/win/build-stamp ;; VecTcl) rm -f VecTcl/WavReader/build-stamp rm -f VecTcl/TkBridge/build-stamp rm -f VecTcl/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } |
︙ | ︙ | |||
222 223 224 225 226 227 228 229 230 231 232 233 234 235 | ;; snack) ( exec >> build.log 2>&1 make -C snack/win ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac | > > > > > > > > | 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 | ;; snack) ( exec >> build.log 2>&1 make -C snack/win ${ACTION} || true ) || true ;; VecTcl) ( exec >> build.log 2>&1 make -C VecTcl/WavReader ${ACTION} || true make -C VecTcl/TkBridge ${ACTION} || true make -C VecTcl ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac |
︙ | ︙ | |||
855 856 857 858 859 860 861 862 863 864 865 866 867 868 | --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/sdl \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/*.exe ${PFX_HERE}/lib/*/*.dll | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 | --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/sdl \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTcl ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl test -e build-stamp && echo >&3 "already done" && exit 0 # already preprocessed, no need to expand touch generic/vectcl.[ch] generic/compathack.[ch] DESTDIR=${HERE} ./configure --build=i386-windows-mingw32 --prefix=${PFX} \ --with-tcl=${HERE}/tcl/win --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTclTk ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/TkBridge test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --build=i386-windows-mingw32 --prefix=${PFX} \ --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/sdl \ --with-vectcl=${PFX_HERE}/lib/vectcl0.3 --enable-threads || exit 1 make LIBS="-L${HERE}/VecTcl -lvectclstub03" || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build WavReader ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/WavReader test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --build=i386-windows-mingw32 --prefix=${PFX} \ --with-tcl=${HERE}/tcl/win --with-vectcl=${PFX_HERE}/lib/vectcl0.3 \ --enable-threads || exit 1 make LIBS="-L${HERE}/VecTcl -lvectclstub03" || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/*.exe ${PFX_HERE}/lib/*/*.dll |
︙ | ︙ | |||
941 942 943 944 945 946 947 948 949 950 951 952 953 954 | if test -r ${AWDIR}/undroid/wits/VERSION; then cp -rp ${AWDIR}/undroid/wits \ assets/wits$(cat ${AWDIR}/undroid/wits/VERSION) fi # some demos cp -p ${AWDIR}/assets/tkimg*/demo.tcl assets/Img* cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' | > > > > | 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 | if test -r ${AWDIR}/undroid/wits/VERSION; then cp -rp ${AWDIR}/undroid/wits \ assets/wits$(cat ${AWDIR}/undroid/wits/VERSION) fi # some demos cp -p ${AWDIR}/assets/tkimg*/demo.tcl assets/Img* cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* cp -rp ${PFX_HERE}/lib/vectcl0* assets cp -rp ${PFX_HERE}/lib/vectcltk0* assets cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk* cp -rp ${PFX_HERE}/lib/WavReader* assets # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' |
︙ | ︙ |
Changes to undroid/build-undroidwish-win64.sh.
︙ | ︙ | |||
97 98 99 100 101 102 103 | NM="x86_64-w64-mingw32-nm" export STRIP AR RANLIB CC CXX RC NM fi SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk tkhtml twapi" | | | 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | NM="x86_64-w64-mingw32-nm" export STRIP AR RANLIB CC CXX RC NM fi SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk tkhtml twapi" SUBDIRS="${SUBDIRS} tclwmf libdmtx ZBar zint snack tkvnc tksvg VecTcl" ACTION="$1" if test -z "$ACTION" ; then ACTION=build fi clean_build_stamps() { |
︙ | ︙ | |||
128 129 130 131 132 133 134 135 136 137 138 139 140 141 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/win/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } | > > > > > | 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/win/build-stamp ;; VecTcl) rm -f VecTcl/WavReader/build-stamp rm -f VecTcl/TkBridge/build-stamp rm -f VecTcl/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } |
︙ | ︙ | |||
216 217 218 219 220 221 222 223 224 225 226 227 228 229 | ;; snack) ( exec >> build.log 2>&1 make -C snack/win ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac | > > > > > > > > | 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 | ;; snack) ( exec >> build.log 2>&1 make -C snack/win ${ACTION} || true ) || true ;; VecTcl) ( exec >> build.log 2>&1 make -C VecTcl/WavReader ${ACTION} || true make -C VecTcl/TkBridge ${ACTION} || true make -C VecTcl ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac |
︙ | ︙ | |||
845 846 847 848 849 850 851 852 853 854 855 856 857 858 | --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/sdl \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/*.exe ${PFX_HERE}/lib/*/*.dll | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 | --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/sdl \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTcl ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl test -e build-stamp && echo >&3 "already done" && exit 0 # already preprocessed, no need to expand touch generic/vectcl.[ch] generic/compathack.[ch] DESTDIR=${HERE} ./configure --build=x86_64-windows-mingw32 --prefix=${PFX} \ --with-tcl=${HERE}/tcl/win --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTclTk ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/TkBridge test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --build=x86_64-windows-mingw32 --prefix=${PFX} \ --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/sdl \ --with-vectcl=${PFX_HERE}/lib/vectcl0.3 --enable-threads || exit 1 make LIBS="-L${HERE}/VecTcl -lvectclstub03" || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build WavReader ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/WavReader test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --build=x86_64-windows-mingw32 --prefix=${PFX} \ --with-tcl=${HERE}/tcl/win --with-vectcl=${PFX_HERE}/lib/vectcl0.3 \ --enable-threads || exit 1 make LIBS="-L${HERE}/VecTcl -lvectclstub03" || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/*.exe ${PFX_HERE}/lib/*/*.dll |
︙ | ︙ | |||
931 932 933 934 935 936 937 938 939 940 941 942 943 944 | if test -r ${AWDIR}/undroid/wits/VERSION; then cp -rp ${AWDIR}/undroid/wits \ assets/wits$(cat ${AWDIR}/undroid/wits/VERSION) fi # some demos cp -p ${AWDIR}/assets/tkimg*/demo.tcl assets/Img* cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' | > > > > | 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 | if test -r ${AWDIR}/undroid/wits/VERSION; then cp -rp ${AWDIR}/undroid/wits \ assets/wits$(cat ${AWDIR}/undroid/wits/VERSION) fi # some demos cp -p ${AWDIR}/assets/tkimg*/demo.tcl assets/Img* cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* cp -rp ${PFX_HERE}/lib/vectcl0* assets cp -rp ${PFX_HERE}/lib/vectcltk0* assets cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk* cp -rp ${PFX_HERE}/lib/WavReader* assets # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' |
︙ | ︙ |
Changes to undroid/build-vanilla-generic.sh.
︙ | ︙ | |||
63 64 65 66 67 68 69 | NM=nm export STRIP AR RANLIB CC CXX RC NM SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml" SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint" | | | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | NM=nm export STRIP AR RANLIB CC CXX RC NM SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml" SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint" SUBDIRS="${SUBDIRS} tcl-augeas tktray snack tkvnc tksvg VecTcl" ACTION="$1" if test -z "$ACTION" ; then ACTION=build fi clean_build_stamps() { |
︙ | ︙ | |||
94 95 96 97 98 99 100 101 102 103 104 105 106 107 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/unix/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } | > > > > > | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/unix/build-stamp ;; VecTcl) rm -f VecTcl/WavReader/build-stamp rm -f VecTcl/TkBridge/build-stamp rm -f VecTcl/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } |
︙ | ︙ | |||
186 187 188 189 190 191 192 193 194 195 196 197 198 199 | ;; snack) ( exec >> build.log 2>&1 make -C snack/unix ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac | > > > > > > > > | 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 | ;; snack) ( exec >> build.log 2>&1 make -C snack/unix ${ACTION} || true ) || true ;; VecTcl) ( exec >> build.log 2>&1 make -C VecTcl/WavReader ${ACTION} || true make -C VecTcl/TkBridge ${ACTION} || true make -C VecTcl ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac |
︙ | ︙ | |||
852 853 854 855 856 857 858 859 860 861 862 863 864 865 | --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/unix \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/wish* ${PFX_HERE}/lib/*/*.so | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 | --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/unix \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTcl ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl test -e build-stamp && echo >&3 "already done" && exit 0 # already preprocessed, no need to expand touch generic/vectcl.[ch] generic/compathack.[ch] DESTDIR=${HERE} ./configure --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTclTk ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/TkBridge test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/unix \ --with-vectcl=${PFX_HERE}/lib/vectcl0.3 --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build WavReader ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/WavReader test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --with-vectcl=${PFX_HERE}/lib/vectcl0.3 \ --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/wish* ${PFX_HERE}/lib/*/*.so |
︙ | ︙ | |||
946 947 948 949 950 951 952 953 954 955 956 957 958 959 | cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* if test -d assets/v4l2* ; then cp -rp ${HERE}/v4l2*/demos assets/v4l2* fi if test -d assets/tcluvc* ; then cp -rp ${HERE}/tcluvc*/demos assets/tcluvc* fi # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' | > > > > | 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 | cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* if test -d assets/v4l2* ; then cp -rp ${HERE}/v4l2*/demos assets/v4l2* fi if test -d assets/tcluvc* ; then cp -rp ${HERE}/tcluvc*/demos assets/tcluvc* fi cp -rp ${PFX_HERE}/lib/vectcl0* assets cp -rp ${PFX_HERE}/lib/vectcltk0* assets cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk* cp -rp ${PFX_HERE}/lib/WavReader* assets # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' |
︙ | ︙ | |||
1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 | cp -rp ${PFX_HERE}/lib/Trf* tassets cp -rp ${PFX_HERE}/lib/TclCurl* tassets cp -rp ${PFX_HERE}/lib/dbus* tassets cp -rp ${PFX_HERE}/lib/tclx* tassets cp -rp ${PFX_HERE}/lib/augeas* tassets cp -rp ${PFX_HERE}/lib/snack* tassets rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl # zlibtcl from tkimg needed for trf mkdir -p tassets/zlibtcl1.2.8.1 cp -p ${PFX_HERE}/lib/Img*/*zlibtcl* tassets/zlibtcl* ( cd tassets/zlibtcl* head -2 ${PFX_HERE}/lib/Img*/pkgIndex.tcl > pkgIndex.tcl ) | > > | 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 | cp -rp ${PFX_HERE}/lib/Trf* tassets cp -rp ${PFX_HERE}/lib/TclCurl* tassets cp -rp ${PFX_HERE}/lib/dbus* tassets cp -rp ${PFX_HERE}/lib/tclx* tassets cp -rp ${PFX_HERE}/lib/augeas* tassets cp -rp ${PFX_HERE}/lib/snack* tassets rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl cp -rp ${PFX_HERE}/lib/vectcl0* tassets cp -rp ${PFX_HERE}/lib/WavReader* tassets # zlibtcl from tkimg needed for trf mkdir -p tassets/zlibtcl1.2.8.1 cp -p ${PFX_HERE}/lib/Img*/*zlibtcl* tassets/zlibtcl* ( cd tassets/zlibtcl* head -2 ${PFX_HERE}/lib/Img*/pkgIndex.tcl > pkgIndex.tcl ) |
︙ | ︙ |
Changes to undroid/build-vanilla-linux32.sh.
︙ | ︙ | |||
63 64 65 66 67 68 69 | NM=nm export STRIP AR RANLIB CC CXX RC NM SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml" SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint" | | | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | NM=nm export STRIP AR RANLIB CC CXX RC NM SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml" SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint" SUBDIRS="${SUBDIRS} tcl-augeas tktray snack tkvnc tksvg VecTcl" ACTION="$1" if test -z "$ACTION" ; then ACTION=build fi clean_build_stamps() { |
︙ | ︙ | |||
94 95 96 97 98 99 100 101 102 103 104 105 106 107 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/unix/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } | > > > > > | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/unix/build-stamp ;; VecTcl) rm -f VecTcl/WavReader/build-stamp rm -f VecTcl/TkBridge/build-stamp rm -f VecTcl/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } |
︙ | ︙ | |||
186 187 188 189 190 191 192 193 194 195 196 197 198 199 | ;; snack) ( exec >> build.log 2>&1 make -C snack/unix ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac | > > > > > > > > | 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 | ;; snack) ( exec >> build.log 2>&1 make -C snack/unix ${ACTION} || true ) || true ;; VecTcl) ( exec >> build.log 2>&1 make -C VecTcl/WavReader ${ACTION} || true make -C VecTcl/TkBridge ${ACTION} || true make -C VecTcl ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac |
︙ | ︙ | |||
852 853 854 855 856 857 858 859 860 861 862 863 864 865 | --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/unix \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/wish* ${PFX_HERE}/lib/*/*.so | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 | --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/unix \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTcl ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl test -e build-stamp && echo >&3 "already done" && exit 0 # already preprocessed, no need to expand touch generic/vectcl.[ch] generic/compathack.[ch] DESTDIR=${HERE} ./configure --build=i586-linux-gnu --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTclTk ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/TkBridge test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --build=i586-linux-gnu --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/unix \ --with-vectcl=${PFX_HERE}/lib/vectcl0.3 --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build WavReader ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/WavReader test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --build=i586-linux-gnu --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --with-vectcl=${PFX_HERE}/lib/vectcl0.3 \ --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/wish* ${PFX_HERE}/lib/*/*.so |
︙ | ︙ | |||
946 947 948 949 950 951 952 953 954 955 956 957 958 959 | cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* if test -d assets/v4l2* ; then cp -rp ${HERE}/v4l2*/demos assets/v4l2* fi if test -d assets/tcluvc* ; then cp -rp ${HERE}/tcluvc*/demos assets/tcluvc* fi # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' | > > > > | 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 | cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* if test -d assets/v4l2* ; then cp -rp ${HERE}/v4l2*/demos assets/v4l2* fi if test -d assets/tcluvc* ; then cp -rp ${HERE}/tcluvc*/demos assets/tcluvc* fi cp -rp ${PFX_HERE}/lib/vectcl0* assets cp -rp ${PFX_HERE}/lib/vectcltk0* assets cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk* cp -rp ${PFX_HERE}/lib/WavReader* assets # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' |
︙ | ︙ | |||
1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 | cp -rp ${PFX_HERE}/lib/Trf* tassets cp -rp ${PFX_HERE}/lib/TclCurl* tassets cp -rp ${PFX_HERE}/lib/dbus* tassets cp -rp ${PFX_HERE}/lib/tclx* tassets cp -rp ${PFX_HERE}/lib/augeas* tassets cp -rp ${PFX_HERE}/lib/snack* tassets rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl # zlibtcl from tkimg needed for trf mkdir -p tassets/zlibtcl1.2.8.1 cp -p ${PFX_HERE}/lib/Img*/*zlibtcl* tassets/zlibtcl* ( cd tassets/zlibtcl* head -2 ${PFX_HERE}/lib/Img*/pkgIndex.tcl > pkgIndex.tcl ) | > > | 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 | cp -rp ${PFX_HERE}/lib/Trf* tassets cp -rp ${PFX_HERE}/lib/TclCurl* tassets cp -rp ${PFX_HERE}/lib/dbus* tassets cp -rp ${PFX_HERE}/lib/tclx* tassets cp -rp ${PFX_HERE}/lib/augeas* tassets cp -rp ${PFX_HERE}/lib/snack* tassets rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl cp -rp ${PFX_HERE}/lib/vectcl0* tassets cp -rp ${PFX_HERE}/lib/WavReader* tassets # zlibtcl from tkimg needed for trf mkdir -p tassets/zlibtcl1.2.8.1 cp -p ${PFX_HERE}/lib/Img*/*zlibtcl* tassets/zlibtcl* ( cd tassets/zlibtcl* head -2 ${PFX_HERE}/lib/Img*/pkgIndex.tcl > pkgIndex.tcl ) |
︙ | ︙ |
Changes to undroid/build-vanilla-linux64.sh.
︙ | ︙ | |||
63 64 65 66 67 68 69 | NM=nm export STRIP AR RANLIB CC CXX RC NM SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml" SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint" | | | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | NM=nm export STRIP AR RANLIB CC CXX RC NM SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml" SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint" SUBDIRS="${SUBDIRS} tcl-augeas tktray snack tkvnc tksvg VecTcl" ACTION="$1" if test -z "$ACTION" ; then ACTION=build fi clean_build_stamps() { |
︙ | ︙ | |||
94 95 96 97 98 99 100 101 102 103 104 105 106 107 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/unix/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } | > > > > > | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/unix/build-stamp ;; VecTcl) rm -f VecTcl/WavReader/build-stamp rm -f VecTcl/TkBridge/build-stamp rm -f VecTcl/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } |
︙ | ︙ | |||
186 187 188 189 190 191 192 193 194 195 196 197 198 199 | ;; snack) ( exec >> build.log 2>&1 make -C snack/unix ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac | > > > > > > > > | 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 | ;; snack) ( exec >> build.log 2>&1 make -C snack/unix ${ACTION} || true ) || true ;; VecTcl) ( exec >> build.log 2>&1 make -C VecTcl/WavReader ${ACTION} || true make -C VecTcl/TkBridge ${ACTION} || true make -C VecTcl ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac |
︙ | ︙ | |||
852 853 854 855 856 857 858 859 860 861 862 863 864 865 | --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/unix \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/wish* ${PFX_HERE}/lib/*/*.so | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 | --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/unix \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTcl ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl test -e build-stamp && echo >&3 "already done" && exit 0 # already preprocessed, no need to expand touch generic/vectcl.[ch] generic/compathack.[ch] DESTDIR=${HERE} ./configure --build=x86_64-linux-gnu --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTclTk ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/TkBridge test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --build=x86_64-linux-gnu --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/unix \ --with-vectcl=${PFX_HERE}/lib/vectcl0.3 --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build WavReader ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/WavReader test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --build=x86_64-linux-gnu --prefix=${PFX} \ --with-tcl=${HERE}/tcl/unix --with-vectcl=${PFX_HERE}/lib/vectcl0.3 \ --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/wish* ${PFX_HERE}/lib/*/*.so |
︙ | ︙ | |||
946 947 948 949 950 951 952 953 954 955 956 957 958 959 | cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* if test -d assets/v4l2* ; then cp -rp ${HERE}/v4l2*/demos assets/v4l2* fi if test -d assets/tcluvc* ; then cp -rp ${HERE}/tcluvc*/demos assets/tcluvc* fi # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' | > > > > | 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 | cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* if test -d assets/v4l2* ; then cp -rp ${HERE}/v4l2*/demos assets/v4l2* fi if test -d assets/tcluvc* ; then cp -rp ${HERE}/tcluvc*/demos assets/tcluvc* fi cp -rp ${PFX_HERE}/lib/vectcl0* assets cp -rp ${PFX_HERE}/lib/vectcltk0* assets cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk* cp -rp ${PFX_HERE}/lib/WavReader* assets # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' |
︙ | ︙ | |||
1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 | cp -rp ${PFX_HERE}/lib/Trf* tassets cp -rp ${PFX_HERE}/lib/TclCurl* tassets cp -rp ${PFX_HERE}/lib/dbus* tassets cp -rp ${PFX_HERE}/lib/tclx* tassets cp -rp ${PFX_HERE}/lib/augeas* tassets cp -rp ${PFX_HERE}/lib/snack* tassets rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl # zlibtcl from tkimg needed for trf mkdir -p tassets/zlibtcl1.2.8.1 cp -p ${PFX_HERE}/lib/Img*/*zlibtcl* tassets/zlibtcl* ( cd tassets/zlibtcl* head -2 ${PFX_HERE}/lib/Img*/pkgIndex.tcl > pkgIndex.tcl ) | > > | 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 | cp -rp ${PFX_HERE}/lib/Trf* tassets cp -rp ${PFX_HERE}/lib/TclCurl* tassets cp -rp ${PFX_HERE}/lib/dbus* tassets cp -rp ${PFX_HERE}/lib/tclx* tassets cp -rp ${PFX_HERE}/lib/augeas* tassets cp -rp ${PFX_HERE}/lib/snack* tassets rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl cp -rp ${PFX_HERE}/lib/vectcl0* tassets cp -rp ${PFX_HERE}/lib/WavReader* tassets # zlibtcl from tkimg needed for trf mkdir -p tassets/zlibtcl1.2.8.1 cp -p ${PFX_HERE}/lib/Img*/*zlibtcl* tassets/zlibtcl* ( cd tassets/zlibtcl* head -2 ${PFX_HERE}/lib/Img*/pkgIndex.tcl > pkgIndex.tcl ) |
︙ | ︙ |
Changes to undroid/build-vanilla-win32.sh.
︙ | ︙ | |||
104 105 106 107 108 109 110 | TWAPI_LDFLAGS="-L${AWDIR}/undroid/compat/win32/lib32" export STRIP AR RANLIB CC CXX RC NM TWAPI_LDFLAGS fi SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk tkhtml twapi" | | | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 | TWAPI_LDFLAGS="-L${AWDIR}/undroid/compat/win32/lib32" export STRIP AR RANLIB CC CXX RC NM TWAPI_LDFLAGS fi SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk tkhtml twapi" SUBDIRS="${SUBDIRS} tclwmf libdmtx ZBar zint snack winico tkvnc tksvg VecTcl" ACTION="$1" if test -z "$ACTION" ; then ACTION=build fi clean_build_stamps() { |
︙ | ︙ | |||
135 136 137 138 139 140 141 142 143 144 145 146 147 148 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/win/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } | > > > > > | 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/win/build-stamp ;; VecTcl) rm -f VecTcl/WavReader/build-stamp rm -f VecTcl/TkBridge/build-stamp rm -f VecTcl/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } |
︙ | ︙ | |||
223 224 225 226 227 228 229 230 231 232 233 234 235 236 | ;; snack) ( exec >> build.log 2>&1 make -C snack/win ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac | > > > > > > > > | 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 | ;; snack) ( exec >> build.log 2>&1 make -C snack/win ${ACTION} || true ) || true ;; VecTcl) ( exec >> build.log 2>&1 make -C VecTcl/WavReader ${ACTION} || true make -C VecTcl/TkBridge ${ACTION} || true make -C VecTcl ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac |
︙ | ︙ | |||
815 816 817 818 819 820 821 822 823 824 825 826 827 828 | --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/win \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/*.exe ${PFX_HERE}/lib/*/*.dll | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 | --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/win \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTcl ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl test -e build-stamp && echo >&3 "already done" && exit 0 # already preprocessed, no need to expand touch generic/vectcl.[ch] generic/compathack.[ch] DESTDIR=${HERE} ./configure --build=i386-windows-mingw32 --prefix=${PFX} \ --with-tcl=${HERE}/tcl/win --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTclTk ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/TkBridge test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --build=i386-windows-mingw32 --prefix=${PFX} \ --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/win \ --with-vectcl=${PFX_HERE}/lib/vectcl0.3 --enable-threads || exit 1 make LIBS="-L${HERE}/VecTcl -lvectclstub03" || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build WavReader ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/WavReader test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --build=i386-windows-mingw32 --prefix=${PFX} \ --with-tcl=${HERE}/tcl/win --with-vectcl=${PFX_HERE}/lib/vectcl0.3 \ --enable-threads || exit 1 make LIBS="-L${HERE}/VecTcl -lvectclstub03" || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/*.exe ${PFX_HERE}/lib/*/*.dll |
︙ | ︙ | |||
903 904 905 906 907 908 909 910 911 912 913 914 915 916 | if test -r ${AWDIR}/undroid/wits/VERSION; then cp -rp ${AWDIR}/undroid/wits \ assets/wits$(cat ${AWDIR}/undroid/wits/VERSION) fi # some demos cp -p ${AWDIR}/assets/tkimg*/demo.tcl assets/Img* cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' | > > > > | 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 | if test -r ${AWDIR}/undroid/wits/VERSION; then cp -rp ${AWDIR}/undroid/wits \ assets/wits$(cat ${AWDIR}/undroid/wits/VERSION) fi # some demos cp -p ${AWDIR}/assets/tkimg*/demo.tcl assets/Img* cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* cp -rp ${PFX_HERE}/lib/vectcl0* assets cp -rp ${PFX_HERE}/lib/vectcltk0* assets cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk* cp -rp ${PFX_HERE}/lib/WavReader* assets # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' |
︙ | ︙ | |||
980 981 982 983 984 985 986 987 988 989 990 991 992 993 | cp -rp ${PFX_HERE}/lib/tbcload* tassets cp -rp ${PFX_HERE}/lib/Memchan* tassets cp -rp ${PFX_HERE}/lib/Trf* tassets cp -rp ${PFX_HERE}/lib/TclCurl* tassets cp -rp ${PFX_HERE}/lib/twapi* tassets cp -rp ${PFX_HERE}/lib/snack* tassets rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl # zlibtcl from tkimg needed for trf mkdir -p tassets/zlibtcl1.2.8.1 cp -p ${PFX_HERE}/lib/Img*/zlibtcl*.dll tassets/zlibtcl* ( cd tassets/zlibtcl* echo > pkgIndex.tcl 'package ifneeded zlibtcl 1.2.8.1 \' echo >> pkgIndex.tcl ' [list load [file join $dir zlibtcl1281.dll]]' | > > | 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 | cp -rp ${PFX_HERE}/lib/tbcload* tassets cp -rp ${PFX_HERE}/lib/Memchan* tassets cp -rp ${PFX_HERE}/lib/Trf* tassets cp -rp ${PFX_HERE}/lib/TclCurl* tassets cp -rp ${PFX_HERE}/lib/twapi* tassets cp -rp ${PFX_HERE}/lib/snack* tassets rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl cp -rp ${PFX_HERE}/lib/vectcl0* tassets cp -rp ${PFX_HERE}/lib/WavReader* tassets # zlibtcl from tkimg needed for trf mkdir -p tassets/zlibtcl1.2.8.1 cp -p ${PFX_HERE}/lib/Img*/zlibtcl*.dll tassets/zlibtcl* ( cd tassets/zlibtcl* echo > pkgIndex.tcl 'package ifneeded zlibtcl 1.2.8.1 \' echo >> pkgIndex.tcl ' [list load [file join $dir zlibtcl1281.dll]]' |
︙ | ︙ |
Changes to undroid/build-vanilla-win64.sh.
︙ | ︙ | |||
98 99 100 101 102 103 104 | NM="x86_64-w64-mingw32-nm" export STRIP AR RANLIB CC CXX RC NM fi SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk tkhtml twapi" | | | 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | NM="x86_64-w64-mingw32-nm" export STRIP AR RANLIB CC CXX RC NM fi SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt" SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk tkhtml twapi" SUBDIRS="${SUBDIRS} tclwmf libdmtx ZBar zint snack winico tkvnc tksvg VecTcl" ACTION="$1" if test -z "$ACTION" ; then ACTION=build fi clean_build_stamps() { |
︙ | ︙ | |||
129 130 131 132 133 134 135 136 137 138 139 140 141 142 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/win/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } | > > > > > | 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 | ;; zint) rm -f zint/backend_tcl/build-stamp ;; snack) rm -f snack/win/build-stamp ;; VecTcl) rm -f VecTcl/WavReader/build-stamp rm -f VecTcl/TkBridge/build-stamp rm -f VecTcl/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } |
︙ | ︙ | |||
217 218 219 220 221 222 223 224 225 226 227 228 229 230 | ;; snack) ( exec >> build.log 2>&1 make -C snack/win ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac | > > > > > > > > | 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 | ;; snack) ( exec >> build.log 2>&1 make -C snack/win ${ACTION} || true ) || true ;; VecTcl) ( exec >> build.log 2>&1 make -C VecTcl/WavReader ${ACTION} || true make -C VecTcl/TkBridge ${ACTION} || true make -C VecTcl ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac |
︙ | ︙ | |||
805 806 807 808 809 810 811 812 813 814 815 816 817 818 | --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/win \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/*.exe ${PFX_HERE}/lib/*/*.dll | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 | --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/win \ --enable-threads || exit 1 make binaries || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTcl ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl test -e build-stamp && echo >&3 "already done" && exit 0 # already preprocessed, no need to expand touch generic/vectcl.[ch] generic/compathack.[ch] DESTDIR=${HERE} ./configure --build=x86_64-windows-mingw32 --prefix=${PFX} \ --with-tcl=${HERE}/tcl/win --enable-threads || exit 1 make || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build VecTclTk ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/TkBridge test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --build=x86_64-windows-mingw32 --prefix=${PFX} \ --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/win \ --with-vectcl=${PFX_HERE}/lib/vectcl0.3 --enable-threads || exit 1 make LIBS="-L${HERE}/VecTcl -lvectclstub03" || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build WavReader ... " ( exec 3>&1 exec >> build.log 2>&1 cd VecTcl/WavReader test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} CFLAGS=-I${HERE}/VecTcl/generic LDFLAGS=-L${HERE}/VecTcl \ ./configure --build=x86_64-windows-mingw32 --prefix=${PFX} \ --with-tcl=${HERE}/tcl/win --with-vectcl=${PFX_HERE}/lib/vectcl0.3 \ --enable-threads || exit 1 make LIBS="-L${HERE}/VecTcl -lvectclstub03" || exit 1 make install-binaries install-libraries DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "strip binaries ... " ( exec 3>&1 exec >> build.log 2>&1 set -x $STRIP ${PFX_HERE}/bin/*.exe ${PFX_HERE}/lib/*/*.dll |
︙ | ︙ | |||
893 894 895 896 897 898 899 900 901 902 903 904 905 906 | if test -r ${AWDIR}/undroid/wits/VERSION; then cp -rp ${AWDIR}/undroid/wits \ assets/wits$(cat ${AWDIR}/undroid/wits/VERSION) fi # some demos cp -p ${AWDIR}/assets/tkimg*/demo.tcl assets/Img* cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' | > > > > | 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 | if test -r ${AWDIR}/undroid/wits/VERSION; then cp -rp ${AWDIR}/undroid/wits \ assets/wits$(cat ${AWDIR}/undroid/wits/VERSION) fi # some demos cp -p ${AWDIR}/assets/tkimg*/demo.tcl assets/Img* cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* cp -rp ${PFX_HERE}/lib/vectcl0* assets cp -rp ${PFX_HERE}/lib/vectcltk0* assets cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk* cp -rp ${PFX_HERE}/lib/WavReader* assets # add shortcuts providing builtin:widget, builtin:tksqlite, etc. ( cd assets echo > widget \ 'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget' echo > tksqlite \ 'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl' |
︙ | ︙ | |||
970 971 972 973 974 975 976 977 978 979 980 981 982 983 | cp -rp ${PFX_HERE}/lib/tbcload* tassets cp -rp ${PFX_HERE}/lib/Memchan* tassets cp -rp ${PFX_HERE}/lib/Trf* tassets cp -rp ${PFX_HERE}/lib/TclCurl* tassets cp -rp ${PFX_HERE}/lib/twapi* tassets cp -rp ${PFX_HERE}/lib/snack* tassets rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl # zlibtcl from tkimg needed for trf mkdir -p tassets/zlibtcl1.2.8.1 cp -p ${PFX_HERE}/lib/Img*/zlibtcl*.dll tassets/zlibtcl* ( cd tassets/zlibtcl* echo > pkgIndex.tcl 'package ifneeded zlibtcl 1.2.8.1 \' echo >> pkgIndex.tcl ' [list load [file join $dir zlibtcl1281.dll]]' | > > | 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 | cp -rp ${PFX_HERE}/lib/tbcload* tassets cp -rp ${PFX_HERE}/lib/Memchan* tassets cp -rp ${PFX_HERE}/lib/Trf* tassets cp -rp ${PFX_HERE}/lib/TclCurl* tassets cp -rp ${PFX_HERE}/lib/twapi* tassets cp -rp ${PFX_HERE}/lib/snack* tassets rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl cp -rp ${PFX_HERE}/lib/vectcl0* tassets cp -rp ${PFX_HERE}/lib/WavReader* tassets # zlibtcl from tkimg needed for trf mkdir -p tassets/zlibtcl1.2.8.1 cp -p ${PFX_HERE}/lib/Img*/zlibtcl*.dll tassets/zlibtcl* ( cd tassets/zlibtcl* echo > pkgIndex.tcl 'package ifneeded zlibtcl 1.2.8.1 \' echo >> pkgIndex.tcl ' [list load [file join $dir zlibtcl1281.dll]]' |
︙ | ︙ |