From 634fc3ac8c9d20bf23604d1bc1c1965cb483a52b Mon Sep 17 00:00:00 2001 From: Dmytro Bogovych Date: Sun, 14 Nov 2021 17:48:27 +0200 Subject: [PATCH] - fix cmake --- src/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 57d28524..7cf184ea 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -88,7 +88,6 @@ if (CMAKE_SYSTEM MATCHES "Darwin*") add_definitions (-DTARGET_OSX) endif() -<<<<<<< ours if (CMAKE_SYSTEM MATCHES "Android") message("Adding the Oboe library") set (OBOE_DIR libs/oboe) @@ -96,13 +95,10 @@ if (CMAKE_SYSTEM MATCHES "Android") include_directories (${OBOE_DIR}/include) endif() -======= if (USE_MUSL) add_definitions(-DTARGET_MUSL) endif() - ->>>>>>> theirs if (USE_AQUA_LIB) message("Use AQuA library") add_definitions( -DUSE_AQUA_LIBRARY )