etlegacy/etlegacy-libs
0
0
Fork 0
mirror of https://github.com/etlegacy/etlegacy-libs.git synced 2024-11-10 14:51:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed ogg compilation with latest automake

Browse source
This commit is contained in:
Remy Marquis 2015-07-12 19:27:13 +02:00
parent 5ad478f95b
commit fd84cca2d3
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -466,6 +466,7 @@ elseif(UNIX)
# OGG # OGG
add_custom_command(OUTPUT ${CMAKE_CURRENT_LIST_DIR}/ogg/src/.libs/libogg.a add_custom_command(OUTPUT ${CMAKE_CURRENT_LIST_DIR}/ogg/src/.libs/libogg.a
COMMAND make clean || true COMMAND make clean || true
COMMAND ./autogen.sh
COMMAND ${CROSS_COMPILE32_FLAGS} ./configure && make COMMAND ${CROSS_COMPILE32_FLAGS} ./configure && make
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/ogg WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/ogg
) )
@ -476,18 +477,13 @@ elseif(UNIX)
set(OGG_BUNDLED_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/ogg/include") set(OGG_BUNDLED_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/ogg/include")
# OGG Vorbis File # OGG Vorbis File
if(CROSS_COMPILE32) set(CFLAGS "${CFLAGS} -I${CMAKE_CURRENT_LIST_DIR}/ogg/include")
set(CFLAGS "-m32 -I${CMAKE_CURRENT_LIST_DIR}/ogg/include") set(LDFLAGS "${LDFLAGS} -L${CMAKE_CURRENT_LIST_DIR}/ogg/src/.libs")
set(LDFLAGS "-m32 -L${CMAKE_CURRENT_LIST_DIR}/ogg/src/.libs")
else()
set(CFLAGS "-I${CMAKE_CURRENT_LIST_DIR}/ogg/include")
set(LDFLAGS "-L${CMAKE_CURRENT_LIST_DIR}/ogg/src/.libs")
endif()
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_LIST_DIR}/vorbis/lib/.libs/libvorbisfile.a OUTPUT ${CMAKE_CURRENT_LIST_DIR}/vorbis/lib/.libs/libvorbisfile.a
COMMAND make clean || true COMMAND make clean || true
COMMAND eval \"CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} ./configure --disable-oggtest && make\" COMMAND ${CROSS_COMPILE32_FLAGS} ./configure --disable-oggtest && make
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/vorbis WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/vorbis
) )
add_custom_target(bundled_ogg_vorbis_file add_custom_target(bundled_ogg_vorbis_file

2
ogg/Makefile.am
View file

@ -12,6 +12,8 @@ m4data_DATA = ogg.m4
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = ogg.pc pkgconfig_DATA = ogg.pc
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = README.md AUTHORS CHANGES COPYING \ EXTRA_DIST = README.md AUTHORS CHANGES COPYING \
libogg.spec libogg.spec.in \ libogg.spec libogg.spec.in \
ogg.m4 ogg.pc.in ogg-uninstalled.pc.in \ ogg.m4 ogg.pc.in ogg-uninstalled.pc.in \

1
ogg/configure.ac
View file

@ -3,6 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT([libogg],[1.3.2],[ogg-dev@xiph.org]) AC_INIT([libogg],[1.3.2],[ogg-dev@xiph.org])
AC_CONFIG_SRCDIR(src/framing.c) AC_CONFIG_SRCDIR(src/framing.c)
AC_CONFIG_MACRO_DIRS([m4])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE([enable]) AM_MAINTAINER_MODE([enable])