diff options
| author | Ray <raysan5@gmail.com> | 2017-05-12 14:01:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-12 14:01:39 +0200 |
| commit | 1ed3d3285f1c1f6a01e0588ec46a177c84b864f5 (patch) | |
| tree | 4af033e377a27636d20cb165bc53c72d692ccb09 /examples | |
| parent | 0ca874c710aace697c5a383f41fc81abf34e2e06 (diff) | |
| parent | 42ad00b7c280e2242e3338a4acd85815c1707701 (diff) | |
| download | raylib-1ed3d3285f1c1f6a01e0588ec46a177c84b864f5.tar.gz raylib-1ed3d3285f1c1f6a01e0588ec46a177c84b864f5.zip | |
Merge pull request #285 from raysan5/develop
Integrate develop branch
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Makefile | 5 | ||||
| -rw-r--r-- | examples/textures/resources/fudesumi_BC1.dds | bin | 0 -> 98432 bytes | |||
| -rw-r--r-- | examples/textures/resources/fudesumi_BC3.dds | bin | 0 -> 196736 bytes | |||
| -rw-r--r-- | examples/textures/resources/fudesumi_ETC2.ktx | bin | 0 -> 196708 bytes |
4 files changed, 5 insertions, 0 deletions
diff --git a/examples/Makefile b/examples/Makefile index 18a5d1f4..c3728b3b 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -541,6 +541,11 @@ physac/physics_restitution: physac/physics_restitution.c # compile [physac] example - physics shatter physac/physics_shatter: physac/physics_shatter.c $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -static -lpthread -D$(PLATFORM) $(WINFLAGS) + +ifeq ($(PLATFORM),PLATFORM_ANDROID) +external/native_app_glue.o : native_app_glue.c native_app_glue.h + $(CC) -c $< $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(SHAREDFLAG) +endif # fix dylib install path name for each executable (MAC) fix_dylib: diff --git a/examples/textures/resources/fudesumi_BC1.dds b/examples/textures/resources/fudesumi_BC1.dds Binary files differnew file mode 100644 index 00000000..4a5b21b9 --- /dev/null +++ b/examples/textures/resources/fudesumi_BC1.dds diff --git a/examples/textures/resources/fudesumi_BC3.dds b/examples/textures/resources/fudesumi_BC3.dds Binary files differnew file mode 100644 index 00000000..0bf9c1de --- /dev/null +++ b/examples/textures/resources/fudesumi_BC3.dds diff --git a/examples/textures/resources/fudesumi_ETC2.ktx b/examples/textures/resources/fudesumi_ETC2.ktx Binary files differnew file mode 100644 index 00000000..a0523770 --- /dev/null +++ b/examples/textures/resources/fudesumi_ETC2.ktx |