jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12 from computerquip/autotools-fix 

Fixes issues with autoconf
master
Jim 2013-12-27 15:01:08 -08:00
parent bbd8178dab 5f5404f8cb
commit fe61ca5808
8 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am Normal file
View File

@ -0,0 +1 @@
ACLOCAL_AMFLAGS = -I m4

0
autogen.sh Normal file → Executable file
View File

47
configure.ac
View File

@ -58,11 +58,26 @@ case $host_os in
;;
esac
# checks for wx
AM_OPTIONS_WXCONFIG
reqwx=2.9.0
AM_PATH_WXCONFIG($reqwx, wxWin=1)
if test "$wxWin" != 1; then
# checks for ffmpeg
AC_CHECK_HEADER([libavcodec/avcodec.h], , AC_MSG_ERROR([libavcodec header not found]))
AC_CHECK_HEADER([libavformat/avformat.h], , AC_MSG_ERROR([libavformat header not found]))
AC_CHECK_HEADER([libavutil/avutil.h], , AC_MSG_ERROR([libavutil header not found]))
AC_CHECK_HEADER([libavutil/channel_layout.h], , AC_MSG_ERROR([libavutil header not found]))
AC_CHECK_HEADER([libswscale/swscale.h], , AC_MSG_ERROR([libswscale header not found]))
AC_CHECK_HEADER([libswresample/swresample.h], , AC_MSG_ERROR([libswresample header not found]))
AC_CHECK_LIB([avcodec], [avcodec_find_encoder_by_name], , AC_MSG_ERROR([libavcodec not found]), )
AC_CHECK_LIB([avformat], [av_guess_format], , AC_MSG_ERROR([libavformat not found]))
AC_CHECK_LIB([avutil], [av_samples_alloc], , AC_MSG_ERROR([libavutil not found]))
AC_CHECK_LIB([swscale], [sws_scale], , AC_MSG_ERROR([libswscale not found]))
AC_CHECK_LIB([swresample], [swr_convert], , AC_MSG_ERROR([libswresample not found]))
AC_CHECK_HEADER([jansson.h], , AC_MSG_ERROR([libjansson header not found]))
AC_CHECK_LIB([jansson], [json_load_file], , AC_MSG_ERROR([libjansson not found]))
WX_CONFIG_OPTIONS
WX_CONFIG_CHECK(
[2.9.0], [wxWin=1], [wxWin=0,
AC_MSG_ERROR([
wxWidgets must be installed on your system.
@ -71,27 +86,14 @@ if test "$wxWin" != 1; then
'wx-config --libs' or 'wx-config --static --libs' command)
is in LD_LIBRARY_PATH or equivalent variable and
wxWidgets version is $reqwx or above.
])
fi
]) ],
[core], )
CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
LIBS="$LIBS $WX_LIBS"
# checks for ffmpeg
AC_CHECK_HEADER([libavcodec/avcodec.h], , AC_MSG_ERROR([libavcodec header not found]))
AC_CHECK_HEADER([libavformat/avformat.h], , AC_MSG_ERROR([libavformat header not found]))
AC_CHECK_HEADER([libavutil/avutil.h], , AC_MSG_ERROR([libavutil header not found]))
AC_CHECK_HEADER([libavutil/channel_layout.h], , AC_MSG_ERROR([libavutil header not found]))
AC_CHECK_HEADER([libswscale/swscale.h], , AC_MSG_ERROR([libswscale header not found]))
AC_CHECK_HEADER([libswresample/swresample.h], , AC_MSG_ERROR([libswresample header not found]))
AC_CHECK_LIB([avcodec], [avcodec_find_encoder_by_name], , AC_MSG_ERROR([libavcodec not found]))
AC_CHECK_LIB([avformat], [av_guess_format], , AC_MSG_ERROR([libavformat not found]))
AC_CHECK_LIB([avutil], [av_samples_alloc], , AC_MSG_ERROR([libavutil not found]))
AC_CHECK_LIB([swscale], [sws_scale], , AC_MSG_ERROR([libswscale not found]))
AC_CHECK_LIB([swresample], [swr_convert], , AC_MSG_ERROR([libswresample not found]))
# Checks for header files.
AC_PATH_X
AC_CHECK_HEADERS([inttypes.h limits.h malloc.h stddef.h stdint.h stdlib.h string.h sys/timeb.h wchar.h wctype.h])
@ -114,9 +116,6 @@ AC_TYPE_UINT64_T
AC_TYPE_UINT8_T
AC_CHECK_TYPES([ptrdiff_t])
AC_CHECK_HEADER([jansson.h], , AC_MSG_ERROR([libjansson header not found]))
AC_CHECK_LIB([jansson], [json_load_file], , AC_MSG_ERROR([libjansson not found]))
# Checks for library functions.
AC_FUNC_FSEEKO
AC_FUNC_STRTOD

4
libobs-opengl/makefile.am
View File

@ -1,5 +1,5 @@
INCLUDES = -isystem$(top_srcdir)/libobs -isystem./glew/include
AM_CFLAGS = -DGLEW_NO_GLU -DGLEW_STATIC
AUTOMAKE_OPTIONS = subdir-objects
AM_CFLAGS = -DGLEW_NO_GLU -DGLEW_STATIC -isystem$(top_srcdir)/libobs -isystem./glew/include
if OS_WIN
if ARCH_X86

2
libobs/makefile.am
View File

@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = subdir-objects
if OS_WIN
if ARCH_X86
libobsdir = ../build/bin/32bit

1
makefile.am
View File

@ -1,4 +1,3 @@
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = autogen.sh COPYING README
SUBDIRS = libobs libobs-opengl test obs

3
obs/makefile.am
View File

@ -1,4 +1,5 @@
INCLUDES = -I$(top_srcdir)/libobs
AUTOMAKE_OPTIONS = subdir-objects
AM_CPPFLAGS = -I$(top_srcdir)/libobs
if OS_WIN
if ARCH_X86_64

2
test/test-input/makefile.am
View File

@ -1,4 +1,4 @@
INCLUDES = -isystem$(top_srcdir)/libobs
AM_CFLAGS = -isystem$(top_srcdir)/libobs
if OS_WIN
if ARCH_X86