diff options
| author | Pierre Grandin <grandinp@gmail.com> | 2017-05-07 21:04:25 -0700 |
|---|---|---|
| committer | Pierre Grandin <grandinp@gmail.com> | 2017-05-07 21:04:25 -0700 |
| commit | c78e3cc256b9e66013ff12957bbcc24bb57827a4 (patch) | |
| tree | 5cc5133d516fddb461b926365c2d14a36921c3ab | |
| parent | cb31919563b7e12f97394a9a05add27f7e57fa40 (diff) | |
| download | navit-c78e3cc256b9e66013ff12957bbcc24bb57827a4.tar.gz | |
Removed merge conflict leftovers
| -rw-r--r-- | navit/gui/internal/CMakeLists.txt | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/navit/gui/internal/CMakeLists.txt b/navit/gui/internal/CMakeLists.txt index 39af3b94b..5635ed408 100644 --- a/navit/gui/internal/CMakeLists.txt +++ b/navit/gui/internal/CMakeLists.txt @@ -1,15 +1,5 @@ if(USE_AUDIO_FRAMEWORK) -#<<<<<<< HEAD set(audio_sources gui_internal_media.c ) endif(USE_AUDIO_FRAMEWORK) + module_add_library(gui_internal ${audio_sources} gui_internal.c gui_internal_bookmark.c gui_internal_command.c gui_internal_gesture.c gui_internal_html.c gui_internal_menu.c gui_internal_poi.c gui_internal_search.c gui_internal_widget.c gui_internal_keyboard.c) -#======= -# set(media_sources gui_internal_media.c ) -#endif(USE_AUDIO_FRAMEWORKSPOTIFY) -# set(gui_internal_LIBS ${spotify_LIBS} ${api_LIBS}) -#module_add_library(gui_internal ${media_sources} -# gui_internal.c gui_internal_bookmark.c -# gui_internal_command.c gui_internal_gesture.c gui_internal_html.c -# gui_internal_menu.c gui_internal_poi.c gui_internal_search.c -# gui_internal_widget.c gui_internal_keyboard.c) -#>>>>>>> audio_framework |