From 952be11131f3e059f355e79495ea3585b562dfc1 Mon Sep 17 00:00:00 2001 From: Gabriel Pariat Date: Sun, 19 Feb 2023 17:34:51 -0500 Subject: [PATCH] tweak makefile --- Makefile | 8 +++++--- src/Makefile.Android => Makefile.Android | 0 2 files changed, 5 insertions(+), 3 deletions(-) rename src/Makefile.Android => Makefile.Android (100%) diff --git a/Makefile b/Makefile index 9b06ef2..5115a56 100644 --- a/Makefile +++ b/Makefile @@ -116,7 +116,7 @@ endif ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),LINUX) RAYLIB_PREFIX ?= .. - RAYLIB_PATH = $(realpath $(RAYLIB_PREFIX)) + RAYLIB_PATH ?= $(realpath $(RAYLIB_PREFIX)) endif endif @@ -406,6 +406,7 @@ endif # Default target entry # NOTE: We call this Makefile target or Makefile.Android target all: + $(MAKE) -C $(RAYLIB_PATH)/src $(RAYLIB PLATFORM=$(PLATFORM) -B $(MAKE) $(MAKEFILE_PARAMS) # Project target defined by PROJECT_NAME @@ -444,8 +445,9 @@ endif run: $(BUILD_DIR)/$(PROJECT_NAME)$(EXT) ifeq ($(PLATFORM),PLATFORM_DESKTOP) - ./$(PROJECT_NAME) + ./$(BUILD_DIR)/$(PROJECT_NAME) endif ifeq ($(PLATFORM),PLATFORM_WEB) - npx live-server --open=$(BUILD_DIR)/$(PROJECT_NAME)$(EXT) --ignore=*.c,*.h,Makefile + npx live-server --open=$(BUILD_DIR)/$(PROJECT_NAME)$(EXT) \ + --watch=$(BUILD_DIR)/*.wasm,$(BUILD_DIR)/*.html,$(BUILD_DIR)/*.js,$(BUILD_DIR)/*.data endif diff --git a/src/Makefile.Android b/Makefile.Android similarity index 100% rename from src/Makefile.Android rename to Makefile.Android