Updated to use the cpu/native makefile

This commit is contained in:
adamdunkels 2007-03-31 18:44:14 +00:00
parent e924c41a3b
commit 58f45dbc19
3 changed files with 10 additions and 20 deletions

View File

@ -19,24 +19,14 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
.SUFFIXES:
### Define the CPU directory
CONTIKI_CPU=$(CONTIKI)/cpu/x86
CONTIKI_CPU=$(CONTIKI)/cpu/native
include $(CONTIKI_CPU)/Makefile.native
### Compiler definitions
CC = gcc
LD = ld
AS = as
OBJCOPY = objcopy
STRIP = strip
CFLAGSNO = -I. -I$(CONTIKI)/core -I$(CONTIKI_CPU) \
-I$(CONTIKI)/platform/$(TARGET) \
-I$(CONTIKI)/platform/$(TARGET)/ctk \
-I$(CONTIKI)/platform/$(TARGET)/net \
${addprefix -I,$(APPDIRS)} $(APP_INCLUDES) \
-DWITH_UIP -DWITH_ASCII \
-Wall -g -I. -I/usr/local/include \
-DCTK_GTKSIM_SERVICE_PNGDIR=\"$(CONTIKI)/platform/gtk\"
CFLAGS = $(CFLAGSNO) `pkg-config --cflags gtk+-2.0`
LDFLAGS = -Wl,-Map=contiki.map,-export-dynamic `pkg-config --libs gtk+-2.0`
CFLAGS += -DCTK_GTKSIM_SERVICE_PNGDIR=\"$(CONTIKI)/platform/gtk\" \
`pkg-config --cflags gtk+-2.0`
TARGET_LIBFILES = -Wl,-Map=contiki.map,-export-dynamic `pkg-config --libs gtk+-2.0`
### Setup directory search path for source files

View File

@ -17,7 +17,7 @@ typedef unsigned long clock_time_t;
#include "ctk-arch.h"
#include "ctk/ctk-arch.h"
#define CTK_CONF_MOUSE_SUPPORT 1

View File

@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
* $Id: contiki-main.c,v 1.3 2007/03/27 21:26:24 oliverschmidt Exp $
* $Id: contiki-main.c,v 1.4 2007/03/31 18:44:14 adamdunkels Exp $
*
*/
@ -47,10 +47,10 @@
#include "cfs/cfs-posix.h"
#include "tapdev-service.h"
#include "net/tapdev-service.h"
#include "program-handler.h"
#include "webserver.h"
#include "ctk-gtksim-service.h"
#include "ctk/ctk-gtksim-service.h"
#include "about-dsc.h"
#include "calc-dsc.h"