Unity

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

  1. gles-fixes
  2. Merge into trunk
Proposed by Adam Conrad
Status: Merged
Approved by: Timo Jyrinki
Approved revision: no longer in the source branch.
Merged at revision: 2655
Proposed branch: lp:~adconrad/unity/gles-fixes
Merge into: lp:unity
Diff against target: 43 lines (+5/-8)
2 files modified
CMakeLists.txt (+2/-5)
dash/previews/CMakeLists.txt (+3/-3)
To merge this branch: bzr merge lp:~adconrad/unity/gles-fixes
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
Review via email: mp+122558@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

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

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

No commit message specified.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-08-31 13:21:02 +0000
3+++ CMakeLists.txt 2012-09-03 17:27:20 +0000
4@@ -17,16 +17,13 @@
5 set (CMAKE_CXX_FLAGS_DEBUG "-g3")
6 set (CMAKE_CXX_FLAGS_RELEASE "")
7
8-if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
9+if (BUILD_GLES)
10+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNUX_OPENGLES_20 -DUSE_GLES")
11 set (UNITY_STANDALONE_LADD "-lunity-core-${UNITY_API_VERSION} -lm -lpthread -ldl")
12 else ()
13 set (UNITY_STANDALONE_LADD "-lunity-core-${UNITY_API_VERSION} -lm -lpthread -ldl -lGL -lGLU")
14 endif ()
15
16-if (BUILD_GLES)
17- SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNUX_OPENGLES_20 -DUSE_GLES")
18-endif (BUILD_GLES)
19-
20 #
21 # Niceties
22 #
23
24=== modified file 'dash/previews/CMakeLists.txt'
25--- dash/previews/CMakeLists.txt 2012-08-14 11:14:45 +0000
26+++ dash/previews/CMakeLists.txt 2012-09-03 17:27:20 +0000
27@@ -10,13 +10,13 @@
28 "-I${CMAKE_CURRENT_BINARY_DIR}"
29 )
30
31-if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
32+if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
33 set (CFLAGS ${CFLAGS} "-fPIC")
34-endif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
35+endif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
36
37 add_definitions (${CFLAGS})
38
39-set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU")
40+set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} ${UNITY_STANDALONE_LADD})
41 link_libraries (${LIBS})
42
43 set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})