From 0bd1c37f2c08a8f84c57e3e4658210bd756a6574 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Fri, 8 Jun 2018 10:50:30 +0200 Subject: [PATCH] Fix bad merge --- CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 739c6ab..3bd773b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -641,16 +641,11 @@ set (planetblupi_DEPS gettext_Project libvorbis_Project ) -<<<<<<< HEAD -if (UNIX AND NOT APPLE) +if (UNIX AND NOT APPLE AND NOT ANDROID) list (APPEND planetblupi_DEPS libasound_Project libpulse_Project ) -======= -if (UNIX AND NOT APPLE AND NOT ANDROID) - list (APPEND planetblupi_DEPS libasound_Project libpulse_Project) ->>>>>>> a1e010aedc6ba20f1c5af0592d4576669fe2e2ab endif () ExternalProject_Add (planetblupi_Project