twix/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2026-01-30 02:39:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Android builds on Linux environments (#1530)

Browse Source 
* simple_game: Configure Make and makefile for Linux environments

* simple_game: Fix build issues on Android plaform with Linux HOST

The Makefile.Android.linux file was out of date with the rest of the
project, so this commit updates the paths, as well as leaving some as
optional, if it is already configured as an environment variable.

In addition, it corrects the build error related to static raylib:
the makefile was trying to generate libmain.so using the path of the
NDK libraries, instead of using those of the Android system, which
resulted in crashes in the generated apk.
This commit is contained in:
Davidson Francis
2021-01-13 19:07:34 -03:00
committed by GitHub
parent a0a840101c
commit 3d22709808
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
templates/simple_game/Makefile
View File

@ -101,6 +101,15 @@ ifeq ($(PLATFORM),PLATFORM_DRM)
PLATFORM_OS=LINUX
endif
endif
ifeq ($(PLATFORM),PLATFORM_ANDROID)
UNAMEOS=$(shell uname)
ifeq ($(UNAMEOS),Linux)
PLATFORM_OS=LINUX
endif
ifeq ($(UNAMEOS),Darwin)
PLATFORM_OS=OSX
endif
endif
# RAYLIB_PATH adjustment for different platforms.
# If using GNU make, we can get the full path to the top of the tree. Windows? BSD?
@ -388,6 +397,15 @@ OBJS = $(patsubst %.c, %.o, $(PROJECT_SOURCE_FILES))
# For Android platform we call a custom Makefile.Android
ifeq ($(PLATFORM),PLATFORM_ANDROID)
MAKEFILE_PARAMS = -f Makefile.Android
# For Linux and macOS set make and makefile
ifeq ($(PLATFORM_OS),LINUX)
MAKE = make
MAKEFILE_PARAMS = -f Makefile.Android.linux
endif
ifeq ($(PLATFORM_OS),OSX)
MAKE = make
MAKEFILE_PARAMS = -f Makefile.Android.macos
endif
export PROJECT_NAME
export PROJECT_SOURCE_FILES
else