diff options
| author | Ray <[email protected]> | 2017-10-30 00:14:13 +0100 |
|---|---|---|
| committer | Ray <[email protected]> | 2017-10-30 00:14:13 +0100 |
| commit | 743cc6add68111cde0366476823537210c38cab4 (patch) | |
| tree | 11276790eed3687edf44fdc7bf0d0ea31ae8e0f1 /src | |
| parent | ecf797cc7da985a6a4ebbd00b14b7056e582d714 (diff) | |
| download | raylib-743cc6add68111cde0366476823537210c38cab4.tar.gz raylib-743cc6add68111cde0366476823537210c38cab4.zip | |
Review new build platform: FreeBSD
Corrected issue with RPI_CROSS_COMPILE
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 19 | ||||
| -rw-r--r-- | src/core.c | 9 |
2 files changed, 16 insertions, 12 deletions
diff --git a/src/Makefile b/src/Makefile index 176991bb..29b3fb75 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,11 +3,11 @@ # raylib makefile # # Platforms supported: -# PLATFORM_DESKTOP: Windows (win32/Win64) +# PLATFORM_DESKTOP: Windows (Win32, Win64) # PLATFORM_DESKTOP: Linux -# PLATFORM_DESKTOP: OSX (Mac) +# PLATFORM_DESKTOP: OSX/macOS # PLATFORM_DESKTOP: FreeBSD -# PLATFORM_ANDROID: Android (ARM or ARM64) +# PLATFORM_ANDROID: Android (ARM, ARM64) # PLATFORM_RPI: Raspberry Pi (Raspbian) # PLATFORM_WEB: HTML5 (Chrome, Firefox) # @@ -57,9 +57,12 @@ endif # Use cross-compiler for PLATFORM_RPI ifeq ($(PLATFORM),PLATFORM_RPI) - RPI_CROSS_COMPILE ?= YES - RPI_TOOLCHAIN ?= C:/SysGCC/Raspberry - RPI_TOOLCHAIN_SYSROOT ?= $(RPI_TOOLCHAIN)/arm-linux-gnueabihf/sysroot + RPI_CROSS_COMPILE ?= NO + + ifeq ($(RPI_CROSS_COMPILE),YES) + RPI_TOOLCHAIN ?= C:/SysGCC/Raspberry + RPI_TOOLCHAIN_SYSROOT ?= $(RPI_TOOLCHAIN)/arm-linux-gnueabihf/sysroot + endif endif # Determine if the file has root access (only for installing raylib) @@ -352,8 +355,8 @@ else endif ifeq ($(PLATFORM_OS),FREEBSD) # WARNING: you should type "gmake clean" before doing this target - $(CC) -shared -o $(RAYLIB_RELEASE_PATH)/libraylib.so $(OBJS) -lglfw -lGL -lopenal -lpthread - @echo "raylib shared library generated (libraylib.so)!" + $(CC) -shared -o $(RAYLIB_RELEASE_PATH)/libraylib.so $(OBJS) -lglfw -lGL -lopenal -lpthread + @echo "raylib shared library generated (libraylib.so)!" endif ifeq ($(PLATFORM),PLATFORM_ANDROID) $(CC) -shared -o $(RAYLIB_RELEASE_PATH)/libraylib.so $(OBJS) $(LDFLAGS) $(LDLIBS) @@ -3,17 +3,18 @@ * raylib.core - Basic functions to manage windows, OpenGL context and input on multiple platforms * * PLATFORMS SUPPORTED: -* - Windows (win32/Win64) +* - Windows (Win32, Win64) * - Linux (tested on Ubuntu) -* - OSX (Mac) -* - Android (ARM or ARM64) +* - FreeBSD +* - OSX/macOS +* - Android (ARM, ARM64) * - Raspberry Pi (Raspbian) * - HTML5 (Chrome, Firefox) * * CONFIGURATION: * * #define PLATFORM_DESKTOP -* Windowing and input system configured for desktop platforms: Windows, Linux, OSX (managed by GLFW3 library) +* Windowing and input system configured for desktop platforms: Windows, Linux, OSX, FreeBSD (managed by GLFW3 library) * NOTE: Oculus Rift CV1 requires PLATFORM_DESKTOP for mirror rendering - View [rlgl] module to enable it * * #define PLATFORM_ANDROID |