diff options
| author | Tim Penhey <tim.penhey@canonical.com> | 2012-10-18 08:03:31 +0000 |
|---|---|---|
| committer | Tarmac <> | 2012-10-18 08:03:31 +0000 |
| commit | 01fa034334d3471f2b1faef5ead3a98357d5ed71 (patch) | |
| tree | 6a8ecf66aab86fc5133a3a440ef91a01fe17ad2c | |
| parent | 55a23d71f23acb365f54e5fd0298d8881dbac257 (diff) | |
| parent | cb7e3d839984acc0db60a44eea4a7ceea81761cf (diff) | |
More tweaks to get unity compiling on ARM without X.. Approved by Brandon Schaefer.
(bzr r2858)
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | launcher/Launcher.cpp | 6 | ||||
| -rw-r--r-- | unity-shared/BGHash.cpp | 4 | ||||
| -rw-r--r-- | unity-shared/ResizingBaseWindow.h | 2 |
4 files changed, 17 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 473f855f7..7fa236f4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,6 +107,9 @@ configure_file (${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h) # # i18n # + +if (NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") + find_package (Gettext REQUIRED) set (COMPIZ_I18N_DIR ${CMAKE_SOURCE_DIR}/po) @@ -123,6 +126,8 @@ if (${GETTEXT_FOUND} STREQUAL "TRUE") ALL ${_translations}) endif (${GETTEXT_FOUND} STREQUAL "TRUE") +endif() # arm builds + # # Enable or disable boot logging # diff --git a/launcher/Launcher.cpp b/launcher/Launcher.cpp index 3d0865e9b..cdf6a5281 100644 --- a/launcher/Launcher.cpp +++ b/launcher/Launcher.cpp @@ -106,7 +106,11 @@ Launcher::Launcher(nux::BaseWindow* parent, nux::ObjectPtr<DNDCollectionWindow> const& collection_window, NUX_FILE_LINE_DECL) : View(NUX_FILE_LINE_PARAM) +#ifdef UNITY_HAS_X_ORG_SUPPORT , display(nux::GetGraphicsDisplay()->GetX11Display()) +#else + , display(0) +#endif , monitor(0) , _parent(parent) , _active_quicklist(nullptr) @@ -187,7 +191,9 @@ Launcher::Launcher(nux::BaseWindow* parent, wm.terminate_expo.connect(sigc::mem_fun(this, &Launcher::OnPluginStateChanged)); wm.screen_viewport_switch_ended.connect(sigc::mem_fun(this, &Launcher::EnsureAnimation)); +#ifdef UNITY_HAS_X_ORG_SUPPORT display.changed.connect(sigc::mem_fun(this, &Launcher::OnDisplayChanged)); +#endif // 0 out timers to avoid wonky startups for (int i = 0; i < TIME_LAST; ++i) diff --git a/unity-shared/BGHash.cpp b/unity-shared/BGHash.cpp index 4f66a873a..0b2b5afe1 100644 --- a/unity-shared/BGHash.cpp +++ b/unity-shared/BGHash.cpp @@ -22,6 +22,10 @@ #include <NuxCore/Logger.h> #include "unity-shared/UBusMessages.h" +#ifndef XA_STRING +#define XA_STRING ((Atom) 31) +#endif + namespace { nux::logging::Logger logger("unity.BGHash"); diff --git a/unity-shared/ResizingBaseWindow.h b/unity-shared/ResizingBaseWindow.h index ff400c1c2..c7f50cbb2 100644 --- a/unity-shared/ResizingBaseWindow.h +++ b/unity-shared/ResizingBaseWindow.h @@ -35,8 +35,10 @@ public: void UpdateInputWindowGeometry() { +#ifdef UNITY_HAS_X_ORG_SUPPORT if (m_input_window && m_input_window_enabled) m_input_window->SetGeometry(geo_func_(GetGeometry())); +#endif } virtual void SetGeometry(const nux::Geometry &geo) |