Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 23:40:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

arch/sim: Pass X11 related config to host environment

Browse Source 
Remove the hard code CONFIG_SIM_X11NOSHM value from up_x11framebuffer.c
This commit is contained in:
Xiang Xiao
2020-02-10 12:55:10 +08:00
committed by Gregory Nutt
parent 856b62ca09
commit 978575d79a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/sim/src/Makefile
+5
View File
@@ -126,15 +126,20 @@ ifeq ($(CONFIG_NX_LCDDRIVER),y)
else else
CSRCS += up_framebuffer.c CSRCS += up_framebuffer.c
ifeq ($(CONFIG_SIM_X11FB),y) ifeq ($(CONFIG_SIM_X11FB),y)
ifeq ($(CONFIG_SIM_X11NOSHM),y)
HOSTCFLAGS += -DCONFIG_SIM_X11NOSHM=1
endif
HOSTSRCS += up_x11framebuffer.c HOSTSRCS += up_x11framebuffer.c
STDLIBS += -lX11 -lXext STDLIBS += -lX11 -lXext
ifeq ($(CONFIG_SIM_TOUCHSCREEN),y) ifeq ($(CONFIG_SIM_TOUCHSCREEN),y)
CSRCS += up_touchscreen.c CSRCS += up_touchscreen.c
REQUIREDOBJS += up_touchscreen$(OBJEXT) REQUIREDOBJS += up_touchscreen$(OBJEXT)
HOSTCFLAGS += -DCONFIG_SIM_TOUCHSCREEN=1
HOSTSRCS += up_x11eventloop.c HOSTSRCS += up_x11eventloop.c
else else
ifeq ($(CONFIG_SIM_AJOYSTICK),y) ifeq ($(CONFIG_SIM_AJOYSTICK),y)
CSRCS += up_ajoystick.c CSRCS += up_ajoystick.c
HOSTCFLAGS += -DCONFIG_SIM_AJOYSTICK=1
HOSTSRCS += up_x11eventloop.c HOSTSRCS += up_x11eventloop.c
endif endif
endif endif
arch/sim/src/sim/up_x11framebuffer.c
-2
View File
@@ -37,8 +37,6 @@
* Included Files * Included Files
****************************************************************************/ ****************************************************************************/
#define CONFIG_SIM_X11NOSHM 1
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>