etlegacy/etlegacy-libs
0
0
Fork 0
mirror of https://github.com/etlegacy/etlegacy-libs.git synced 2025-04-08 15:40:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update CMakeLists.txt

Browse source 
Fix Linux (Debian) vorbis build - ensure configure uses our bundled ogg
This commit is contained in:
IR4T4 2015-07-16 14:06:03 +02:00
parent 61da483b6a
commit 088d2192da
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -479,11 +479,13 @@ elseif(UNIX)
# OGG Vorbis File
set(CFLAGS "${CFLAGS} -I${CMAKE_CURRENT_LIST_DIR}/ogg/include")
set(LDFLAGS "${LDFLAGS} -L${CMAKE_CURRENT_LIST_DIR}/ogg/src/.libs")
# the above set of CFLAGS and LDFLAGS don't trigger on some systems
# ensure vorbis configure uses our bundled ogg see --with-ogg-includes & --with-ogg-libraries
add_custom_command(
OUTPUT ${CMAKE_CURRENT_LIST_DIR}/vorbis/lib/.libs/libvorbisfile.a
COMMAND make clean || true
COMMAND ${CROSS_COMPILE32_FLAGS} ./configure --disable-oggtest && make
COMMAND ${CROSS_COMPILE32_FLAGS} ./configure --disable-oggtest --with-ogg-includes=${CMAKE_CURRENT_LIST_DIR}/ogg/include --with-ogg-libraries=${CMAKE_CURRENT_LIST_DIR}/ogg/src/.libs && make
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/vorbis
)
add_custom_target(bundled_ogg_vorbis_file