Merge internal branch into master

google · Jul 15, 2015 · ecc51e4 · ecc51e4
2 parents 94da0d6 + fad52c7
commit ecc51e4
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 23 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,7 +47,7 @@ set(dependencies_flatbuffers_dir "${fpl_root}/flatbuffers"
     CACHE PATH "Directory containing the Flatbuffers library.")
 set(dependencies_fplutil_dir "${fpl_root}/fplutil"
     CACHE PATH "Directory containing the fplutil library.")
-set(dependencies_pindrop_dir "${fpl_root}/audio_engine"
+set(dependencies_pindrop_dir "${fpl_root}/pindrop"
     CACHE PATH "Directory containing the pindrop library.")
 set(dependencies_mathfu_dir "${fpl_root}/mathfu"
     CACHE PATH "Directory containing the MathFu library.")

diff --git a/disttools/config.json b/disttools/config.json
@@ -41,7 +41,7 @@
       "push": 0
     },
     {
-      "name": "audio_engine",
+      "name": "pindrop",
       "url": "http://github.com/google/pindrop.git",
       "branch": "develop",
       "is_library": 1,

diff --git a/docs/generate_docs.py b/docs/generate_docs.py
@@ -21,7 +21,8 @@
 THIS_DIR = os.path.realpath(os.path.dirname(__file__))
 PROJECT_DIR = os.path.realpath(os.path.join(THIS_DIR, os.pardir))
 sys.path.extend(
-    [os.path.realpath(os.path.join(PROJECT_DIR, os.pardir, os.pardir, 'libs', 'fplutil')),
+    [os.path.realpath(os.path.join(PROJECT_DIR, os.pardir, os.pardir, 'libs',
+                                   'fplutil')),
      os.path.realpath(os.path.join(PROJECT_DIR, 'dependencies', 'fplutil'))])
 import docs  # pylint: disable=C6204
 

diff --git a/docs/src/doxyfile b/docs/src/doxyfile
@@ -1097,7 +1097,7 @@ HTML_FILE_EXTENSION    = .html
 # of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_HEADER            =
+HTML_HEADER            = $(SHARED_DOCS_PATH)/header.html
 
 # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
 # generated HTML page. If the tag is left blank doxygen will generate a standard
@@ -1107,7 +1107,7 @@ HTML_HEADER            =
 # that doxygen normally uses.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_FOOTER            = footer.html
+HTML_FOOTER            = $(SHARED_DOCS_PATH)/footer.html
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
 # sheet that is used by each HTML page. It can be used to fine-tune the look of
@@ -1130,7 +1130,7 @@ HTML_STYLESHEET        =
 # see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  =
+HTML_EXTRA_STYLESHEET  = $(SHARED_DOCS_PATH)/style.css
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note

diff --git a/docs/src/footer.html b/docs/src/footer.html
diff --git a/docs/src/index.md b/docs/src/index.md
@@ -9,7 +9,7 @@ your friends. It is written in cross-platform C++.
 
 \htmlonly
 <iframe width="560" height="315"
-  src="http://www.youtube.com/embed/p1F6HRFnLoo?rel=0"
+  src="https://www.youtube.com/embed/p1F6HRFnLoo?rel=0"
   frameborder="0" allowfullscreen>
 </iframe>
 \endhtmlonly

diff --git a/docs/src/programmers_guide/multiscreen.md b/docs/src/programmers_guide/multiscreen.md
@@ -7,7 +7,7 @@ Multi-screen mode is a very different way of playing Pie Noon!
 
 \htmlonly
 <iframe width="560" height="315"
-  src="http://www.youtube.com/embed/aR5WQaq70fw?rel=0"
+  src="https://www.youtube.com/embed/aR5WQaq70fw?rel=0"
   frameborder="0" allowfullscreen>
 </iframe>
 \endhtmlonly

diff --git a/jni/android_config.mk b/jni/android_config.mk
@@ -33,7 +33,7 @@ DEPENDENCIES_SDL_MIXER_DIR?=$(THIRD_PARTY_ROOT)/sdl_mixer
 # Location of the Flatbuffers library.
 DEPENDENCIES_FLATBUFFERS_DIR?=$(FPL_ROOT)/flatbuffers
 # Location of the Pindrop library.
-DEPENDENCIES_PINDROP_DIR?=$(FPL_ROOT)/audio_engine
+DEPENDENCIES_PINDROP_DIR?=$(FPL_ROOT)/pindrop
 # Location of the fplutil library.
 DEPENDENCIES_FPLUTIL_DIR?=$(FPL_ROOT)/fplutil
 # Location of the Freetype library.

diff --git a/jni/libs/src/Android.mk b/jni/libs/src/Android.mk
@@ -153,7 +153,7 @@ $(call import-add-path,$(DEPENDENCIES_PINDROP_DIR)/..)
 $(call import-add-path,$(DEPENDENCIES_WEBP_DIR)/..)
 
 $(call import-module,flatbuffers/android/jni)
-$(call import-module,audio_engine/jni)
+$(call import-module,pindrop/jni)
 $(call import-module,motive/jni)
 $(call import-module,mathfu/jni)
 $(call import-module,webp)

diff --git a/scripts/build_assets.py b/scripts/build_assets.py
@@ -51,7 +51,7 @@
                                                    os.path.pardir, 'libs'))
 
 
-PINDROP_ROOT = os.path.abspath(os.path.join(DEPENDENCIES_ROOT, 'audio_engine'))
+PINDROP_ROOT = os.path.abspath(os.path.join(DEPENDENCIES_ROOT, 'pindrop'))
 
 MOTIVE_ROOT = os.path.abspath(os.path.join(DEPENDENCIES_ROOT, 'motive'))
 

diff --git a/src/pie_noon_game.h b/src/pie_noon_game.h
@@ -16,9 +16,12 @@
 #define PIE_NOON_GAME_H
 
 #ifdef PLATFORM_MOBILE
+#ifdef __ANDROID__
 #define PIE_NOON_USES_GOOGLE_PLAY_GAMES
+#endif // __ANDROID__
 #endif
 
+
 #include "ai_controller.h"
 #include "cardboard_controller.h"
 #include "full_screen_fader.h"