Check-in [68819df035]
Not logged in

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

Overview
Comment:more changes related to [56d112579d]
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 68819df035980aae835602a5d985a62dfd80bf4a
User & Date: chw 2016-09-28 21:36:53
Context
2016-09-30
05:16
add tcllib upstream changes check-in: cde6bcdd9d user: chw tags: trunk
2016-09-28
21:36
more changes related to [56d112579d] check-in: 68819df035 user: chw tags: trunk
19:45
unfinished improvements in build infrastructure to allow building AndroWish on Windows check-in: 56d112579d user: chw tags: trunk
Changes

Changes to assets/INVENTORY.

45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
{opt assets/tkcon*}
{opt assets/tkhtml3* {libs/$arch/libtkhtml3.so jni/tkhtml}}
{opt assets/tkimg* {libs/$arch/libtkimg.so libs/$arch/libjpeg_tkimg.so libs/$arch/libpng_tkimg.so libs/$arch/libtiff_tkimg.so jni/tkimg jni/jpeg jni/libpng jni/tiff}}
{opt assets/tklib*}
{opt assets/tkpath* {libs/$arch/libtkpath.so jni/tkpath}}
{opt assets/tksqlite*}
{opt assets/tktable* {libs/$arch/libtktable.so jni/tktable}}
{opt assets/tls* {libs/$arch/libtcltls.so libs/$arch/libssl_tls.so libs/$arch/libcry*_tls.so jni/tls jni/openssl jni/libressl}}
{opt assets/treectrl* {libs/$arch/libtreectrl.so jni/tktreectrl}}
{opt assets/trf* {libs/$arch/libtcltrf.so jni/trf}}
{opt assets/trofs* {libs/$arch/libtrofs.so jni/trofs}}
{opt jni/tcl/library/tzdata}
{opt assets/twdbgi*}
{opt assets/udp* {libs/$arch/libtcludp.so jni/tcludp}}
{opt assets/upnp*}







|







45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
{opt assets/tkcon*}
{opt assets/tkhtml3* {libs/$arch/libtkhtml3.so jni/tkhtml}}
{opt assets/tkimg* {libs/$arch/libtkimg.so libs/$arch/libjpeg_tkimg.so libs/$arch/libpng_tkimg.so libs/$arch/libtiff_tkimg.so jni/tkimg jni/jpeg jni/libpng jni/tiff}}
{opt assets/tklib*}
{opt assets/tkpath* {libs/$arch/libtkpath.so jni/tkpath}}
{opt assets/tksqlite*}
{opt assets/tktable* {libs/$arch/libtktable.so jni/tktable}}
{opt assets/tls* {libs/$arch/libtcltls.so libs/$arch/libssl_tls.so libs/$arch/libcrypto_tls.so jni/tls jni/openssl jni/libressl}}
{opt assets/treectrl* {libs/$arch/libtreectrl.so jni/tktreectrl}}
{opt assets/trf* {libs/$arch/libtcltrf.so jni/trf}}
{opt assets/trofs* {libs/$arch/libtrofs.so jni/trofs}}
{opt jni/tcl/library/tzdata}
{opt assets/twdbgi*}
{opt assets/udp* {libs/$arch/libtcludp.so jni/tcludp}}
{opt assets/upnp*}

Changes to src/org/libsdl/app/SDLActivity.java.

72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
..
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
    // Load the .so
    public void loadLibraries() {
        // System.loadLibrary("stlport_shared");
        System.loadLibrary("SDL2");
        System.loadLibrary("tcl");
        System.loadLibrary("freetype");
        System.loadLibrary("tk");
        try {
            System.loadLibrary("iodbc");
        } catch (UnsatisfiedLinkError e) {
            Log.e(TAG, "no iodbc");
        }
        try {
            System.loadLibrary("jpeg_tkimg");
        } catch (UnsatisfiedLinkError e) {
            Log.e(TAG, "no jpeg");
        }
        try {
            System.loadLibrary("tiff_tkimg");
................................................................................
        } catch (UnsatisfiedLinkError e) {
            Log.e(TAG, "no png");
        }
        try {
            System.loadLibrary("crypto_tls");
            System.loadLibrary("ssl_tls");
        } catch (UnsatisfiedLinkError e) {
            Log.e(TAG, "no openssl");
        }
        try {
            System.loadLibrary("curl");
        } catch (UnsatisfiedLinkError e) {
            Log.e(TAG, "no libcurl");
        }
        try {







<
<
<
<
<







 







|







72
73
74
75
76
77
78





79
80
81
82
83
84
85
..
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
    // Load the .so
    public void loadLibraries() {
        // System.loadLibrary("stlport_shared");
        System.loadLibrary("SDL2");
        System.loadLibrary("tcl");
        System.loadLibrary("freetype");
        System.loadLibrary("tk");





        try {
            System.loadLibrary("jpeg_tkimg");
        } catch (UnsatisfiedLinkError e) {
            Log.e(TAG, "no jpeg");
        }
        try {
            System.loadLibrary("tiff_tkimg");
................................................................................
        } catch (UnsatisfiedLinkError e) {
            Log.e(TAG, "no png");
        }
        try {
            System.loadLibrary("crypto_tls");
            System.loadLibrary("ssl_tls");
        } catch (UnsatisfiedLinkError e) {
            Log.e(TAG, "no libressl");
        }
        try {
            System.loadLibrary("curl");
        } catch (UnsatisfiedLinkError e) {
            Log.e(TAG, "no libcurl");
        }
        try {