Skip to content

Commit 7a617af

Browse files
a-mauricejsanmiya
authored andcommitted
Changes required to get building in other internal build system.
Also, include the Nearby connections library for GPG. The C++ Google Play Games library requires the nearby connections library to be included in the build to initialize properly, so adding it to the build gradle file. Tested on Android. PiperOrigin-RevId: 147517634 Change-Id: I4b25dbbff9b5beb8b38a25a7f42280f2ad367466
1 parent 61580da commit 7a617af

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+581
-429
lines changed

CMakeLists.txt

+29-44
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,23 @@ cmake_minimum_required(VERSION 2.8.12)
1515

1616
project(zooshi)
1717

18+
# Call fplutil to get locations of dependencies and set common build settings.
19+
# Extra compile flags
20+
# /wd4305: trunction from double to float in shadow_controller.cpp
21+
include("cmake/find_fplutil.cmake")
22+
include("${fplutil_dir}/buildutil/cmake_common.txt")
23+
set_common_build_variables("/wd4305")
24+
25+
# Zooshi requires the Firebase SDK.
26+
if (NOT EXISTS "${firebase_sdk_dir}")
27+
message(ERROR "Cannot find Firebase SDK. Please set FIREBASE_SDK environment variable and delete CMake cache.")
28+
endif()
29+
30+
# In-tree build of the Zooshi directory.
31+
if(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR})
32+
set(zooshi_in_tree_build ON)
33+
endif()
34+
1835
# Compile the game with the debug flag
1936
set(ZOOSHI_DEBUG ON)
2037

@@ -26,21 +43,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
2643
# Temporary files (like object files) created while compiling projects.
2744
set(tmp_dir ${CMAKE_BINARY_DIR}/obj)
2845

29-
# Configure fpl_root to the right directory
30-
if(NOT DEFINED fpl_root)
31-
get_filename_component(fpl_root "${CMAKE_CURRENT_LIST_DIR}/../../libs"
32-
REALPATH)
33-
if(NOT EXISTS "${fpl_root}")
34-
set(fpl_root "${CMAKE_CURRENT_SOURCE_DIR}/dependencies")
35-
endif ()
36-
endif()
37-
38-
# Configurable locations of other dependencies of this project.
39-
# Extra compile flags
40-
# /wd4305: trunction from double to float in shadow_controller.cpp
41-
include (${fpl_root}/fplutil/buildutil/cmake_common.txt)
42-
set_common_build_variables("/wd4305")
43-
4446
# Option to enable / disable the build of cwebp from source.
4547
option(zooshi_build_cwebp "Build cwebp from source." OFF)
4648

@@ -122,7 +124,7 @@ endif()
122124
# Generate source files for all FlatBuffers schema files under the src
123125
# directory.
124126
set(FLATBUFFERS_GENERATED_INCLUDES_DIR
125-
${CMAKE_SOURCE_DIR}/${CMAKE_FILES_DIRECTORY}/include/zooshi)
127+
${CMAKE_CURRENT_BINARY_DIR}/include/zooshi)
126128
file(GLOB_RECURSE FLATBUFFERS_SCHEMAS ${CMAKE_CURRENT_LIST_DIR}/src/*.fbs)
127129

128130
set(FLATBUFFERS_SCHEMA_INCLUDES
@@ -155,9 +157,17 @@ if(zooshi_build_cwebp)
155157
set(cwebp_depends cwebp)
156158
endif()
157159

160+
# Run the asset pipeline.
161+
# If we're building out-of-tree, we have to copy the zooshi/assets directory
162+
# to its out-of-tree location.
163+
if (NOT DEFINED zooshi_in_tree_build)
164+
set(zooshi_asset_copy_src "${CMAKE_CURRENT_LIST_DIR}/assets")
165+
set(zooshi_asset_copy_dest "${CMAKE_BINARY_DIR}/assets")
166+
endif()
158167
add_custom_target(assets
159168
COMMAND python ${CMAKE_CURRENT_LIST_DIR}/scripts/build_assets.py
160169
--copy_tree
170+
${zooshi_asset_copy_src} ${zooshi_asset_copy_dest}
161171
${CMAKE_CURRENT_LIST_DIR}/src/rawassets/fonts ${CMAKE_BINARY_DIR}/assets/fonts
162172
${dependencies_flatui_dir}/assets/shaders ${CMAKE_BINARY_DIR}/assets/shaders
163173
${dependencies_flatui_dir}/assets/hyphen-data ${CMAKE_BINARY_DIR}/assets/hyphen-data
@@ -320,7 +330,7 @@ include_directories(${dependencies_flatui_dir}/include)
320330
include_directories(${dependencies_motive_dir}/include)
321331
include_directories(${dependencies_pindrop_dir}/include)
322332
include_directories(${dependencies_scene_lab_dir}/include)
323-
include_directories(${firebase_dir}/include)
333+
include_directories(${firebase_sdk_dir}/include)
324334

325335
# SDL includes.
326336
include_directories(${SDL2_BINARY_DIR}/include ${SDL2_SOURCE_DIR}/include)
@@ -342,40 +352,15 @@ if(fplbase_debug_markers)
342352
add_definitions(-DFPLBASE_ENABLE_DEBUG_MARKERS)
343353
endif()
344354

355+
add_definitions(-DZOOSHI_DEFINE_SIZED_OPERATOR_DELETE)
356+
345357
# Executable target.
346358
add_executable(zooshi ${zooshi_SRCS})
347359

348360
# Additional flags for the target.
349361
mathfu_configure_flags(zooshi)
350362
breadboard_module_library_configure_flags(zooshi)
351363

352-
# Link in the Firebase libraries.
353-
if (WIN32)
354-
set(platform_type "windows")
355-
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
356-
set(platform_type "darwin")
357-
else()
358-
set(platform_type "linux")
359-
endif()
360-
add_library(firebase_app STATIC IMPORTED)
361-
set_target_properties(firebase_app PROPERTIES
362-
IMPORTED_LOCATION ${firebase_dir}/libs/${platform_type}/libapp.a)
363-
add_library(firebase_admob STATIC IMPORTED)
364-
set_target_properties(firebase_admob PROPERTIES
365-
IMPORTED_LOCATION ${firebase_dir}/libs/${platform_type}/libadmob.a)
366-
add_library(firebase_analytics STATIC IMPORTED)
367-
set_target_properties(firebase_analytics PROPERTIES
368-
IMPORTED_LOCATION ${firebase_dir}/libs/${platform_type}/libanalytics.a)
369-
add_library(firebase_invites STATIC IMPORTED)
370-
set_target_properties(firebase_invites PROPERTIES
371-
IMPORTED_LOCATION ${firebase_dir}/libs/${platform_type}/libinvites.a)
372-
add_library(firebase_messaging STATIC IMPORTED)
373-
set_target_properties(firebase_messaging PROPERTIES
374-
IMPORTED_LOCATION ${firebase_dir}/libs/${platform_type}/libmessaging.a)
375-
add_library(firebase_config STATIC IMPORTED)
376-
set_target_properties(firebase_config PROPERTIES
377-
IMPORTED_LOCATION ${firebase_dir}/libs/${platform_type}/libremote_config.a)
378-
379364
# Dependencies for the executable target.
380365
add_dependencies(zooshi zooshi_generated_includes assets)
381366
target_link_libraries(zooshi

LICENSE

-1
This file was deleted.

LICENSE

+202
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

0 commit comments

Comments
 (0)