diff options
| -rw-r--r-- | dash/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | hud/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | launcher/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | panel/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | shortcuts/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | unity-shared/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | unity-standalone/CMakeLists.txt | 8 |
7 files changed, 43 insertions, 14 deletions
diff --git a/dash/CMakeLists.txt b/dash/CMakeLists.txt index d442a7008..28bbfd809 100644 --- a/dash/CMakeLists.txt +++ b/dash/CMakeLists.txt @@ -10,13 +10,18 @@ set (CFLAGS "-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") add_definitions (${CFLAGS}) -set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU") +if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l") + set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm") +else() + set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU") +endif() + link_libraries (${LIBS}) set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS}) diff --git a/hud/CMakeLists.txt b/hud/CMakeLists.txt index 294ba8a6a..fa489e45d 100644 --- a/hud/CMakeLists.txt +++ b/hud/CMakeLists.txt @@ -10,13 +10,17 @@ set (CFLAGS "-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") add_definitions (${CFLAGS}) -set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU") +if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l") + set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm") +else() + set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU") +endif() link_libraries (${LIBS}) set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS}) diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index f8fca53c3..c71718cc5 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -11,13 +11,17 @@ set (CFLAGS "-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") add_definitions (${CFLAGS}) -set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU") +if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l") + set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm") +else() + set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU") +endif() link_libraries (${LIBS}) set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS}) diff --git a/panel/CMakeLists.txt b/panel/CMakeLists.txt index 6e3c68eea..be6fe97b3 100644 --- a/panel/CMakeLists.txt +++ b/panel/CMakeLists.txt @@ -10,13 +10,17 @@ set (CFLAGS "-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") add_definitions (${CFLAGS}) -set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU") +if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l") + set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm") +else() + set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU") +endif() link_libraries (${LIBS}) set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS}) diff --git a/shortcuts/CMakeLists.txt b/shortcuts/CMakeLists.txt index 0d9f1d651..a33acb3a9 100644 --- a/shortcuts/CMakeLists.txt +++ b/shortcuts/CMakeLists.txt @@ -10,13 +10,17 @@ set (CFLAGS "-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") add_definitions (${CFLAGS}) -set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU") +if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l") + set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm") +else() + set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU") +endif() link_libraries (${LIBS}) set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS}) diff --git a/unity-shared/CMakeLists.txt b/unity-shared/CMakeLists.txt index 608d312d5..82c3e636a 100644 --- a/unity-shared/CMakeLists.txt +++ b/unity-shared/CMakeLists.txt @@ -10,13 +10,17 @@ set (CFLAGS "-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") add_definitions (${CFLAGS}) -set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU") +if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l") + set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm") +else() + set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU") +endif() link_libraries (${LIBS}) set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS}) diff --git a/unity-standalone/CMakeLists.txt b/unity-standalone/CMakeLists.txt index 6ebe4cc21..fba9322b4 100644 --- a/unity-standalone/CMakeLists.txt +++ b/unity-standalone/CMakeLists.txt @@ -10,13 +10,17 @@ set (CFLAGS "-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") add_definitions (${CFLAGS}) -set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU") +if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l") + set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm") +else() + set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU") +endif() link_libraries (${LIBS}) set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS}) |
