Removed open-gles-20 dependency
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 27 May 2014 14:59:06 +0000 (15:59 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 27 May 2014 14:59:06 +0000 (15:59 +0100)
build/slp/configure.ac
build/slp/dali-core/Makefile.am

index 1e57681..d1128b8 100644 (file)
@@ -17,7 +17,7 @@
 
 m4_define([dali_version],[0.1.1])
 AC_INIT([dali], [dali_version])
-AM_INIT_AUTOMAKE([-Wall -Wfloat-equal foreign])
+AM_INIT_AUTOMAKE([-Wall foreign])
 
 AC_PROG_CXX
 AC_PROG_LIBTOOL
@@ -30,8 +30,6 @@ LT_INIT
 DALI_VERSION=dali_version
 AC_SUBST(DALI_VERSION)
 
-#PKG_CHECK_MODULES(OPENGLES20, opengl-es-20)
-
 DALI_CFLAGS=-DPLATFORM_SLP
 
 AC_ARG_ENABLE(exportall,
@@ -98,9 +96,13 @@ else
   dataReadOnlyDir=${prefix}/share/dali/
 fi
 
+DALI_CFLAGS="$DALI_CFLAGS -I${includedir}"
+DALI_LDFLAGS="-L${libdir}"
+
 AC_SUBST(dataReadWriteDir)
 AC_SUBST(dataReadOnlyDir)
 AC_SUBST(DALI_CFLAGS)
+AC_SUBST(DALI_LDFLAGS)
 
 # Specify the include directory for development headers
 devincludepath=${includedir}
index 7f07a6a..325cf76 100644 (file)
@@ -79,7 +79,8 @@ libdali_core_la_CXXFLAGS = -DDALI_COMPILATION \
                            $(dali_core_includes) \
                            $(DALI_CFLAGS)
 
-libdali_core_la_LIBADD = -lboost_thread
+libdali_core_la_LIBADD = $(DALI_LDFLAGS) \
+                         -lboost_thread
 
 # Create an empty shaderbin dir
 install-data-local: