Merge pull request #43 from utopia-rise/3.2-update

3.2 update

.travis.yml

@@ -3,7 +3,7 @@ python:
   - "2.7"
 matrix:
   include:
-    - env: PLATFORM=ios BINDINGS_ARGS="godotbinpath=../Godot.app platform=ios generate_bindings=True bits=64 target=release" DRIVER_ARGS="p=ios target=release dynamic=no"
+    - env: PLATFORM=ios BINDINGS_ARGS="platform=ios generate_bindings=True ios_arch=arm64 target=release" DRIVER_ARGS="platform=ios target=release ios_arch=arm64"
       os: osx
       osx_image: xcode10.2
       compiler: clang
@@ -14,12 +14,12 @@ matrix:
             - scons
             - p7zip
           update: true
-    - env: PLATFORM=linux BINDINGS_ARGS="godotbinpath=../Godot_v3.1.1-stable_x11.64 use_llvm=yes platform=linux generate_bindings=True bits=64 target=release clang-path=/usr/local/clang-7.0.0/bin/" DRIVER_ARGS="p=linux use_llvm=yes target=release clang-path=/usr/local/clang-7.0.0/bin/"
+    - env: PLATFORM=linux BINDINGS_ARGS="use_llvm=yes platform=linux generate_bindings=True bits=64 target=release" DRIVER_ARGS="platform=linux use_llvm=yes target=release"
       os: linux
       compiler: clang
     - env: PLATFORM=android BINDINGS_ARGS="" DRIVER_ARGS="NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=Android.mk  APP_PLATFORM=android-21" ANDROID_NDK_ROOT="/home/travis/build/utopia-rise/android-sdk/ndk-bundle"
       os: linux
-    - env: PLATFORM=osx BINDINGS_ARGS="godotbinpath=../Godot.app platform=osx generate_bindings=True bits=64 target=release" DRIVER_ARGS="p=osx target=release"
+    - env: PLATFORM=osx BINDINGS_ARGS="platform=osx generate_bindings=True bits=64 target=release" DRIVER_ARGS="platform=osx target=release"
       os: osx
       compiler: clang
       addons:
@@ -29,7 +29,7 @@ matrix:
             - scons
             - p7zip
           update: true
-    - env: PLATFORM=windows BINDINGS_ARGS="godotbinpath=../Godot_v3.1.1-stable_win64.exe platform=windows generate_bindings=True bits=64 target=release" DRIVER_ARGS="p=windows target=release"
+    - env: PLATFORM=windows BINDINGS_ARGS="platform=windows generate_bindings=True bits=64 target=release" DRIVER_ARGS="platform=windows target=release"
       os: windows
       compiler: clang
 before_install:
@@ -50,34 +50,32 @@ before_install:
   - if [[ "$PLATFORM" == "android" ]]; then tar -xvf fmodstudioapi20002android.tar.gz; fi
   - if [[ "$PLATFORM" == "linux" ]]; then mv fmodstudioapi20002linux/api linux; fi
   - if [[ "$PLATFORM" == "osx" ]]; then cp -r "/Volumes/FMOD Programmers API Mac/FMOD Programmers API/api" osx; fi
-  - if [[ "$PLATFORM" == "windows" ]]; then mv api/ windows && mv windows/core/lib/x86/fmod_vc.lib windows/core/lib/x86/fmod.lib && mv windows/core/lib/x64/fmod_vc.lib windows/core/lib/x64/fmod.lib && mv windows/studio/lib/x86/fmodstudio_vc.lib windows/studio/lib/x86/fmodstudio.lib && mv windows/studio/lib/x64/fmodstudio_vc.lib windows/studio/lib/x64/fmodstudio.lib; fi
+  - if [[ "$PLATFORM" == "windows" ]]; then mv api/ windows; fi
   - if [[ "$PLATFORM" == "ios" ]]; then cp -r "/Volumes/FMOD Programmers API iOS/FMOD Programmers API/api" ios; fi
   - if [[ "$PLATFORM" == "android" ]]; then mv fmodstudioapi20002android/api android; fi
   - cd ../../
-  - if [[ "$PLATFORM" == "linux" || "$PLATFORM" == "android" ]]; then sudo apt-get install -y p7zip-full && wget https://downloads.tuxfamily.org/godotengine/3.1.1/Godot_v3.1.1-stable_x11.64.zip && 7z x Godot_v3.1.1-stable_x11.64.zip; fi
-  - if [[ "$PLATFORM" == "osx" || "$PLATFORM" == "ios" ]]; then wget https://downloads.tuxfamily.org/godotengine/3.1.1/Godot_v3.1.1-stable_osx.64.zip && 7z x Godot_v3.1.1-stable_osx.64.zip; fi
-  - if [[ "$PLATFORM" == "windows" ]]; then wget https://downloads.tuxfamily.org/godotengine/3.1.1/Godot_v3.1.1-stable_win64.exe.zip && 7z x Godot_v3.1.1-stable_win64.exe.zip; fi
+  - if [[ "$PLATFORM" == "osx" ]]; then wget https://downloads.tuxfamily.org/godotengine/3.2.1/Godot_v3.2.1-stable_osx.64.zip && 7z x Godot_v3.2.1-stable_osx.64.zip; fi
   - git clone --recursive  https://github.com/utopia-rise/godot-cpp godot-cpp
   - cd godot-cpp
-  - git checkout 3.1-utopia
+  - git checkout utopia-3.2
   - git submodule update --recursive
 install:
