X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=README.md;h=17972bc1d33a98af416d932ec9094eea79ff064d;hb=73b6ad29479290f2ad49c4f7ac422544a33cd9dd;hp=2e4166ce81502be2da93dadc4d79b7d6c525983b;hpb=0bea3bc41988b6b308bad87f019017b3a0e670b5;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/README.md b/README.md
index 2e4166c..17972bc 100644
--- a/README.md
+++ b/README.md
@@ -13,17 +13,22 @@
          * [NON-SMACK Targets](#non-smack-targets)
          * [SMACK enabled Targets](#smack-enabled-targets)
          * [DEBUG Builds](#debug-builds)
-      * [3. Building DALi as Javascript using Emscripten](#3-building-dali-as-javascript-using-emscripten)
-         * [Environment for Emscripten Javascript builds](#environment-for-emscripten-javascript-builds)
-         * [Building the repository as Javascript using Emscripten](#building-the-repository-as-javascript-using-emscripten)
 
 # Build Instructions
 
 ## 1. Building for Ubuntu desktop
 
-### Minimum Requirements
+### Requirements
 
  - Ubuntu 14.04 or later
+ - GCC version 6
+
+DALi requires a compiler supporting C++11 features.
+Ubuntu 16.04 is the first version to offer this by default (GCC v5.4.0).
+
+GCC version 6 is recommended since it has fixes for issues in version 5
+e.g. it avoids spurious 'defined but not used' warnings in header files.
+
 
 ### Creating a DALi Environment
 
@@ -58,26 +63,15 @@ To build the repository enter the 'build/tizen' folder:
 
          $ cd dali-core/build/tizen
 
-Then run the following commands:
-
-         $ autoreconf --install
-         $ ./configure --prefix=$DESKTOP_PREFIX
-         $ make install -j8
-
-### Build target options
-
-OpenGL ES context:
+Then run the following command to set up the build:
 
-When building, the OpenGL ES version of the target should be specified.
+         $ cmake -DCMAKE_INSTALL_PREFIX=$DESKTOP_PREFIX .
 
-Valid version options are 20, 30, 31
+If a Debug build is required, then add -DCMAKE_BUILD_TYPE=Debug
 
-With configure:
-Add: *--enable-gles=X*
-
-With gbs:
-Add to the gbs build line: *--define "%target_gles_version X"*
+To build run:
 
+         $ make install -j8
 
 ### Building and executing test cases
 
@@ -97,47 +91,3 @@ See the README.md in dali-core/automated-tests.
 
          $ gbs build -A [TARGET_ARCH] --define "%enable_debug 1"
 
-## 3. Building DALi as Javascript using Emscripten
-
-
-### Environment for Emscripten Javascript builds
-
-To build the Javascript version of DALi, the Emscripten SDK is required.
-Installation of this is built in to the main dali_env script.
-
-First create a directory for the environment:
-
-         $ mkdir -p ~/dali-env-emscripten
-
-Now run the dali_env script. This will download and build the Emscripten SDK, which may take several minutes.
-The script may ask for your password as it will need to install any package prerequisites.
-Note the "-e" option for Emscripten.
-
-         $ cd ~/dali-env-emscripten
-         $ PATH-TO-DALI-CORE/build/scripts/dali_env -c -e
-
-Create the setenv script. A new section for Emscripten will be created at the top.
-
-         $ ./dali-env/opt/bin/dali_env -s > setenv
-
-Run the setenv script to setup environment variables.
-
-         $ . ./setenv
-
-Warning: As of 19/01/2015 with a userID > 6 digits there was a bug in llvm that caused
-the build to fail. So I've used the incoming branches of the emscripten sdk and not latest.
-
-### Building the repository as Javascript using Emscripten
-
-Clean the build first:
-
-         $ cd ./dali-core/build/tizen
-         $ git clean -dxf
-         $ autoreconf --install
-
-Use llvm's drop in replacements for configure & make:
-
-         $ emconfigure ./configure --verbose --prefix=$DESKTOP_PREFIX --enable-emscripten=yes --enable-debug=yes --enable-profile=UBUNTU --enable-gles=20
-         $ emmake make install -j8
-
-