backup/planetblupi-dev
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi-dev synced 2024-12-30 13:55:36 +01:00
Code Issues Projects Releases Activity

Fix bad merge

Browse Source
This commit is contained in:
Mathieu Schroeter 2018-06-08 10:50:30 +02:00
parent 2f4d1b73bc
commit 0bd1c37f2c
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -641,16 +641,11 @@ set (planetblupi_DEPS
gettext_Project gettext_Project
libvorbis_Project libvorbis_Project
) )
<<<<<<< HEAD if (UNIX AND NOT APPLE AND NOT ANDROID)
if (UNIX AND NOT APPLE)
list (APPEND planetblupi_DEPS list (APPEND planetblupi_DEPS
libasound_Project libasound_Project
libpulse_Project libpulse_Project
) )
=======
if (UNIX AND NOT APPLE AND NOT ANDROID)
list (APPEND planetblupi_DEPS libasound_Project libpulse_Project)
>>>>>>> a1e010aedc6ba20f1c5af0592d4576669fe2e2ab
endif () endif ()
ExternalProject_Add (planetblupi_Project ExternalProject_Add (planetblupi_Project