diff --git a/project/jni/application/ninslash/src b/project/jni/application/ninslash/src index c4956477e..bf0782bc7 160000 --- a/project/jni/application/ninslash/src +++ b/project/jni/application/ninslash/src @@ -1 +1 @@ -Subproject commit c4956477ee4d64deacc8273adff8226c226ab7ea +Subproject commit bf0782bc713c423c54a505d0431d74c85b2d1972 diff --git a/project/jni/openssl/compile.sh b/project/jni/openssl/compile.sh index 193a3de98..bb620269a 100755 --- a/project/jni/openssl/compile.sh +++ b/project/jni/openssl/compile.sh @@ -48,3 +48,5 @@ done rm -rf include cp -r -L build/armeabi-v7a/include ./ || exit 1 +sed -i.tmp 's@".*/dist/.*"@"."@g' include/openssl/opensslconf.h +rm -f include/openssl/opensslconf.h.tmp diff --git a/project/jni/openssl/include/openssl/opensslconf.h b/project/jni/openssl/include/openssl/opensslconf.h index d6b328bc3..7fac1ff5d 100644 --- a/project/jni/openssl/include/openssl/opensslconf.h +++ b/project/jni/openssl/include/openssl/opensslconf.h @@ -118,8 +118,8 @@ extern "C" { #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define ENGINESDIR "/home/pelya/src/endless_space/bochs/sdl/project/jni/openssl/build/armeabi-v7a/dist/lib/engines" -#define OPENSSLDIR "/home/pelya/src/endless_space/bochs/sdl/project/jni/openssl/build/armeabi-v7a/dist/ssl" +#define ENGINESDIR "." +#define OPENSSLDIR "." #endif #endif