From fd0c25a44579d1a01bf6dd660a2d3e0bfb2d5aab Mon Sep 17 00:00:00 2001 From: "andrey.zhirnov" Date: Fri, 19 Jul 2019 15:19:40 +0300 Subject: [PATCH] updated enduro2d module, fixed path to engine java code, added lfs attributes --- .gitattributes | 16 ++++++++++++++++ android/game/build.gradle | 2 +- modules/enduro2d | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9a7cdca --- /dev/null +++ b/.gitattributes @@ -0,0 +1,16 @@ +*.zip filter=lfs diff=lfs merge=lfs -text +*.bin filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.obj filter=lfs diff=lfs merge=lfs -text +*.e2d_mesh filter=lfs diff=lfs merge=lfs -text +*.e2d_shape filter=lfs diff=lfs merge=lfs -text +*.a filter=lfs diff=lfs merge=lfs -text +*.so filter=lfs diff=lfs merge=lfs -text +*.dll filter=lfs diff=lfs merge=lfs -text +*.lib filter=lfs diff=lfs merge=lfs -text +*.dylib filter=lfs diff=lfs merge=lfs -text +*.pvr filter=lfs diff=lfs merge=lfs -text +*.dds filter=lfs diff=lfs merge=lfs -text +*.ogg filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.aar filter=lfs diff=lfs merge=lfs -text diff --git a/android/game/build.gradle b/android/game/build.gradle index fe32dad..25469d0 100644 --- a/android/game/build.gradle +++ b/android/game/build.gradle @@ -46,7 +46,7 @@ android { } sourceSets { main { - java.srcDirs = ['src/main/java', '../../modules/enduro2d/sources/android/engine'] + java.srcDirs = ['src/main/java', '../../modules/enduro2d/sources/enduro2d/core/platform_impl'] } } } diff --git a/modules/enduro2d b/modules/enduro2d index 653ba91..c962b44 160000 --- a/modules/enduro2d +++ b/modules/enduro2d @@ -1 +1 @@ -Subproject commit 653ba91a1edfbf3b535e84625395b29998e7b202 +Subproject commit c962b4406357ea61e01d80b962475fb96c74a659