diff options
| author | Tim Penhey <tim.penhey@canonical.com> | 2012-11-29 11:05:07 +1300 |
|---|---|---|
| committer | Tim Penhey <tim.penhey@canonical.com> | 2012-11-29 11:05:07 +1300 |
| commit | 4b8493aa731726884c4431dc791d65d9b075a6de (patch) | |
| tree | 23eb6d47e420c13b7d0a0d2287b2c1ec317216d2 /unity-shared | |
| parent | 5dba3bcd954de5d582ddbdb4e2192a434c95e366 (diff) | |
| parent | a1ac94e2eea458b07e5a7516673128b7dbe1b259 (diff) | |
Merge prev and resolve conflicts.
(bzr r2791.9.51)
Diffstat (limited to 'unity-shared')
| -rw-r--r-- | unity-shared/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | unity-shared/TextInput.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/unity-shared/CMakeLists.txt b/unity-shared/CMakeLists.txt index 258d95292..8c5a6c202 100644 --- a/unity-shared/CMakeLists.txt +++ b/unity-shared/CMakeLists.txt @@ -5,8 +5,6 @@ find_package (PkgConfig) set (CFLAGS ${CACHED_UNITY_DEPS_CFLAGS} ${CACHED_UNITY_DEPS_CFLAGS_OTHER} - "-DGETTEXT_PACKAGE=\"unity\"" - "-I${CMAKE_CURRENT_BINARY_DIR}" ) if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l") @@ -20,7 +18,7 @@ set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} ${UNITY_STANDALONE_LADD}) set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS}) link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS}) -include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR}) # # Headers & Sources diff --git a/unity-shared/TextInput.h b/unity-shared/TextInput.h index ddcea004c..57a6e585f 100644 --- a/unity-shared/TextInput.h +++ b/unity-shared/TextInput.h @@ -20,6 +20,8 @@ #ifndef TEXTINPUT_H #define TEXTINPUT_H +#include "config.h" + #include <glib/gi18n-lib.h> #include <gtk/gtk.h> @@ -34,7 +36,6 @@ #include <UnityCore/GLibSource.h> #include <UnityCore/Variant.h> -#include "config.h" #include "CairoTexture.h" #include "unity-shared/IconTexture.h" #include "unity-shared/IMTextEntry.h" |