Check-in [db7ebb5b8c]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:minor cleanup in [undroidwish] build scripts regarding zint and snack
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: db7ebb5b8cc1c1f985d3ee7b55e842514487e59b
User & Date: chw 2016-11-11 07:11:39
Context
2016-11-11
10:10
update libressl to version 2.4.4 check-in: b77b8063eb user: chw tags: trunk
07:11
minor cleanup in [undroidwish] build scripts regarding zint and snack check-in: db7ebb5b8c user: chw tags: trunk
07:09
update zint to version 2.5.2 check-in: 6ad4565b78 user: chw tags: trunk
Changes

Deleted assets/zint2.5.0/demo.tcl.

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
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
package require Tk
package require zint
wm title . "ZINT Demo"
wm minsize . 480 320
if {[info command sdltk] eq "sdltk"} {
    wm attributes . -fullscreen 1
    set padx 30
    set pady 20
} else {
    wm geometry . 480x320
    set padx 5
    set pady 5
}
image create photo ::zintimg
pack [::ttk::combobox .c -values [lsort [zint symbologies]] -state readonly] \
    -side top -fill x -padx $padx -pady $pady
.c set Datamatrix
pack [::ttk::entry .e] -side top -fill x -padx $padx -pady $pady
.e insert end 12345
bind .e <Return> Generate
pack [::ttk::button .b -text Generate -command Generate] -fill x -side top \
    -padx $padx -pady $pady
proc Generate {} {
    ::zintimg blank
    ::zintimg configure -width 1 -height 1
    ::zintimg blank
    ::zintimg configure -width 0 -height 0
    if {[catch {zint encode [.e get] ::zintimg -barcode [.c get]} e]} {
        tk_messageBox -message $e -title "Zint error"
    } else {
	set w [image width ::zintimg]
	set h [image height ::zintimg]
	set lw [winfo width .l]
	set lh [winfo height .l]
	set sx [expr {int(1.0 * $lw / $w)}]
	set sy [expr {int(1.0 * $lh / $h)}]
	if {$sy < $sx} {
	    set sx $sy
	}
	if {$sx <= 0} {
	    set sx [expr {1.1 * $lw / $w}]
	    set sy [expr {1.1 * $lh / $h}]
	    if {$sy < $sx} {
		set sx $sy
	    }
	}
	::zintimg blank
	::zintimg configure -width 1 -height 1
	::zintimg blank
	::zintimg configure -width 0 -height 0
	catch {
	    zint encode [.e get] ::zintimg -barcode [.c get] -scale $sx
	}
    }
}
pack [label .l -image ::zintimg -bg white] -side top -fill both -expand 1 \
    -padx $padx -pady $pady
bind .e <Configure> {
    after cancel Generate
    after idle Generate
}
bind .c <<ComboboxSelected>> {
    after cancel Generate
    after idle Generate
}
bind all <Break> exit
bind all <Control-q> exit
bind all <Alt-q> exit
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<








































































































































Deleted assets/zint2.5.0/pkgIndex.tcl.

1
2
package ifneeded zint 2.5.0 \
    [list load libzint[info sharedlibextension] Zint]
<
<




jni/zint/backend/dmatrix.c became executable.

jni/zint/backend/library.c became executable.

jni/zint/backend_tcl/configure became executable.

Changes to undroid/build-undroidwish-generic.sh.

844
845
846
847
848
849
850

851
852
853
854
855
856
857
...
873
874
875
876
877
878
879

880
881
882
883
884
885
886
887

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} ./configure --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/unix
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} sh ./configure --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/sdl \
    --enable-threads --enable-alsa || exit 1
  perl -pi -e "s@-DALSA@-DALSA -DPLATFORM_SDL=1@g" Makefile
  perl -pi -e "s@-lX11@@g" Makefile
  perl -pi -e "s@${PFX}/@${PFX_HERE}/@g" Makefile
  make all || exit 1
  make install exec_prefix=${PFX_HERE} prefix=${PFX_HERE} || exit 1







>







 







>
|







844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
...
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/unix
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/sdl \
    --enable-threads --enable-alsa || exit 1
  perl -pi -e "s@-DALSA@-DALSA -DPLATFORM_SDL=1@g" Makefile
  perl -pi -e "s@-lX11@@g" Makefile
  perl -pi -e "s@${PFX}/@${PFX_HERE}/@g" Makefile
  make all || exit 1
  make install exec_prefix=${PFX_HERE} prefix=${PFX_HERE} || exit 1

Changes to undroid/build-undroidwish-linux32.sh.

