Support no-audio no-models modules compilation

Renamed flags for convenience.
This commit is contained in:
raysan5 2019-03-16 13:02:16 +01:00
parent a61d3ad512
commit 2a92d6af3e
2 changed files with 9 additions and 7 deletions

View file

@ -49,7 +49,7 @@ if(USE_AUDIO)
set(sources ${raylib_sources}) set(sources ${raylib_sources})
else() else()
MESSAGE(STATUS "Audio Backend: None (-DUSE_AUDIO=OFF)") MESSAGE(STATUS "Audio Backend: None (-DUSE_AUDIO=OFF)")
set(INCLUDE_AUDIO_MODULE 0) set(RAYLIB_MODULE_AUDIO 0)
list(REMOVE_ITEM raylib_sources ${CMAKE_CURRENT_SOURCE_DIR}/raudio.c) list(REMOVE_ITEM raylib_sources ${CMAKE_CURRENT_SOURCE_DIR}/raudio.c)
set(sources ${raylib_sources}) set(sources ${raylib_sources})
endif() endif()

View file

@ -59,9 +59,10 @@ RAYLIB_LIBTYPE ?= STATIC
# Build mode for library: DEBUG or RELEASE # Build mode for library: DEBUG or RELEASE
RAYLIB_BUILD_MODE ?= RELEASE RAYLIB_BUILD_MODE ?= RELEASE
# Included raylib audio module on compilation # Include raylib modules on compilation
# NOTE: Some programs like tools could not require audio support # NOTE: Some programs like tools could not require those modules
INCLUDE_AUDIO_MODULE ?= TRUE RAYLIB_MODULE_AUDIO ?= TRUE
RAYLIB_MODULE_MODELS ?= TRUE
# Use external GLFW library instead of rglfw module # Use external GLFW library instead of rglfw module
# TODO: Review usage of examples on Linux. # TODO: Review usage of examples on Linux.
@ -393,7 +394,6 @@ OBJS = core.o \
shapes.o \ shapes.o \
textures.o \ textures.o \
text.o \ text.o \
models.o \
utils.o utils.o
ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM),PLATFORM_DESKTOP)
@ -401,8 +401,10 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
OBJS += rglfw.o OBJS += rglfw.o
endif endif
endif endif
ifeq ($(RAYLIB_MODULE_MODELS),TRUE)
ifeq ($(INCLUDE_AUDIO_MODULE),TRUE) OBJS += models.o
endif
ifeq ($(RAYLIB_MODULE_AUDIO),TRUE)
OBJS += raudio.o OBJS += raudio.o
endif endif