diff --git a/android/BOINC/jni/Application.mk b/android/BOINC/jni/Application.mk new file mode 100644 index 0000000000..4a17da3f05 --- /dev/null +++ b/android/BOINC/jni/Application.mk @@ -0,0 +1 @@ +APP_ABI := armeabi-v7a x86 mips diff --git a/android/BOINC/jni/dummy.c b/android/BOINC/jni/dummy.c index 30d097db29..a38e62b5a2 100644 --- a/android/BOINC/jni/dummy.c +++ b/android/BOINC/jni/dummy.c @@ -1,5 +1,10 @@ #include #include "include/dummy.h" + +// this library's purpose is to trigger implicit architecture filters in GooglePlay. +// in order to build the library, get the Android NDK and run +// ndk-build +// in the root directory of this project. JNIEXPORT jstring JNICALL Java_edu_berkeley_boinc_BOINCActivity_getDummyString (JNIEnv *env, jobject thisObj) { diff --git a/android/BOINC/libs/armeabi-v7a/libdummyjni.so b/android/BOINC/libs/armeabi-v7a/libdummyjni.so deleted file mode 100755 index 06e9e3e754..0000000000 Binary files a/android/BOINC/libs/armeabi-v7a/libdummyjni.so and /dev/null differ diff --git a/android/BOINC/libs/mips/libdummyjni.so b/android/BOINC/libs/mips/libdummyjni.so deleted file mode 100755 index 06e9e3e754..0000000000 Binary files a/android/BOINC/libs/mips/libdummyjni.so and /dev/null differ diff --git a/android/BOINC/libs/x86/libdummyjni.so b/android/BOINC/libs/x86/libdummyjni.so deleted file mode 100755 index 06e9e3e754..0000000000 Binary files a/android/BOINC/libs/x86/libdummyjni.so and /dev/null differ diff --git a/android/build_boinc_x86.sh b/android/build_boinc_x86.sh index 610225469a..ff9c78d300 100755 --- a/android/build_boinc_x86.sh +++ b/android/build_boinc_x86.sh @@ -14,14 +14,14 @@ export BOINC=".." #BOINC source code export ANDROIDTC="$HOME/androidx86-tc" export TCBINARIES="$ANDROIDTC/bin" -export TCINCLUDES="$ANDROIDTC/i686-android-linux" +export TCINCLUDES="$ANDROIDTC/i686-linux-android" export TCSYSROOT="$ANDROIDTC/sysroot" export STDCPPTC="$TCINCLUDES/lib/libstdc++.a" export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin" -export CC=i686-android-linux-gcc -export CXX=i686-android-linux-g++ -export LD=i686-android-linux-ld +export CC=i686-linux-android-gcc +export CXX=i686-linux-android-g++ +export LD=i686-linux-android-ld export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer" export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer" export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog" @@ -48,7 +48,7 @@ make stage echo "Stripping Binaries" cd stage/usr/local/bin -i686-android-linux-strip * +i686-linux-android-strip * cd ../../../../ echo "Copy Assets" diff --git a/android/build_curl_x86.sh b/android/build_curl_x86.sh index 0b2355ef64..c9b52df24f 100755 --- a/android/build_curl_x86.sh +++ b/android/build_curl_x86.sh @@ -14,14 +14,14 @@ CURL="/home/boincadm/src/curl-7.28.1" #CURL sources, required by BOINC export ANDROIDTC="$HOME/androidx86-tc" export TCBINARIES="$ANDROIDTC/bin" -export TCINCLUDES="$ANDROIDTC/i686-android-linux" +export TCINCLUDES="$ANDROIDTC/i686-linux-android" export TCSYSROOT="$ANDROIDTC/sysroot" export STDCPPTC="$TCINCLUDES/lib/libstdc++.a" export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin" -export CC=i686-android-linux-gcc -export CXX=i686-android-linux-g++ -export LD=i686-android-linux-ld +export CC=i686-linux-android-gcc +export CXX=i686-linux-android-g++ +export LD=i686-linux-android-ld export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer" export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer" export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog" diff --git a/android/build_openssl_x86.sh b/android/build_openssl_x86.sh index 5d43bf5e1e..fb1b86b5d1 100755 --- a/android/build_openssl_x86.sh +++ b/android/build_openssl_x86.sh @@ -14,14 +14,14 @@ OPENSSL="/home/boincadm/src/openssl-1.0.1c" #openSSL sources, requiered by BOINC export ANDROIDTC="$HOME/androidx86-tc" export TCBINARIES="$ANDROIDTC/bin" -export TCINCLUDES="$ANDROIDTC/i686-android-linux" +export TCINCLUDES="$ANDROIDTC/i686-linux-android" export TCSYSROOT="$ANDROIDTC/sysroot" export STDCPPTC="$TCINCLUDES/lib/libstdc++.a" export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin" -export CC=i686-android-linux-gcc -export CXX=i686-android-linux-g++ -export LD=i686-android-linux-ld +export CC=i686-linux-android-gcc +export CXX=i686-linux-android-g++ +export LD=i686-linux-android-ld export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer" export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer" export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog" diff --git a/clientscr/Mac_Saver_ModuleView.m b/clientscr/Mac_Saver_ModuleView.m index 86d03e9fed..97f0085893 100644 --- a/clientscr/Mac_Saver_ModuleView.m +++ b/clientscr/Mac_Saver_ModuleView.m @@ -609,7 +609,7 @@ static int compareOSVersionTo(int toMajor, int toMinor) { err = Gestalt(gestaltSystemVersionMajor, &major); if (err != noErr) { - fprintf(stderr, "Gestalt(gestaltSystemVersionMajor) returned error %d\n", err); + fprintf(stderr, "Gestalt(gestaltSystemVersionMajor) returned error %ld\n", (long)err); fflush(stderr); return 0; } @@ -617,7 +617,7 @@ static int compareOSVersionTo(int toMajor, int toMinor) { if (major > toMajor) return 1; err = Gestalt(gestaltSystemVersionMinor, &minor); if (err != noErr) { - fprintf(stderr, "Gestalt(gestaltSystemVersionMinor) returned error %d\n", err); + fprintf(stderr, "Gestalt(gestaltSystemVersionMinor) returned error %ld\n", (long)err); fflush(stderr); return 0; } diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index d874487fd0..cb24b93c8e 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -1150,7 +1150,7 @@ DDE1741E166746F70059083A /* app_config.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = app_config.cpp; sourceTree = ""; }; DDE1741F166746F70059083A /* app_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = app_config.h; sourceTree = ""; }; DDE2552B07C62F3E008E7D6E /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; - DDE36DF517C3896A000E78D6 /* libwx_osx_cocoa_static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwx_osx_cocoa_static.a; path = "../../wxWidgets-3.0.0-rc1/build/osx/build/Debug/libwx_osx_cocoa_static.a"; sourceTree = ""; }; + DDE36DF517C3896A000E78D6 /* libwx_osx_cocoa_static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwx_osx_cocoa_static.a; path = "../../wxWidgets-3.0.0/build/osx/build/Debug/libwx_osx_cocoa_static.a"; sourceTree = SOURCE_ROOT; }; DDE3A87F0E90D1BF00A363A7 /* client_state.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = client_state.cpp; sourceTree = ""; }; DDE3A8840E90D23400A363A7 /* scheduler_op.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scheduler_op.cpp; sourceTree = ""; }; DDE41C250C1FCA8F00CA1F86 /* graphics2_util.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = graphics2_util.cpp; sourceTree = ""; };