Merge lp:~adconrad/unity/gles-fixes into lp:unity

[Adam Conrad]

Bring the upstream unity in line with the Ubuntu package for GLES/linking fixes.

This brings the upstream unity in line with the Ubuntu package for GLES/linking fixes.

[Timo Jyrinki (timo-jyrinki)]

Thanks! This is what was released as part of 6.4.0-0ubuntu4 into quantal.

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-08-31 13:21:02 +0000
+++ CMakeLists.txt	2012-09-03 17:27:20 +0000
@@ -17,16 +17,13 @@
 set (CMAKE_CXX_FLAGS_DEBUG "-g3")
 set (CMAKE_CXX_FLAGS_RELEASE "")
 
-if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
+if (BUILD_GLES)
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNUX_OPENGLES_20 -DUSE_GLES")
     set (UNITY_STANDALONE_LADD "-lunity-core-${UNITY_API_VERSION} -lm -lpthread -ldl")
 else ()
     set (UNITY_STANDALONE_LADD "-lunity-core-${UNITY_API_VERSION} -lm -lpthread -ldl -lGL -lGLU")
 endif ()
 
-if (BUILD_GLES)
-	SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNUX_OPENGLES_20 -DUSE_GLES")
-endif (BUILD_GLES)
-
 #
 # Niceties
 #

=== modified file 'dash/previews/CMakeLists.txt'
--- dash/previews/CMakeLists.txt	2012-08-14 11:14:45 +0000
+++ dash/previews/CMakeLists.txt	2012-09-03 17:27:20 +0000
@@ -10,13 +10,13 @@
      "-I${CMAKE_CURRENT_BINARY_DIR}"
      )
 
-if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
   set (CFLAGS ${CFLAGS} "-fPIC")
-endif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+endif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
 
 add_definitions (${CFLAGS})
 
-set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU")
+set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} ${UNITY_STANDALONE_LADD})
 link_libraries (${LIBS})
 
 set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})