jepler/regal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[NaCl] Add glibc support

Browse source
This commit is contained in:
Sam Clegg 2013-05-08 21:18:21 -07:00 committed by CocosRobot
parent cde67856d1
commit 64d847d9e1
6 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -285,6 +285,10 @@ regal.lib: lib/$(SYSTEM)/$(LIB.STATIC)
ifeq ($(filter nacl%,$(SYSTEM)),)
regal.lib: lib/$(SYSTEM)/$(LIB.SHARED)
else
ifeq ($(NACL_LIBC),glibc)
regal.lib: lib/$(SYSTEM)/$(LIB.SHARED)
endif
endif
lib/$(SYSTEM)/$(LIB.STATIC): lib/$(SYSTEM)/$(LIBPNG.STATIC) lib/$(SYSTEM)/$(ZLIB.STATIC) $(LIB.OBJS)
@ -588,7 +592,7 @@ ifneq ($(STRIP),)
endif
examples/nacl/nacl.nmf: bin/$(SYSTEM)/nacl$(BIN_EXTENSION)
$(NACL_SDK_ROOT)/tools/create_nmf.py -o $@ bin/$(SYSTEM)/nacl*.nexe -s examples/nacl
$(NACL_SDK_ROOT)/tools/create_nmf.py -Llib/$(SYSTEM) $(NMF_FLAGS) -o $@ bin/$(SYSTEM)/nacl*.nexe -s examples/nacl
#

1
config/Makefile.nacl-arm
View file

@ -8,6 +8,7 @@ CC := $(NACL_TOOLCHAIN)/bin/arm-nacl-gcc
CXX := $(NACL_TOOLCHAIN)/bin/arm-nacl-g++
LD := $(NACL_TOOLCHAIN)/bin/arm-nacl-g++
AR := $(NACL_TOOLCHAIN)/bin/arm-nacl-ar
OBJDUMP:= $(NACL_TOOLCHAIN)/bin/arm-nacl-objdump
RANLIB :=
STRIP ?=

6
config/Makefile.nacl-i686
View file

@ -10,11 +10,15 @@ CC := $(NACL_TOOLCHAIN)/bin/i686-nacl-gcc
CXX := $(NACL_TOOLCHAIN)/bin/i686-nacl-g++
LD := $(NACL_TOOLCHAIN)/bin/i686-nacl-g++
AR := $(NACL_TOOLCHAIN)/bin/i686-nacl-ar
OBJDUMP:= $(NACL_TOOLCHAIN)/bin/i686-nacl-objdump
RANLIB :=
STRIP ?=
NMF_FLAGS += -D$(OBJDUMP)
NMF_FLAGS += -L$(NACL_TOOLCHAIN)/x86_64-nacl/lib64
NMF_FLAGS += -L$(NACL_TOOLCHAIN)/x86_64-nacl/lib32
WARN += -Wno-uninitialized -Wno-conversion-null
PICFLAG = -fPIC
BIN_EXTENSION = _32.nexe
EXT.DYNAMIC = so
LIBDIR =

6
config/Makefile.nacl-x86_64
View file

@ -10,11 +10,15 @@ CC := $(NACL_TOOLCHAIN)/bin/x86_64-nacl-gcc
CXX := $(NACL_TOOLCHAIN)/bin/x86_64-nacl-g++
LD := $(NACL_TOOLCHAIN)/bin/x86_64-nacl-g++
AR := $(NACL_TOOLCHAIN)/bin/x86_64-nacl-ar
OBJDUMP:= $(NACL_TOOLCHAIN)/bin/x86_64-nacl-objdump
RANLIB :=
STRIP ?=
NMF_FLAGS += -D$(OBJDUMP)
NMF_FLAGS += -L$(NACL_TOOLCHAIN)/x86_64-nacl/lib64
NMF_FLAGS += -L$(NACL_TOOLCHAIN)/x86_64-nacl/lib32
WARN += -Wno-uninitialized -Wno-conversion-null
PICFLAG =
BIN_EXTENSION = _64.nexe
EXT.DYNAMIC = so
LIBDIR =

7
config/nacl.inc
View file

@ -12,6 +12,10 @@ endif
NACL_LIBC ?= newlib
ifeq ($(NACL_LIBC),glibc)
PICFLAG = -fPIC
endif
#
# Detect the OS - linux, mac or win
#
@ -55,6 +59,9 @@ LDFLAGS.EXTRA += -L$(NACL_SDK_ROOT)/ports/lib/$(NACL_LIBTYPE)/Release
LDFLAGS.EXTRA += -L$(NACL_SDK_ROOT)/lib/$(NACL_LIBTYPE)/Release
endif
NMF_FLAGS += -L$(NACL_SDK_ROOT)/ports/lib/$(NACL_LIBTYPE)/Release
NMF_FLAGS += -L$(NACL_SDK_ROOT)/lib/$(NACL_LIBTYPE)/Release
CFLAGS.EXTRA += -I$(NACL_SDK_ROOT)/include -MMD
WARN = -Wall -Wno-unused-parameter -Wno-char-subscripts -Wno-strict-aliasing
# WARN += -Werror

7
nacl-regal.sh
View file

@ -21,5 +21,8 @@ make -f Makefile SYSTEM=nacl-x86_64 $*
echo "Building i686"
make -f Makefile SYSTEM=nacl-i686 $*
echo "Building ARM"
make -f Makefile SYSTEM=nacl-arm $*
if [ "$NACL_LIBC" != "glibc" ]; then
# No glibc support as yet on ARM
echo "Building ARM"
make -f Makefile SYSTEM=nacl-arm $*
fi