From 44181baf0472675a5474c14925dff678c0c1773a Mon Sep 17 00:00:00 2001 From: raysan5 Date: Mon, 21 May 2018 18:13:52 +0200 Subject: Working on Android APK building --- src/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index f8219044..c83a62ef 100644 --- a/src/Makefile +++ b/src/Makefile @@ -309,6 +309,7 @@ endif ifeq ($(PLATFORM),PLATFORM_ANDROID) # Compiler flags for arquitecture (only ARM, not ARM64) #CFLAGS += -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 + CFLAGS += -target aarch64 -mfix-cortex-a53-835769 -mgeneral-regs-only # Compilation functions attributes options CFLAGS += -ffunction-sections -funwind-tables -fstack-protector-strong -fPIE -fPIC # Compiler options for the linker -- cgit v1.2.3 From 1f0cc57ec7e4c56baf013ecaaab2050282b0733b Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 27 May 2018 19:06:14 +0200 Subject: Corrected issue with compiler param Added android_native_app_glue module to raylib compilation instead of compiling it as static lib at apk generation. --- src/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index c83a62ef..c05e74bb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -309,14 +309,14 @@ endif ifeq ($(PLATFORM),PLATFORM_ANDROID) # Compiler flags for arquitecture (only ARM, not ARM64) #CFLAGS += -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 - CFLAGS += -target aarch64 -mfix-cortex-a53-835769 -mgeneral-regs-only + CFLAGS += -target aarch64 -mfix-cortex-a53-835769 # Compilation functions attributes options CFLAGS += -ffunction-sections -funwind-tables -fstack-protector-strong -fPIE -fPIC # Compiler options for the linker # -Werror=format-security CFLAGS += -Wa,--noexecstack -Wformat -no-canonical-prefixes # Preprocessor macro definitions - CFLAGS += -DANDROID -DPLATFORM_ANDROID -D__ANDROID_API__=21 + CFLAGS += -DANDROID -DPLATFORM_ANDROID -D__ANDROID_API__=21 -DMAL_NO_OSS endif # Define required compilation flags for raylib SHARED lib @@ -416,6 +416,10 @@ ifeq ($(INCLUDE_AUDIO_MODULE),TRUE) endif endif +ifeq ($(PLATFORM),PLATFORM_ANDROID) + OBJS += external/android/native_app_glue/android_native_app_glue.o +endif + # Default target entry all: raylib -- cgit v1.2.3 From 59ebe1b7c322232f38c98afa7d5df8fade9bc6f5 Mon Sep 17 00:00:00 2001 From: "maficccc@gmail.com" Date: Sat, 23 Jun 2018 00:33:48 +0200 Subject: Added support OpenBSD, NetBSD, DragonFly --- src/Makefile | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index c05e74bb..6f71874f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,7 +6,7 @@ # PLATFORM_DESKTOP: Windows (Win32, Win64) # PLATFORM_DESKTOP: Linux (32 and 64 bit) # PLATFORM_DESKTOP: OSX/macOS -# PLATFORM_DESKTOP: FreeBSD +# PLATFORM_DESKTOP: FreeBSD, OpenBSD, NetBSD, DragonFly # PLATFORM_ANDROID: Android (ARM, ARM64) # PLATFORM_RPI: Raspberry Pi (Raspbian) # PLATFORM_WEB: HTML5 (Chrome, Firefox) @@ -111,7 +111,16 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) PLATFORM_OS=LINUX endif ifeq ($(UNAMEOS),FreeBSD) - PLATFORM_OS=FREEBSD + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),OpenBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),NetBSD) + PLATFORM_OS=BSD + endif + ifeq ($(UNAMEOS),DragonFly) + PLATFORM_OS=BSD endif ifeq ($(UNAMEOS),Darwin) PLATFORM_OS=OSX @@ -185,8 +194,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),OSX) RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/osx endif - ifeq ($(PLATFORM_OS),FREEBSD) - RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/freebsd + ifeq ($(PLATFORM_OS),BSD) + RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/bsd endif endif ifeq ($(PLATFORM),PLATFORM_RPI) @@ -231,8 +240,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) CC = clang GLFW_CFLAGS = -x objective-c endif - ifeq ($(PLATFORM_OS),FREEBSD) - # FreeBSD default compiler + ifeq ($(PLATFORM_OS),BSD) + # FreeBSD, OpenBSD, NetBSD, DragonFly default compiler CC = clang endif endif @@ -346,7 +355,7 @@ endif INCLUDE_PATHS = -I. -Iexternal -Iexternal/glfw/include ifeq ($(PLATFORM),PLATFORM_DESKTOP) - ifeq ($(PLATFORM_OS),FREEBSD) + ifeq ($(PLATFORM_OS),BSD) INCLUDE_PATHS += -I/usr/local/include LDFLAGS += -L. -Lsrc -L/usr/local/lib -L$(RAYLIB_RELEASE_PATH) endif @@ -459,7 +468,7 @@ else cd $(RAYLIB_RELEASE_PATH) && ln -fs libraylib.$(RAYLIB_VERSION).dylib libraylib.$(RAYLIB_API_VERSION).dylib cd $(RAYLIB_RELEASE_PATH) && ln -fs libraylib.$(RAYLIB_VERSION).dylib libraylib.dylib endif - ifeq ($(PLATFORM_OS),FREEBSD) + ifeq ($(PLATFORM_OS),BSD) # WARNING: you should type "gmake clean" before doing this target $(CC) -shared -o $(RAYLIB_RELEASE_PATH)/libraylib.$(RAYLIB_VERSION).so $(OBJS) -Wl,-soname,libraylib.$(RAYLIB_API_VERSION).so -lGL -lpthread @echo "raylib shared library generated (libraylib.$(RAYLIB_VERSION).so)!" -- cgit v1.2.3