From b117bb27f321f493e0e015388e8dc272a8588ca0 Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 25 Oct 2011 15:21:01 +0000 Subject: [PATCH] Fix some errors in 8-bit color conversion macros; Fix tools/incdir.sh when g++ is used; Fix bad cast that caused problems with the background window is released git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4064 42af7a65-404d-4744-a932-0658087f49c3 --- configs/sim/nsh/defconfig | 2 ++ configs/sim/nx/defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig index a64830e7e7c..010e08c26f5 100644 --- a/configs/sim/nsh/defconfig +++ b/configs/sim/nsh/defconfig @@ -58,6 +58,7 @@ CONFIG_ARCH_BOARD_SIM=y # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with # debug symbols (needed for use with a debugger). +# CONFIG_HAVE_CXX - Enable support for C++ # CONFIG_MM_REGIONS - If the architecture includes multiple # regions of memory to allocate from, this specifies the # number of memory regions that the memory manager must @@ -118,6 +119,7 @@ CONFIG_ARCH_BOARD_SIM=y CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=y CONFIG_DEBUG_SYMBOLS=n +CONFIG_HAVE_CXX=n CONFIG_MM_REGIONS=1 CONFIG_ARCH_LOWPUTC=y CONFIG_RR_INTERVAL=0 diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig index 3dfd3e820ff..e70163be706 100644 --- a/configs/sim/nx/defconfig +++ b/configs/sim/nx/defconfig @@ -65,6 +65,7 @@ CONFIG_SIM_FBBPP=8 # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with # debug symbols (needed for use with a debugger). +# CONFIG_HAVE_CXX - Enable support for C++ # CONFIG_MM_REGIONS - If the architecture includes multiple # regions of memory to allocate from, this specifies the # number of memory regions that the memory manager must @@ -126,6 +127,7 @@ CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=y CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_GRAPHICS=y +CONFIG_HAVE_CXX=n CONFIG_MM_REGIONS=1 CONFIG_ARCH_LOWPUTC=y CONFIG_RR_INTERVAL=0