diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-09-28 14:59:54 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-09-28 14:59:54 +0000 |
| commit | 68bcc1949029864b8fb701984f8b73d046631db3 (patch) | |
| tree | dc26e569c3d6f65f83b4646ae501fc5f795b4b0a /nuttx/arch/sim | |
| parent | e54a3b66d3fe44634b3b336068b0de67d9259a3f (diff) | |
| download | px4-nuttx-68bcc1949029864b8fb701984f8b73d046631db3.tar.gz px4-nuttx-68bcc1949029864b8fb701984f8b73d046631db3.tar.bz2 px4-nuttx-68bcc1949029864b8fb701984f8b73d046631db3.zip | |
Fix sim build under Ubuntu 9.09
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3988 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/sim')
| -rw-r--r-- | nuttx/arch/sim/src/Makefile | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/nuttx/arch/sim/src/Makefile b/nuttx/arch/sim/src/Makefile index 808388410..f7844a1d9 100644 --- a/nuttx/arch/sim/src/Makefile +++ b/nuttx/arch/sim/src/Makefile @@ -35,19 +35,6 @@ -include $(TOPDIR)/Make.defs -# The X11 stuff only builds on Linux (but not Ubuntu -- Ubuntu needs -# some work). - -ifneq ($(HOSTOS),Cygwin) -ifeq ($(CONFIG_SIM_X11FB),y) - USEX = y -else - USEX = n -endif -else - USEX = n -endif - CFLAGS += -I$(TOPDIR)/sched ASRCS = up_setjmp.S @@ -64,7 +51,7 @@ ifeq ($(CONFIG_NX_LCDDRIVER),y) CSRCS += up_lcd.c else CSRCS += up_framebuffer.c -ifeq ($(USEX),y) +ifeq ($(CONFIG_SIM_X11FB),y) HOSTSRCS += up_x11framebuffer.c endif endif @@ -97,7 +84,7 @@ SRCS = $(ASRCS) $(CSRCS) $(HOSTSRCS) OBJS = $(AOBJS) $(COBJS) $(HOSTOBJS) LDFLAGS = $(ARCHSCRIPT) -ifeq ($(USEX),y) +ifeq ($(CONFIG_SIM_X11FB),y) STDLIBS = -lX11 -lXext -lc else STDLIBS = -lc |