dslinux/user/pixil Makefile Rules.make config config.ARM
amadeus
dslinux_amadeus at user.in-berlin.de
Sun Oct 8 14:15:30 CEST 2006
Update of /cvsroot/dslinux/dslinux/user/pixil
In directory antilope:/tmp/cvs-serv29804/user/pixil
Modified Files:
Makefile Rules.make config config.ARM
Log Message:
start pixil integration in DSLINUX
Index: config
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/pixil/config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config 7 Oct 2006 20:33:41 -0000 1.2
+++ config 8 Oct 2006 12:15:28 -0000 1.3
@@ -22,7 +22,7 @@
#
# Build Options
#
-CROSS_COMPILE=y
+COMPILE_CROSS=y
# CONFIG_TARGET_ARM is not set
# CONFIG_TARGET_I386_UCLIBC is not set
CROSS_COMPILER_PREFIX="arm-linux-elf-"
Index: Makefile
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/pixil/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 7 Oct 2006 20:33:40 -0000 1.2
+++ Makefile 8 Oct 2006 12:15:28 -0000 1.3
@@ -24,7 +24,8 @@
MW_PREFIX = $(BASE_DIR)/../microwin/src
INSTALL_PREFIX = $(BASE_DIR)/../romfs/usr/pixil/
EN_SHARED = --disable-shared
-CXXFLAGS += -Wno-deprecated
+CFLAGS += -D_GNU_SOURCE
+LDFLAGS += -lstdc++ -lc -lgcc
endif
# The base directory for installing
@@ -53,22 +54,22 @@
BUILD_SYS=i386-linux
-ifeq ($(CROSS_COMPILE),y)
+ifeq ($(COMPILE_CROSS),y)
ifeq ($(CONFIG_TARGET_ARM),y)
SYS=arm-linux
endif
ifeq ($(CONFIG_TARGET_I386_UCLIBC),y)
SYS=i386-uclibc-linux
endif
-ifdef CONFIG_PLATFORM_DSLINUX
-SYS=????
+ifeq ($(CONFIG_PLATFORM_DSLINUX),y)
+SYS=arm-linux-elf
endif
else
SYS=$(BUILD_SYS)
endif
export TARGET_CROSS BASE_DIR STAGE_DIR INCLUDE_DIR PAR_DB PAR_CONFIG
-export TOOL_DIR INSTALL_DIR ROOT_DIR SYS BUILD_SYS EN_SHARED EN_STATIC MW_PREFIX
+export TOOL_DIR INSTALL_DIR ROOT_DIR SYS BUILD_SYS EN_SHARED EN_STATIC MW_PREFIX COMPILE_CROSS
# Set up the list of directories based on the configuration
ifdef SUBDIRS
Index: config.ARM
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/pixil/config.ARM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config.ARM 3 Oct 2006 11:24:19 -0000 1.1
+++ config.ARM 8 Oct 2006 12:15:28 -0000 1.2
@@ -21,7 +21,7 @@
#
# Build Options
#
-CROSS_COMPILE=y
+COMPILE_CROSS=y
CONFIG_TARGET_ARM=y
# CONFIG_TARGET_I386_UCLIBC is not set
CROSS_COMPILER_PREFIX="arm-linux-"
Index: Rules.make
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/pixil/Rules.make,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Rules.make 3 Oct 2006 11:24:19 -0000 1.1
+++ Rules.make 8 Oct 2006 12:15:28 -0000 1.2
@@ -104,8 +104,6 @@
ifeq ($(CONFIG_DEBUG),y)
CFLAGS += -O0 -g -DDEBUG
-else
-CFLAGS += -O3
endif
INCLUDES += -I$(FLTKDIR) -I$(FLEKDIR)
@@ -134,7 +132,14 @@
INST_STATIC=$(patsubst %, $(STAGE_DIR)/lib/%, $(LIB_STATIC))
INST_SHARED=$(patsubst %, $(STAGE_DIR)/lib/%, $(LIB_SHARED))
-BUILD_LIBS := $(LIB_STATIC) $(LIB_SHARED)
+BUILD_LIBS :=
+ifeq ($(EN_SHARED),--enable-shared)
+BUILD_LIBS += $(LIB_SHARED)
+endif
+ifeq ($(EN_STATIC),--enable-static)
+BUILD_LIBS += $(LIB_STATIC)
+endif
+
BUILD_NATIVE_LIBS := $(NATIVE_LIB_STATIC) $(NATIVE_LIB_SHARED)
BUILD_BINS := $(TARGET) $(TARGET_CXX)
BUILD_SO := $(TARGET_SO)
More information about the dslinux-commit
mailing list