diff options
| author | Juan Ramos <juan@lunarg.com> | 2023-10-10 11:28:05 -0600 |
|---|---|---|
| committer | Juan Ramos <114601453+juan-lunarg@users.noreply.github.com> | 2023-10-10 11:46:54 -0600 |
| commit | 48686ee04f9a7905d415c3207c4b05824230aff2 (patch) | |
| tree | d14a9792c8261f017ba729b7fc9e55981e1d6732 | |
| parent | 31b95ce2372bebb6172e9a546e257d94c162c423 (diff) | |
| download | usermoji-48686ee04f9a7905d415c3207c4b05824230aff2.tar.xz | |
cube: Move android files to cube directory
Despite being in the "common" folder these files are only used
by vkcube.
| -rw-r--r-- | cube/android/README.md (renamed from common/README.md) | 4 | ||||
| -rw-r--r-- | cube/android/android_util.cpp (renamed from common/android_util.cpp) | 0 | ||||
| -rw-r--r-- | cube/android/android_util.h (renamed from common/android_util.h) | 0 | ||||
| -rw-r--r-- | cube/android/jni/Android.mk | 8 | ||||
| -rw-r--r-- | cube/android/vulkan_wrapper.cpp (renamed from common/vulkan_wrapper.cpp) | 0 | ||||
| -rw-r--r-- | cube/android/vulkan_wrapper.h (renamed from common/vulkan_wrapper.h) | 0 |
6 files changed, 6 insertions, 6 deletions
diff --git a/common/README.md b/cube/android/README.md index 3e496bee..75b1747f 100644 --- a/common/README.md +++ b/cube/android/README.md @@ -22,7 +22,7 @@ Copy contents of parsed_header into generate_vulkan_wrapper.py between the secti Then run the script: popd - ./generate_vulkan_wrapper.py ../common/vulkan_wrapper.h - ./generate_vulkan_wrapper.py ../common/vulkan_wrapper.cpp + ./generate_vulkan_wrapper.py ../cube/android/vulkan_wrapper.h + ./generate_vulkan_wrapper.py ../cube/android/vulkan_wrapper.cpp clang-format -i vulkan_wrapper.h clang-format -i vulkan_wrapper.cpp diff --git a/common/android_util.cpp b/cube/android/android_util.cpp index 173e8ab8..173e8ab8 100644 --- a/common/android_util.cpp +++ b/cube/android/android_util.cpp diff --git a/common/android_util.h b/cube/android/android_util.h index e8966458..e8966458 100644 --- a/common/android_util.h +++ b/cube/android/android_util.h diff --git a/cube/android/jni/Android.mk b/cube/android/jni/Android.mk index cc4b93ce..090f7862 100644 --- a/cube/android/jni/Android.mk +++ b/cube/android/jni/Android.mk @@ -20,14 +20,14 @@ DEMO_DIR := $(SRC_DIR)/cube include $(CLEAR_VARS) LOCAL_MODULE := VkCube LOCAL_SRC_FILES += $(DEMO_DIR)/cube.c \ - $(SRC_DIR)/common/vulkan_wrapper.cpp \ - $(SRC_DIR)/common/android_util.cpp + $(DEMO_DIR)/android/vulkan_wrapper.cpp \ + $(DEMO_DIR)/android/android_util.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/build-android/third_party/Vulkan-Headers/include \ $(DEMO_DIR)/android/include \ $(SRC_DIR)/libs \ - $(SRC_DIR)/common \ + $(DEMO_DIR)/android/ \ $(SRC_DIR)/build-android/generated/include -LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/common/vulkan_wrapper.h +LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR --include=$(DEMO_DIR)/android/vulkan_wrapper.h LOCAL_WHOLE_STATIC_LIBRARIES += android_native_app_glue LOCAL_LDLIBS := -llog -landroid LOCAL_LDFLAGS := -u ANativeActivity_onCreate diff --git a/common/vulkan_wrapper.cpp b/cube/android/vulkan_wrapper.cpp index c663f9ee..c663f9ee 100644 --- a/common/vulkan_wrapper.cpp +++ b/cube/android/vulkan_wrapper.cpp diff --git a/common/vulkan_wrapper.h b/cube/android/vulkan_wrapper.h index 678fdcfe..678fdcfe 100644 --- a/common/vulkan_wrapper.h +++ b/cube/android/vulkan_wrapper.h |