diff --git a/.gitignore b/.gitignore index ac1454a8..1c454d72 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ captures old.git qpython/qpython.key qpython/cn/release/output.json +qpython/od/release/* qpython/cn qpython/google qpython/os diff --git a/qbaselib b/qbaselib index 95eff225..d379973c 160000 --- a/qbaselib +++ b/qbaselib @@ -1 +1 @@ -Subproject commit 95eff225d5d57815f4c04501c5464f89946ac2fc +Subproject commit d379973cb724f65f342a1fbfc7b426b185b7ce32 diff --git a/qpysdk/src/main/libs/armeabi-v7a/libSDL2.so b/qpysdk/src/main/libs/armeabi-v7a/libSDL2.so index ca4e5d7a..5338e91e 100755 Binary files a/qpysdk/src/main/libs/armeabi-v7a/libSDL2.so and b/qpysdk/src/main/libs/armeabi-v7a/libSDL2.so differ diff --git a/qpysdk/src/main/libs/armeabi-v7a/libSDL2_gfx.so b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_gfx.so index 539ce57d..80d01e32 100755 Binary files a/qpysdk/src/main/libs/armeabi-v7a/libSDL2_gfx.so and b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_gfx.so differ diff --git a/qpysdk/src/main/libs/armeabi-v7a/libSDL2_image.so b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_image.so index 3e66d2cd..03484635 100755 Binary files a/qpysdk/src/main/libs/armeabi-v7a/libSDL2_image.so and b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_image.so differ diff --git a/qpysdk/src/main/libs/armeabi-v7a/libSDL2_mixer.so b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_mixer.so index 8f198280..c48ebb56 100755 Binary files a/qpysdk/src/main/libs/armeabi-v7a/libSDL2_mixer.so and b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_mixer.so differ diff --git a/qpysdk/src/main/libs/armeabi-v7a/libSDL2_ttf.so b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_ttf.so index d3e619c1..98aeea15 100755 Binary files a/qpysdk/src/main/libs/armeabi-v7a/libSDL2_ttf.so and b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_ttf.so differ diff --git a/qpysdk/src/main/libs/armeabi-v7a/libmain.so b/qpysdk/src/main/libs/armeabi-v7a/libmain.so index ea9639e7..44643b21 100755 Binary files a/qpysdk/src/main/libs/armeabi-v7a/libmain.so and b/qpysdk/src/main/libs/armeabi-v7a/libmain.so differ diff --git a/qpysdk/src/main/libs/armeabi-v7a/libpng16.so b/qpysdk/src/main/libs/armeabi-v7a/libpng16.so index a8ddeb71..a16e3512 100755 Binary files a/qpysdk/src/main/libs/armeabi-v7a/libpng16.so and b/qpysdk/src/main/libs/armeabi-v7a/libpng16.so differ diff --git a/qpysdk/src/main/libs/armeabi-v7a/libpython2.7.so b/qpysdk/src/main/libs/armeabi-v7a/libpython2.7.so index 1832397b..4b3fbaa5 100755 Binary files a/qpysdk/src/main/libs/armeabi-v7a/libpython2.7.so and b/qpysdk/src/main/libs/armeabi-v7a/libpython2.7.so differ diff --git a/qpysdk/src/main/libs/armeabi-v7a/libqpysdk.so b/qpysdk/src/main/libs/armeabi-v7a/libqpysdk.so index 21700dac..1b189d79 100755 Binary files a/qpysdk/src/main/libs/armeabi-v7a/libqpysdk.so and b/qpysdk/src/main/libs/armeabi-v7a/libqpysdk.so differ diff --git a/qpython/build.gradle b/qpython/build.gradle index a52c9d31..738e1a9e 100644 --- a/qpython/build.gradle +++ b/qpython/build.gradle @@ -104,7 +104,10 @@ android { // resValue "string", "app_name", "Qpython" applicationId "org.qpython.qpy" } - + od { +// resValue "string", "app_name", "Qpython" + applicationId "org.qpython.qpy" + } op { // resValue "string", "app_name", "QpythonL" applicationId "com.hipipal.qpyplus"