From 7723be5a74d3ad51ac4402f2c533b15b5d4cebf7 Mon Sep 17 00:00:00 2001 From: Igor Mitsyanko Date: Thu, 28 Jun 2012 17:59:25 +0400 Subject: [PATCH] tizen Makefile: fix openGLES build installation Tizen's Makefile installs openGLES libraries only if CONFIG_OPENGLES is defined in a shell environment. But currently makefile doesnt export this variable to it's spawned shell and consequently openGLES libraries are not installed when they supposed be installed. Export CONFIG_OPENGLES in a Makefile to fix this bug. Also add some information messages about performed copy operations. Signed-off-by: Igor Mitsyanko --- tizen/src/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tizen/src/Makefile b/tizen/src/Makefile index 406ee2d..1fa53af 100755 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -8,6 +8,8 @@ config-host.mak: @exit 1 endif +export CONFIG_OPENGLES + all: build_info qemu skin_client check_hax qemu: cd ../../ && $(MAKE) @@ -53,6 +55,7 @@ install: all mkdir -p $(EMUL_DIR)/x86 ;\ mkdir -p $(EMUL_DIR)/x86/data ;\ mkdir -p $(EMUL_DIR)/x86/data/pc-bios ;\ + echo "Copying i386-softmmu/qemu-system-i386 to $(EMUL_DIR)/bin/emulator-x86" ;\ cp ../../i386-softmmu/qemu-system-i386 $(EMUL_DIR)/bin/emulator-x86 ;\ cp -dpr ../../pc-bios/bios.bin $(EMUL_DIR)/x86/data/pc-bios ;\ cp -dpr ../../pc-bios/linuxboot.bin $(EMUL_DIR)/x86/data/pc-bios ;\ @@ -63,9 +66,11 @@ install: all arm-softmmu) \ mkdir -p $(EMUL_DIR)/arm ;\ mkdir -p $(EMUL_DIR)/arm/data ;\ - cp ../../arm-softmmu/qemu-system-arm $(EMUL_DIR)/bin/emulator-arm ; \ - if [ ! -z "$$CONFIG_OPENGLES" ] ; then mkdir -p $(EMUL_DIR)/bin/lib ; \ - cp -dpr ../../arm-softmmu/lib/gles $(EMUL_DIR)/bin/lib ; \ + echo "Copying arm-softmmu/qemu-system-arm to $(EMUL_DIR)/bin/emulator-arm" ;\ + cp ../../arm-softmmu/qemu-system-arm $(EMUL_DIR)/bin/emulator-arm ;\ + if [ ! -z "$$CONFIG_OPENGLES" ] ; then mkdir -p $(EMUL_DIR)/bin/lib ;\ + echo "Copying OpenGLES libraries to $(EMUL_DIR)/bin/lib" ;\ + cp -dpr ../../arm-softmmu/lib/gles $(EMUL_DIR)/bin/lib ;\ fi \ ;; \ esac \ -- 2.7.4