Merge pull request #1587 from seanpaultaylor/next

Added WaterSample to CMake and Android

samples/browser/CMakeLists.txt

@@ -98,6 +98,8 @@ set(GAME_SRC
     src/TextureSample.h
     src/TriangleSample.cpp
     src/TriangleSample.h
+    src/WaterSample.cpp
+    src.WaterSample.h
 )
 
 add_executable(${GAME_NAME}

samples/browser/android/jni/Android.mk

@@ -106,7 +106,8 @@ LOCAL_SRC_FILES := ../../../gameplay/src/gameplay-main-android.cpp \
     TerrainSample.cpp \
     TextSample.cpp \
     TextureSample.cpp \
-    TriangleSample.cpp
+    TriangleSample.cpp \
+    WaterSample.cpp
 
 LOCAL_CPPFLAGS += -std=c++11 -Wno-switch-enum -Wno-switch
 LOCAL_ARM_MODE := arm