Skip to content

Commit

Permalink
[rbp/buildsystem] changed set USE_TEXTUREPACKER_NATIVE_ROOT in the bu…
Browse files Browse the repository at this point in the history
…ild environment
  • Loading branch information
huceke committed Jun 5, 2013
1 parent a9bf7d5 commit fb1e15c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,6 @@ case $use_platform in
use_cpu=arm1176jzf-s
use_hardcoded_tables="yes"
use_alsa="no"
USE_TEXTUREPACKER_NATIVE_ROOT="$TEXTUREPACKER_NATIVE_ROOT"
ARCH="arm"
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_ARMEL -DTARGET_RASPBERRY_PI")
AC_DEFINE(HAS_EGLGLES, [1], [Define if supporting EGL based GLES Framebuffer])
Expand Down
4 changes: 2 additions & 2 deletions tools/rbp/depends/depends.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ifeq ($(USE_BUILDROOT),1)
export PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig
export PYTHON_VERSION=2.7
export PATH:=$(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH)
export TEXTUREPACKER_NATIVE_ROOT=/usr
export USE_TEXTUREPACKER_NATIVE_ROOT=/usr
export PYTHON_LDFLAGS=-L$(SDKSTAGE)/usr/lib -lpython$(PYTHON_VERSION) -lpthread -ldl -lutil -lm
else
export CFLAGS=-pipe -O3 -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=softfp -mfpu=vfp -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated -Wno-deprecated-declarations
Expand Down Expand Up @@ -47,7 +47,7 @@ else
export PKG_CONFIG_PATH=$(PREFIX)/bin/pkg-config
export PYTHON_VERSION=2.6
export PATH:=${PREFIX}/bin:$(PATH):${TOOLCHAIN}/bin
export TEXTUREPACKER_NATIVE_ROOT=/usr
export USE_TEXTUREPACKER_NATIVE_ROOT=/usr
export PYTHON_LDFLAGS=-L$(SDKSTAGE)/usr/lib -lpython$(PYTHON_VERSION)
endif
export PYTHON_CPPFLAGS=-I$(SDKSTAGE)/usr/include/python$(PYTHON_VERSION)
Expand Down

0 comments on commit fb1e15c

Please sign in to comment.