diff --git a/README.md b/README.md index 9630c06df0..7d0c5bff54 100644 --- a/README.md +++ b/README.md @@ -191,7 +191,7 @@ pkg install python-dev termux-tools ndk-stl ndk-sysroot clang libvorbis-dev libo Then, you can build and install the .apk right away using these commands: ```bash -python makepanda/makepanda.py --everything --target android-21 --installer +python makepanda/makepanda.py --everything --target android-21 --no-tiff --installer xdg-open panda3d.apk ``` diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 4cd0600622..46fd15ae3a 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -5156,7 +5156,7 @@ if (not RUNTIME and GetTarget() == 'android'): TargetAdd('libppython.dll', input='libp3framework.dll') TargetAdd('libppython.dll', input='libp3android.dll') TargetAdd('libppython.dll', input=COMMON_PANDA_LIBS) - TargetAdd('libppython.dll', opts=['MODULE', 'ANDROID']) + TargetAdd('libppython.dll', opts=['MODULE', 'ANDROID', 'PYTHON']) # # DIRECTORY: panda/src/androiddisplay/ diff --git a/panda/src/distort/oSphereLens.cxx b/panda/src/distort/oSphereLens.cxx index 7b8bd35591..9175453fd9 100644 --- a/panda/src/distort/oSphereLens.cxx +++ b/panda/src/distort/oSphereLens.cxx @@ -48,7 +48,7 @@ do_extrude(const Lens::CData *lens_cdata, LPoint3 f = point2d * do_get_film_mat_inv(lens_cdata); PN_stdfloat focal_length = do_get_focal_length(lens_cdata); - PN_stdfloat angle = f[0] * cylindrical_k / focal_length; + PN_stdfloat angle = f[0] * ospherical_k / focal_length; PN_stdfloat sinAngle, cosAngle; csincos(deg_2_rad(angle), &sinAngle, &cosAngle);