diff options
| author | Cody Northrop <cnorthrop@google.com> | 2016-04-26 19:59:19 -0600 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-04-28 14:01:42 -0600 |
| commit | 8707a6e63c14786a005e4a3c612fa5f941020ffa (patch) | |
| tree | c4003c57c4f93728ee1dc7a346c4b6d60c6b203f /demos/android | |
| parent | 59e9c666b0b4a10181b64f41d8759767bdd8c4a7 (diff) | |
| download | usermoji-8707a6e63c14786a005e4a3c612fa5f941020ffa.tar.xz | |
android: Start using vulkan_wrapper in cube and tri
Diffstat (limited to 'demos/android')
| -rw-r--r-- | demos/android/jni/Android.mk | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/demos/android/jni/Android.mk b/demos/android/jni/Android.mk index 2f82dd48..d852176e 100644 --- a/demos/android/jni/Android.mk +++ b/demos/android/jni/Android.mk @@ -14,29 +14,31 @@ # limitations under the License. LOCAL_PATH := $(abspath $(call my-dir)) -SRC_DIR := $(LOCAL_PATH)/../../../ +SRC_DIR := $(LOCAL_PATH)/../../.. DEMO_DIR := $(SRC_DIR)/demos include $(CLEAR_VARS) LOCAL_MODULE := Tri -LOCAL_SRC_FILES += $(DEMO_DIR)/tri.c +LOCAL_SRC_FILES += $(DEMO_DIR)/tri.c \ + $(SRC_DIR)/common/vulkan_wrapper.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(DEMO_DIR)/android/include \ $(SRC_DIR)/libs -LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR +LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/common/vulkan_wrapper.h LOCAL_WHOLE_STATIC_LIBRARIES += android_native_app_glue -LOCAL_LDLIBS := -llog -landroid -lvulkan +LOCAL_LDLIBS := -llog -landroid include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := Cube -LOCAL_SRC_FILES += $(DEMO_DIR)/cube.c +LOCAL_SRC_FILES += $(DEMO_DIR)/cube.c \ + $(SRC_DIR)/common/vulkan_wrapper.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(DEMO_DIR)/android/include \ $(SRC_DIR)/libs -LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR +LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/common/vulkan_wrapper.h LOCAL_WHOLE_STATIC_LIBRARIES += android_native_app_glue -LOCAL_LDLIBS := -llog -landroid -lvulkan +LOCAL_LDLIBS := -llog -landroid include $(BUILD_SHARED_LIBRARY) $(call import-module,android/native_app_glue) |