846
847
848
849
850
851
852

853
854
855
856
857
858
859
...
876
877
878
879
880
881
882

883
884
885
886
887
888
889
890
) || fail

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl

  test -e build-stamp && echo >&3 "already done" && exit 0
  DESTDIR=${HERE} ./configure --build=i586-linux-gnu --prefix=${PFX} \
    --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 -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/unix
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} sh ./configure --build=i586-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/sdl \
    --enable-threads --enable-alsa || exit 1
  perl -pi -e "s@-DALSA@-DALSA -DPLATFORM_SDL=1@g" Makefile
  perl -pi -e "s@-lX11@@g" Makefile
  perl -pi -e "s@${PFX}/@${PFX_HERE}/@g" Makefile
  make all || exit 1
  make install exec_prefix=${PFX_HERE} prefix=${PFX_HERE} || exit 1







>







 







>
|







846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
...
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
) || fail

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  chmod +x ./configure
  test -e build-stamp && echo >&3 "already done" && exit 0
  DESTDIR=${HERE} ./configure --build=i586-linux-gnu --prefix=${PFX} \
    --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 -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/unix
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --build=i586-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/sdl \
    --enable-threads --enable-alsa || exit 1
  perl -pi -e "s@-DALSA@-DALSA -DPLATFORM_SDL=1@g" Makefile
  perl -pi -e "s@-lX11@@g" Makefile
  perl -pi -e "s@${PFX}/@${PFX_HERE}/@g" Makefile
  make all || exit 1
  make install exec_prefix=${PFX_HERE} prefix=${PFX_HERE} || exit 1

Changes to undroid/build-undroidwish-linux64.sh.

847
848
849
850
851
852
853

854
855
856
857
858
859
860
...
876
877
878
879
880
881
882

883
884
885
886
887
888
889
890

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} ./configure --build=x86_64-linux-gnu --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/unix
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} sh ./configure --build=x86_64-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/sdl \
    --enable-threads --enable-alsa || exit 1
  perl -pi -e "s@-DALSA@-DALSA -DPLATFORM_SDL=1@g" Makefile
  perl -pi -e "s@-lX11@@g" Makefile
  perl -pi -e "s@${PFX}/@${PFX_HERE}/@g" Makefile
  make all || exit 1
  make install exec_prefix=${PFX_HERE} prefix=${PFX_HERE} || exit 1







>







 







>
|







847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
...
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --build=x86_64-linux-gnu --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/unix
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --build=x86_64-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/sdl \
    --enable-threads --enable-alsa || exit 1
  perl -pi -e "s@-DALSA@-DALSA -DPLATFORM_SDL=1@g" Makefile
  perl -pi -e "s@-lX11@@g" Makefile
  perl -pi -e "s@${PFX}/@${PFX_HERE}/@g" Makefile
  make all || exit 1
  make install exec_prefix=${PFX_HERE} prefix=${PFX_HERE} || exit 1

Changes to undroid/build-undroidwish-win32.sh.

814
815
816
817
818
819
820

821
822
823
824
825
826
827
...
829
830
831
832
833
834
835

836
837
838
839
840
841
842
843

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} ./configure --build=i386-windows-mingw32 --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/win
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} sh ./configure --build=i386-windows-mingw32 \
    --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/sdl \
    --enable-threads || exit 1
  make all || exit 1
  make install DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"







>







 







>
|







814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
...
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --build=i386-windows-mingw32 --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/win
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --build=i386-windows-mingw32 \
    --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/sdl \
    --enable-threads || exit 1
  make all || exit 1
  make install DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"

Changes to undroid/build-undroidwish-win64.sh.

804
805
806
807
808
809
810

811
812
813
814
815
816
817
...
819
820
821
822
823
824
825

826
827
828
829
830
831
832
833

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} ./configure --build=x86_64-windows-mingw32 --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/win
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} sh ./configure --build=x86_64-windows-mingw32 \
    --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/sdl \
    --enable-threads || exit 1
  make all || exit 1
  make install DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"







>







 







>
|







804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
...
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --build=x86_64-windows-mingw32 --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/win
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --build=x86_64-windows-mingw32 \
    --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/sdl \
    --enable-threads || exit 1
  make all || exit 1
  make install DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"

Changes to undroid/build-vanilla-generic.sh.

782
783
784
785
786
787
788

789
790
791
792
793
794
795
...
826
827
828
829
830
831
832

