diff options
| author | Ray <[email protected]> | 2017-09-26 09:13:16 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-09-26 09:13:16 +0200 |
| commit | 4a63e5dfb3006483cace85c8161d12057a9e8488 (patch) | |
| tree | 53f1ca68df7c2d398a157a825c21fc4ea704f07d /src/Makefile | |
| parent | 7ca90d87f9fa6f399d3316df347c63baf0eb675d (diff) | |
| parent | 5ace947a809d32d0177334933b0709b3164a79d5 (diff) | |
| download | raylib-4a63e5dfb3006483cace85c8161d12057a9e8488.tar.gz raylib-4a63e5dfb3006483cace85c8161d12057a9e8488.zip | |
Merge pull request #360 from raysan5/develop
Integrate Develop branch
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/Makefile b/src/Makefile index 06b67a04..72f37b09 100644 --- a/src/Makefile +++ b/src/Makefile @@ -97,14 +97,9 @@ ifeq ($(PLATFORM),PLATFORM_WEB) endif ifeq ($(PLATFORM),PLATFORM_ANDROID) - # Android NDK path - # NOTE: Required for standalone toolchain generation - ANDROID_NDK = $(ANDROID_NDK_HOME) - - # Android standalone toolchain path - # NOTE: This path is also used if toolchain generation - #ANDROID_TOOLCHAIN = $(CURDIR)/toolchain - ANDROID_TOOLCHAIN = $(RAYLIB_PATH)/android-toolchain + # Android required path variables + ANDROID_NDK = C:/android-ndk + ANDROID_TOOLCHAIN = C:/android_toolchain_arm_api16 # Android architecture: ARM or ARM64 ANDROID_ARCH ?= ARM @@ -217,6 +212,10 @@ ifeq ($(PLATFORM),PLATFORM_WEB) # -s USE_PTHREADS=1 # multithreading support endif +ifeq ($(PLATFORM),PLATFORM_ANDROID) + CFLAGS += -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 +endif + #CFLAGSEXTRA = -Wextra -Wmissing-prototypes -Wstrict-prototypes # if shared library required, make sure code is compiled as position independent |