[waffle] [PATCH] nacl: fix gl_basic example compilation issue with new nacl SDKs

[Tapani Pälli]

For pepper_43 ppapi_simple was moved from C++ to C. We need C++
entrypoints so link with ppapi_simple_cpp instead of ppapi_simple.

Patch also changes default SDK version in Options.cmake to latest
stable NaCl SDK (that is tested to be compatible with the change).

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
---
 Options.cmake           | 2 +-
 examples/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Options.cmake b/Options.cmake
index 4f097a0..3339ac1 100644
--- a/Options.cmake
+++ b/Options.cmake
@@ -32,7 +32,7 @@ if(waffle_on_linux)
 
     # NaCl specific settings.
     set(nacl_sdk_path "" CACHE STRING "Set nacl_sdk path here")
-    set(nacl_version "pepper_39" CACHE STRING "Set NaCl bundle here")
+    set(nacl_version "pepper_44" CACHE STRING "Set NaCl bundle here")
 endif()
 
 option(waffle_build_tests "Build tests" ON)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 31a909b..1102ad4 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -36,7 +36,7 @@ if (waffle_has_nacl)
     target_link_libraries(gl_basic_nacl.nexe
         ${waffle_libname}
         ${nacl_LDFLAGS}
-        -lppapi_simple
+        -lppapi_simple_cpp
         -lnacl_io
         )
 
-- 
2.4.3