833
834
835
836
837
838
839
840

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} ./configure --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/unix
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} sh ./configure --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/unix \
    --enable-threads --enable-alsa || exit 1
  perl -pi -e "s@${PFX}/@${PFX_HERE}/@g" Makefile
  make all || exit 1
  make install exec_prefix=${PFX_HERE} prefix=${PFX_HERE} || exit 1
  touch build-stamp
  echo >&3 "done"







>







 







>
|







782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
...
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/unix
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/unix \
    --enable-threads --enable-alsa || exit 1
  perl -pi -e "s@${PFX}/@${PFX_HERE}/@g" Makefile
  make all || exit 1
  make install exec_prefix=${PFX_HERE} prefix=${PFX_HERE} || exit 1
  touch build-stamp
  echo >&3 "done"

Changes to undroid/build-vanilla-linux32.sh.

782
783
784
785
786
787
788

789
790
791
792
793
794
795
...
826
827
828
829
830
831
832

833
834
835
836
837
838
839
840

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} ./configure --build=i568-linux-gnu --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/unix
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} sh ./configure --build=i586-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/unix \
    --enable-threads --enable-alsa || exit 1
  perl -pi -e "s@${PFX}/@${PFX_HERE}/@g" Makefile
  make all || exit 1
  make install exec_prefix=${PFX_HERE} prefix=${PFX_HERE} || exit 1
  touch build-stamp
  echo >&3 "done"







>







 







>
|







782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
...
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --build=i568-linux-gnu --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/unix
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --build=i586-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/unix \
    --enable-threads --enable-alsa || exit 1
  perl -pi -e "s@${PFX}/@${PFX_HERE}/@g" Makefile
  make all || exit 1
  make install exec_prefix=${PFX_HERE} prefix=${PFX_HERE} || exit 1
  touch build-stamp
  echo >&3 "done"

Changes to undroid/build-vanilla-linux64.sh.

782
783
784
785
786
787
788

789
790
791
792
793
794
795
...
826
827
828
829
830
831
832

833
834
835
836
837
838
839
840

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} ./configure --build=x86_64-linux-gnu --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/unix
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} sh ./configure --build=x86_64-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/unix \
    --enable-threads --enable-alsa || exit 1
  perl -pi -e "s@${PFX}/@${PFX_HERE}/@g" Makefile
  make all || exit 1
  make install exec_prefix=${PFX_HERE} prefix=${PFX_HERE} || exit 1
  touch build-stamp
  echo >&3 "done"







>







 







>
|







782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
...
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --build=x86_64-linux-gnu --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/unix
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --build=x86_64-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --with-tk=${HERE}/sdl2tk/unix \
    --enable-threads --enable-alsa || exit 1
  perl -pi -e "s@${PFX}/@${PFX_HERE}/@g" Makefile
  make all || exit 1
  make install exec_prefix=${PFX_HERE} prefix=${PFX_HERE} || exit 1
  touch build-stamp
  echo >&3 "done"

Changes to undroid/build-vanilla-win32.sh.

760
761
762
763
764
765
766

767
768
769
770
771
772
773
...
775
776
777
778
779
780
781

782
783
784
785
786
787
788
789

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} ./configure --build=i386-windows-mingw32 --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/win
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} sh ./configure --build=i386-windows-mingw32 \
    --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/win \
    --enable-threads || exit 1
  make all || exit 1
  make install DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"







>







 







>
|







760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
...
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --build=i386-windows-mingw32 --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/win
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --build=i386-windows-mingw32 \
    --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/win \
    --enable-threads || exit 1
  make all || exit 1
  make install DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"

Changes to undroid/build-vanilla-win64.sh.

750
751
752
753
754
755
756

757
758
759
760
761
762
763
...
765
766
767
768
769
770
771

772
773
774
775
776
777
778
779

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} ./configure --build=x86_64-windows-mingw32 --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/win
  test -e build-stamp && echo >&3 "already done" && exit 0

  DESTDIR=${HERE} sh ./configure --build=x86_64-windows-mingw32 \
    --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/win \
    --enable-threads || exit 1
  make all || exit 1
  make install DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"







>







 







>
|







750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
...
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781

echo -n "build zint ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd zint/backend_tcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --build=x86_64-windows-mingw32 --prefix=${PFX} \
    --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"
................................................................................

echo -n "build snack ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd snack/win
  test -e build-stamp && echo >&3 "already done" && exit 0
  chmod +x ./configure
  DESTDIR=${HERE} ./configure --build=x86_64-windows-mingw32 \
    --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/win --with-tk=${HERE}/sdl2tk/win \
    --enable-threads || exit 1
  make all || exit 1
  make install DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"