From 8707a6e63c14786a005e4a3c612fa5f941020ffa Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Tue, 26 Apr 2016 19:59:19 -0600 Subject: android: Start using vulkan_wrapper in cube and tri --- demos/android/jni/Android.mk | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'demos/android') 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) -- cgit v1.2.3