Skip to content

Build cpp lib first for android #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 18, 2021
Merged

Build cpp lib first for android #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13646fe
Build cpp lib first for android
May 18, 2021
ac97e7e
Merge https://github.com/firebase/firebase-unity-sdk into feature/bui…
May 18, 2021
0884b3a
Only check ios dll on apple platform
May 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build_android.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ CMAKE_OPTIONS=

if [ -d "../firebase-cpp-sdk" ]; then
CMAKE_OPTIONS="-DFIREBASE_CPP_SDK_DIR=`realpath ../firebase-cpp-sdk` "
cd ../firebase-cpp-sdk
./gradlew
cd ../firebase-unity-sdk
fi

shopt -s nullglob
Expand Down
2 changes: 1 addition & 1 deletion cmake/FindUnityMono.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ if(FIREBASE_INCLUDE_UNITY)
See the readme.md for more information.")
endif()

if(NOT EXISTS ${UNITY_EDITOR_IOS_XCODE_DLL})
if(APPLE AND NOT EXISTS ${UNITY_EDITOR_IOS_XCODE_DLL})
message(FATAL_ERROR "Fail to find UnityEditor.iOS.Extensions.Xcode.dll. \
Please install iOS build support from Unity.")
endif()
Expand Down
5 changes: 4 additions & 1 deletion external/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@

mono_add_external_dll(unity_editor_cs "${UNITY_EDITOR_DLL}")
mono_add_external_dll(unity_engine_cs "${UNITY_ENGINE_DLL}")
mono_add_external_dll(unity_ios_extensions_xcode_cs "${UNITY_EDITOR_IOS_XCODE_DLL}")

if(APPLE)
mono_add_external_dll(unity_ios_extensions_xcode_cs "${UNITY_EDITOR_IOS_XCODE_DLL}")
endif()

# Dont pack libraries shipped with unity
unity_pack_skip(unity_editor_cs)
Expand Down