From c2aa1fed7b4b75c9bb560ffb9ff6cd8c99d7dd41 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 18 Oct 2018 11:38:42 +0200 Subject: Removed OpenAL backend --- src/Makefile | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index ac4b15b4..28b73beb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -63,14 +63,6 @@ RAYLIB_BUILD_MODE ?= RELEASE # NOTE: Some programs like tools could not require audio support INCLUDE_AUDIO_MODULE ?= TRUE -# Use OpenAL Soft backend for audio -USE_OPENAL_BACKEND ?= FALSE - -# OpenAL Soft audio backend forced on HTML5 and OSX (see below) -ifeq ($(PLATFORM),PLATFORM_WEB) - USE_OPENAL_BACKEND = TRUE -endif - # Use external GLFW library instead of rglfw module # TODO: Review usage of examples on Linux. USE_EXTERNAL_GLFW ?= FALSE @@ -154,13 +146,6 @@ endif # RAYLIB_PATH ?= /home/pi/raylib #endif -# Force OpenAL Soft audio backend for OSX platform -# NOTE 1: mini_al library does not support CoreAudio yet -# NOTE 2: Required OpenAL libraries should be available on OSX -ifeq ($(PLATFORM_OS),OSX) - USE_OPENAL_BACKEND = TRUE -endif - ifeq ($(PLATFORM),PLATFORM_WEB) # Emscripten required variables EMSDK_PATH = C:/emsdk @@ -343,11 +328,6 @@ ifeq ($(RAYLIB_LIBTYPE),SHARED) CFLAGS += -fPIC -DBUILD_LIBTYPE_SHARED endif -# Use OpenAL Soft backend instead of mini_al -ifeq ($(USE_OPENAL_BACKEND),TRUE) - CFLAGS += -DUSE_OPENAL_BACKEND -endif - # Use Wayland display on Linux desktop ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS), LINUX) @@ -426,9 +406,7 @@ endif ifeq ($(INCLUDE_AUDIO_MODULE),TRUE) OBJS += audio.o OBJS += stb_vorbis.o - ifeq ($(USE_OPENAL_BACKEND),FALSE) - OBJS += mini_al.o - endif + OBJS += mini_al.o endif ifeq ($(PLATFORM),PLATFORM_ANDROID) -- cgit v1.2.3 From 59bbad9360ef87f66532cc665435a883e88b7e1e Mon Sep 17 00:00:00 2001 From: Dillon Jones Date: Thu, 18 Oct 2018 07:28:57 -0400 Subject: Remove non-Windows includes from Makefile --- src/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 28b73beb..2932e7bb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -339,9 +339,12 @@ endif # Define include paths for required headers # NOTE: Several external required libraries (stb and others) -INCLUDE_PATHS = -I. -Iexternal -Iexternal/glfw/include +INCLUDE_PATHS = -I. -Iexternal/glfw/include ifeq ($(PLATFORM),PLATFORM_DESKTOP) + ifeq ($(PLATFORM_OS),WINDOWS) + INCLUDE_PATHS += -Iexternal + endif ifeq ($(PLATFORM_OS),BSD) INCLUDE_PATHS += -I/usr/local/include LDFLAGS += -L. -Lsrc -L/usr/local/lib -L$(RAYLIB_RELEASE_PATH) -- cgit v1.2.3 From 161b18edea6649a108ef3f7aa37464688adcba07 Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 20 Oct 2018 12:30:37 +0200 Subject: Reviewed possible issue with external libs --- src/Makefile | 3 --- src/core.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 2932e7bb..0cfc82c1 100644 --- a/src/Makefile +++ b/src/Makefile @@ -342,9 +342,6 @@ endif INCLUDE_PATHS = -I. -Iexternal/glfw/include ifeq ($(PLATFORM),PLATFORM_DESKTOP) - ifeq ($(PLATFORM_OS),WINDOWS) - INCLUDE_PATHS += -Iexternal - endif ifeq ($(PLATFORM_OS),BSD) INCLUDE_PATHS += -I/usr/local/include LDFLAGS += -L. -Lsrc -L/usr/local/lib -L$(RAYLIB_RELEASE_PATH) diff --git a/src/core.c b/src/core.c index 41aa181b..91022b11 100644 --- a/src/core.c +++ b/src/core.c @@ -125,7 +125,7 @@ #include // Required for: tolower() [Used in IsFileExtension()] #include // Required for stat() [Used in GetLastWriteTime()] -#if defined(_WIN32) && defined(_MSC_VER) +#if defined(PLATFORM_DESKTOP) && defined(_WIN32) && defined(_MSC_VER) #include "external/dirent.h" // Required for: DIR, opendir(), closedir() [Used in GetDirectoryFiles()] #else #include // Required for: DIR, opendir(), closedir() [Used in GetDirectoryFiles()] -- cgit v1.2.3