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 merge

Browse Source
This commit is contained in:
Mathieu Schroeter 2018-06-08 15:53:27 +02:00
parent 0bd1c37f2c
commit 1783fdf41f
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -293,12 +293,9 @@ ExternalProject_Add (FFmpeg_Project
--disable-libxcb-shm --disable-libxcb-shm
--disable-libxcb-xfixes --disable-libxcb-xfixes
--disable-libxcb-shape --disable-libxcb-shape
<<<<<<< HEAD
--disable-jack --disable-jack
--disable-sndio --disable-sndio
=======
${ADDITIONAL_FFMPEG_CONFIGURE_OPTIONS} ${ADDITIONAL_FFMPEG_CONFIGURE_OPTIONS}
>>>>>>> a1e010aedc6ba20f1c5af0592d4576669fe2e2ab
BUILD_COMMAND ${CMD} make BUILD_COMMAND ${CMD} make
INSTALL_COMMAND ${CMD} make install INSTALL_COMMAND ${CMD} make install
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
@ -394,11 +391,7 @@ if (UNIX AND NOT APPLE AND NOT ANDROID)
ExternalProject_Add (libpulse_Project ExternalProject_Add (libpulse_Project
URL ${CMAKE_CURRENT_SOURCE_DIR}/externals/pulseaudio.tar.xz URL ${CMAKE_CURRENT_SOURCE_DIR}/externals/pulseaudio.tar.xz
PREFIX ${CMAKE_BINARY_DIR} PREFIX ${CMAKE_BINARY_DIR}
<<<<<<< HEAD CONFIGURE_COMMAND patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/externals/pulseaudio.patch && ${ADDITIONAL_TOOL_OPTIONS} ${CMD} ./configure
CONFIGURE_COMMAND patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/externals/pulseaudio.patch && ${CMD} ./configure
=======
CONFIGURE_COMMAND ${ADDITIONAL_TOOL_OPTIONS} ${CMD} ./configure
>>>>>>> a1e010aedc6ba20f1c5af0592d4576669fe2e2ab
--prefix=${CMAKE_BINARY_DIR} --prefix=${CMAKE_BINARY_DIR}
--disable-shared --disable-shared
--enable-static --enable-static