-  - if [[ "$PLATFORM" == "android" ]]; then scons godotbinpath=../Godot_v3.1.1-stable_x11.64 platform=android generate_bindings=True bits=64 target=release android-abi=arm && scons platform=android generate_bindings=True bits=64 target=release android-abi=arm64 && cd ../fmod-gdnative; fi
+  - if [[ "$PLATFORM" == "android" ]]; then scons platform=android generate_bindings=True target=release android_arch=armv7 && scons platform=android generate_bindings=True target=release android_arch=arm64v8 && cd ../fmod-gdnative; fi
   - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then C:/scons/scons.bat $BINDINGS_ARGS && cd ../fmod-gdnative; elif [[ "$PLATFORM" != "android" ]]; then scons $BINDINGS_ARGS && cd ../fmod-gdnative; fi
   - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then C:/scons/scons.bat $DRIVER_ARGS; elif [[ "$PLATFORM" == "android" ]]; then $ANDROID_NDK_ROOT/ndk-build $DRIVER_ARGS && rm libs/arm64-v8a/libc++_shared.so && rm libs/arm64-v8a/libfmod.so && rm libs/arm64-v8a/libfmodstudio.so && rm libs/armeabi-v7a/libc++_shared.so && rm libs/armeabi-v7a/libfmod.so && rm libs/armeabi-v7a/libfmodstudio.so && tar zcvf libandroid_fmod_gdnative.tar.gz libs/; else scons $DRIVER_ARGS; fi
 script:
-  - if [[ "$PLATFORM" == "osx" ]]; then mkdir -p demo/addons/fmod/libs/osx/ && cp bin/libGodotFmod.osx.dylib demo/addons/fmod/libs/osx/ && cp ../libs/fmod/osx/core/lib/libfmod.dylib demo/addons/fmod/libs/osx/ && cp ../libs/fmod/osx/studio/lib/libfmodstudio.dylib demo/addons/fmod/libs/osx/ && cd demo && ./run_tests.sh ../../Godot.app/Contents/MacOS/Godot && cd ..; fi
+  - if [[ "$PLATFORM" == "osx" ]]; then mkdir -p demo/addons/fmod/libs/osx/ && cp bin/libGodotFmod.osx.release.64.dylib demo/addons/fmod/libs/osx/ && cp ../libs/fmod/osx/core/lib/libfmod.dylib demo/addons/fmod/libs/osx/ && cp ../libs/fmod/osx/studio/lib/libfmodstudio.dylib demo/addons/fmod/libs/osx/ && cd demo && ./run_tests.sh ../../Godot.app/Contents/MacOS/Godot && cd ..; fi
 deploy:
   provider: releases
-  api_key:
-    secure: $TRAVIS_TOKEN
+  api_key: $GITHUB_TOKEN
   file:
-    - "bin/libGodotFmod.linux.so"
-    - "bin/libGodotFmod.osx.dylib"
-    - "bin/libGodotFmod.windows.dll"
-    - "bin/libGodotFmod.ios.a"
-    - "../godot-cpp/bin/libgodot-cpp.ios.release.a"
+    - "bin/libGodotFmod.linux.release.64.so"
+    - "bin/libGodotFmod.osx.release.64.dylib"
+    - "bin/libGodotFmod.windows.release.64.dll"
+    - "bin/libGodotFmod.ios.release.arm64.a"
+    - "../godot-cpp/bin/libgodot-cpp.ios.release.arm64.a"
     - "libandroid_fmod_gdnative.tar.gz"
   skip_cleanup: true
   on:
+    repo: utopia-rise/fmod-gdnative
     tags: true

.travis/download-ndk.sh

@@ -7,7 +7,7 @@ ANDROID_SDK_URL=$ANDROID_BASE_URL/$ANDROID_SDK_FILENAME
 ANDROID_SDK_PATH=$GODOT_BUILD_TOOLS_PATH/$ANDROID_SDK_DIR
 ANDROID_SDK_SHA256=92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9
 
-ANDROID_NDK_RELEASE=r18
+ANDROID_NDK_RELEASE=r21
 ANDROID_NDK_DIR=android-ndk
 ANDROID_NDK_FILENAME=android-ndk-$ANDROID_NDK_RELEASE-linux-x86_64.zip
 ANDROID_NDK_URL=$ANDROID_BASE_URL/$ANDROID_NDK_FILENAME

Android.mk

@@ -14,18 +14,18 @@ include $(PREBUILT_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_MODULE := godot-prebuilt
 ifeq ($(TARGET_ARCH_ABI),x86)
-    LOCAL_SRC_FILES := ../godot-cpp/bin/libgodot-cpp.android.release.i686.a
+    LOCAL_SRC_FILES := ../godot-cpp/bin/libgodot-cpp.android.release.x86.a
 endif
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-    LOCAL_SRC_FILES := ../godot-cpp/bin/libgodot-cpp.android.release.armv7-a.a
+    LOCAL_SRC_FILES := ../godot-cpp/bin/libgodot-cpp.android.release.armv7.a
 endif
 ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-    LOCAL_SRC_FILES := ../godot-cpp/bin/libgodot-cpp.android.release.armv8-a.a
+    LOCAL_SRC_FILES := ../godot-cpp/bin/libgodot-cpp.android.release.arm64v8.a
 endif
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := android_fmod_gdnative
+LOCAL_MODULE := libGodotFmod.android.release.$(TARGET_ARCH_ABI)
 LOCAL_CPPFLAGS := -std=c++14
 LOCAL_CPP_FEATURES := rtti exceptions
 LOCAL_LDLIBS := -llog
@@ -48,4 +48,4 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_STATIC_LIBRARIES := godot-prebuilt
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)