diff options
| author | Ray <[email protected]> | 2017-05-12 14:01:39 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-05-12 14:01:39 +0200 |
| commit | 1ed3d3285f1c1f6a01e0588ec46a177c84b864f5 (patch) | |
| tree | 4af033e377a27636d20cb165bc53c72d692ccb09 /src/Makefile | |
| 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 'src/Makefile')
| -rw-r--r-- | src/Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile index f2e09988..e9de5623 100644 --- a/src/Makefile +++ b/src/Makefile @@ -101,7 +101,7 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID) # Android standalone toolchain path # NOTE: This path is also used if toolchain generation #ANDROID_TOOLCHAIN = $(CURDIR)/toolchain - ANDROID_TOOLCHAIN = C:/raylib/android-standalone-toolchain + ANDROID_TOOLCHAIN = C:/raylib/android-toolchain # Android architecture: ARM or ARM64 ANDROID_ARCH ?= ARM @@ -230,8 +230,13 @@ endif # external required libraries (stb and others) INCLUDES = -I. -Iexternal + # OpenAL Soft library -INCLUDES += -Iexternal/openal_soft/include +ifeq ($(PLATFORM),PLATFORM_ANDROID) + INCLUDES += -Iandroid/jni/include/AL +else + INCLUDES += -Iexternal/openal_soft/include +endif # define any directories containing required header files ifeq ($(PLATFORM),PLATFORM_DESKTOP) @@ -325,12 +330,12 @@ else endif ifeq ($(PLATFORM),PLATFORM_ANDROID) $(CC) -shared -o $(OUTPUT_PATH)/libraylib.so $(OBJS) - @echo "raylib shared library (libraylib.so) generated!" + @echo "raylib shared library generated (libraylib.so)!" endif else # compile raylib static library. $(AR) rcs $(OUTPUT_PATH)/libraylib.a $(OBJS) - @echo "libraylib.a generated (static library)!" + @echo "raylib static library generated (libraylib.a)!" ifeq ($(SHARED_OPENAL),NO) @echo "expected OpenAL Soft static library linking" else @@ -377,7 +382,6 @@ external/stb_vorbis.o: external/stb_vorbis.c external/stb_vorbis.h utils.o : utils.c utils.h $(CC) -c $< $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(SHAREDFLAG) - # It installs generated and needed files to compile projects using raylib. # The installation works manually. # TODO: add other platforms. |