From 3110f3aac0bd989bb3e4f8a77a193a20368750ee Mon Sep 17 00:00:00 2001 From: raysan5 Date: Fri, 9 Jul 2021 18:50:21 +0200 Subject: [PATCH] REVIEWED: Web compilation --- src/Makefile | 17 ++++++++--------- src/Makefile.Android | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/Makefile b/src/Makefile index 7ca2604..cef0afd 100644 --- a/src/Makefile +++ b/src/Makefile @@ -28,15 +28,12 @@ PROJECT_NAME ?= raylib_game RAYLIB_VERSION ?= 3.8.0 RAYLIB_PATH ?= C:/GitHub/raylib -OUTPUT_PATH ?= ../build -OUTPUT_TEMP_PATH ?= ../temp - # Define default options # One of PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB PLATFORM ?= PLATFORM_DESKTOP -# Locations of your newly installed library and associated headers. See ../src/Makefile +# Locations of your newly installed library and associated headers. # On Linux, if you have installed raylib but cannot compile the examples, check that # the *_INSTALL_PATH values here are the same as those in src/Makefile or point to known locations. # To enable system-wide compile-time and runtime linking to libraylib.so, run ../src/$ sudo make install RAYLIB_LIBTYPE_SHARED. @@ -44,10 +41,12 @@ PLATFORM ?= PLATFORM_DESKTOP # To enable runtime linking to a special version of libraylib.so, see EXAMPLE_RUNTIME_PATH below. # If there is a libraylib in both EXAMPLE_RUNTIME_PATH and RAYLIB_INSTALL_PATH, at runtime, # the library at EXAMPLE_RUNTIME_PATH, if present, will take precedence over the one at RAYLIB_INSTALL_PATH. -# RAYLIB_INSTALL_PATH should be the desired full path to libraylib. No relative paths. -DESTDIR ?= /usr/local -RAYLIB_INSTALL_PATH ?= $(DESTDIR)/lib -# RAYLIB_H_INSTALL_PATH locates the installed raylib header and associated source files. + +# Desired full path to libraylib. No relative paths. +DESTDIR ?= /usr/local +RAYLIB_INSTALL_PATH ?= $(DESTDIR)/lib + +# raylib header and associated source files RAYLIB_H_INSTALL_PATH ?= $(DESTDIR)/include # Library type used for raylib: STATIC (.a) or SHARED (.so/.dll) @@ -181,7 +180,7 @@ ifeq ($(PLATFORM),PLATFORM_WEB) endif # Define default make program -MAKE = make +MAKE ?= make ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),WINDOWS) diff --git a/src/Makefile.Android b/src/Makefile.Android index 2e8eeeb..d5bc2be 100644 --- a/src/Makefile.Android +++ b/src/Makefile.Android @@ -23,7 +23,7 @@ # Define required raylib variables PLATFORM ?= PLATFORM_ANDROID -RAYLIB_PATH ?= ..\.. +RAYLIB_PATH ?= C:\GitHub\raylib # Define Android architecture (armeabi-v7a, arm64-v8a, x86, x86-64) and API version # Starting in 2019 using ARM64 is mandatory for published apps,