[Feature][ZXW-88]merge P50 version

Only Configure: No
Affected branch: master
Affected module: unknown
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No

Change-Id: I34667719d9e0e7e29e8e4368848601cde0a48408
diff --git a/ap/app/qrencode/Makefile b/ap/app/qrencode/Makefile
old mode 100644
new mode 100755
index a78c42a..77c685d
--- a/ap/app/qrencode/Makefile
+++ b/ap/app/qrencode/Makefile
@@ -11,11 +11,11 @@
 OBJS2 = common.o png2bmp.o
 
 
-LDLIBS += -lpng -L$(zte_lib_path)/libpng
-LDLIBS += -L$(zte_lib_path)/zlib/build -lz -lm
+LDLIBS += -lpng -L$(zte_lib_path)/libpng/install/lib
+LDLIBS += -L$(zte_lib_path)/zlib/install/lib -lz -lm
 CFLAGS += -I./
-CFLAGS += -I$(zte_lib_path)/libpng
-CFLAGS += -I$(zte_lib_path)/zlib/zlib-1.2.11
+CFLAGS += -I$(zte_lib_path)/libpng/install/include
+CFLAGS += -I$(zte_lib_path)/zlib/install/include