mirror of
https://github.com/apache/nuttx.git
synced 2026-06-08 01:42:58 +08:00
Changes to allow the font subsystem to be built without enabling the entire graphics system (CONFIG_NX). Adds CONFIG_NXFONTS and CONFIG_NXGLIB. NX and NXFONTS are still pretty heavily entangled
Squashed commit of the following:
libnx: Need to duplicate some Kconfig setting for NXFONTs if it can be configured and built independently of NX. Also includes some build-related fixes.
configs/sim: Disable NX graphics support in the fb configuration.
libnx: Basic configuration and build changes to support building font support independend of the NX server.
This commit is contained in:
+5
-5
@@ -1,7 +1,8 @@
|
||||
############################################################################
|
||||
# ProtectedLibs.mk
|
||||
#
|
||||
# Copyright (C) 2007-2012, 2014, 2016 Gregory Nutt. All rights reserved.
|
||||
# Copyright (C) 2007-2012, 2014, 2016-2017 Gregory Nutt. All rights
|
||||
# reserved.
|
||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
@@ -103,12 +104,11 @@ endif
|
||||
|
||||
ifeq ($(CONFIG_NX),y)
|
||||
NUTTXLIBS += lib$(DELIM)libgraphics$(LIBEXT)
|
||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||
NUTTXLIBS += lib$(DELIM)libknx$(LIBEXT)
|
||||
USERLIBS += lib$(DELIM)libunx$(LIBEXT)
|
||||
else
|
||||
NUTTXLIBS += lib$(DELIM)libnx$(LIBEXT)
|
||||
endif
|
||||
else ifeq ($(CONFIG_NXFONTS),y)
|
||||
NUTTXLIBS += lib$(DELIM)libknx$(LIBEXT)
|
||||
USERLIBS += lib$(DELIM)libunx$(LIBEXT)
|
||||
endif
|
||||
|
||||
# Add libraries for the Audio sub-system
|
||||
|
||||
Reference in New Issue
Block a user