Merge pull request #369 from raysan5/develop

Integrate Develop branch
This commit is contained in:
Ray 2017-10-20 16:15:23 +02:00 committed by GitHub
commit 18601f7619
12 changed files with 19 additions and 18 deletions

View file

@ -557,11 +557,6 @@ physac/physics_restitution: physac/physics_restitution.c
# compile [physac] example - physics shatter
physac/physics_shatter: physac/physics_shatter.c
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) $(PHYSAC_LIBS) -D$(PLATFORM)
ifeq ($(PLATFORM),PLATFORM_ANDROID)
external/native_app_glue.o : native_app_glue.c native_app_glue.h
$(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM) -D$(SHAREDFLAG)
endif
# fix dylib install path name for each executable (MAC)
fix_dylib: