Browse Source

Remove autotools files and update INSTALL file

BtbN 11 years ago
parent
commit
e53825f1c3
11 changed files with 10 additions and 365 deletions
  1. 10 15
      INSTALL
  2. 0 2
      autogen.sh
  3. 0 16
      build/makefile.am
  4. 0 136
      configure.ac
  5. 0 45
      libobs-opengl/makefile.am
  6. 0 73
      libobs/makefile.am
  7. 0 4
      makefile.am
  8. 0 39
      obs/makefile.am
  9. 0 4
      test/makefile.am
  10. 0 23
      test/test-input/makefile.am
  11. 0 8
      test/win/makefile.am

+ 10 - 15
INSTALL

@@ -4,17 +4,17 @@ Will give better instructions later when things are in a more complete state.
 Windows:
   - Use VS2013, as obs-studio uses C99 and C++11
 
-  - Download latest FFmpeg and wxWidgets repositories
+  - Download latest FFmpeg repositories and Qt5 release
 
   - Create a windows environment variable FFmpegPath.  Set it to your FFmpeg
     repo path
 
-  - Create a windows environment variable wxWidgetsPath.  Set it to your
-    wxWidgets repo path
+  - Create a windows environment variable QTDIR.  Set it to your
+    Qt5 install path
 
-  - Compile wxWidgets and FFmpeg.  They should both be compiled with VS2013.
-    Convert the VS2010 project file for wxWidgets, and for compiling FFmpeg,
-    see http://ffmpeg.org/platform.html#Windows
+  - Compile FFmpeg and Qt5(Until they release a binary VS2013 version).
+    They should both be compiled with VS2013.
+    For compiling FFmpeg, see http://ffmpeg.org/platform.html#Windows
 
   - Create two directories in FFmpeg directory, lib32 and lib64.  Place the
     lib files generated by FFmpeg into these directories for the respective
@@ -31,24 +31,19 @@ Windows:
 
 
 Mac OSX
-  - Use macports or homebrew and get wxWidgets 3.0, FFmpeg, glew, cmake.
+  - Use macports or homebrew and get FFmpeg, glew and cmake.
 
-  - Building via autotools not yet supported
-
-  - In a terminal, go to the obs-studio/build directory, then to build, type:
-    cmake .. && make
+  - In a terminal, go to the obs-studio directory create a cmbuild subdir
+    and change to it, then to build, type: cmake .. && make
 
   - It builds in a modular structure similar to windows, where everything
-    necessary to run the program is compiled to obs-studio/build
+    necessary to run the program is compiled to cmbuild/rundir
 
   - You can also use ccmake to create an app bundle, which makes it so you
     don't have to use the terminal to execute it from the correct directory
 
 
 Linux
-  - Definitely want to use autotools, as cmake files are currently made more
-    for OSX
-
   - If using debian-based distributions, you may have to get the latest FFmpeg
     repo -- default debian packages seem to be a bit lacking, so you might have
     to either get precompiled packages from http://deb-multimedia.org/ (or

+ 0 - 2
autogen.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-autoreconf --force --install -I config -I m4

+ 0 - 16
build/makefile.am

@@ -1,16 +0,0 @@
-obs_plugin_datadir = $(datadir)/obs-plugins
-obs_plugin_data_testdir = $(obs_plugin_datadir)/test-input
-data_libobsdir = $(datadir)/libobs
-obs_localedir = $(datadir)/obs-studio/locale
-
-
-obs_plugin_data_test_DATA = data/obs-plugins/test-input/draw.effect \
-			    data/obs-plugins/test-input/test.effect
-data_libobs_DATA = data/libobs/default.effect
-obs_locale_DATA = data/obs-studio/locale/en.txt \
-	data/obs-studio/locale/ja.txt \
-	data/obs-studio/locale/locale.ini 
-
-#uninstall-local:
-#	rm -r $(DESTDIR)$(obs_plugin_datadir)
-#	rm -r $(DESTDIR)$(data_libobsdir)

+ 0 - 136
configure.ac

@@ -1,136 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.67])
-AC_INIT([obs-studio], [0.0.1], [[email protected]])
-AC_CONFIG_SRCDIR([libobs/obs.c])
-AC_CONFIG_MACRO_DIR([m4])
-# AC_CONFIG_HEADERS([config.h])
-AC_CANONICAL_HOST
-
-LT_INIT
-AM_INIT_AUTOMAKE([foreign])
-AM_SILENT_RULES([yes])
-
-# Checks for programs.
-AC_PROG_CC_STDC
-AC_PROG_OBJC
-AC_PROG_OBJCXX
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_SED
-
-AX_CXX_COMPILE_STDCXX_11
-# AX_EXT
-AX_APPEND_FLAG(["-msse2"], [CPPFLAGS])
-
-# currently only x86 and x86_64 are supported architectures
-case $host in
-	i?86*)
-		AM_CONDITIONAL([ARCH_X86],    true)
-		AM_CONDITIONAL([ARCH_X86_64], false)
-		;;
-	amd64* | x86_64*)
-		AM_CONDITIONAL([ARCH_X86],    false)
-		AM_CONDITIONAL([ARCH_X86_64], true)
-		;;
-	*)
-		AC_MSG_ERROR([host architecture not currently supported])
-		;;
-esac
-
-case $host_os in
-	mingw*)
-		AM_CONDITIONAL([OS_WIN], true)
-		AM_CONDITIONAL([OS_OSX], false)
-		AM_CONDITIONAL([OS_NIX], false)
-		;;
-	darwin*)
-		AM_CONDITIONAL([OS_WIN], false)
-		AM_CONDITIONAL([OS_OSX], true)
-		AM_CONDITIONAL([OS_NIX], false)
-		;;
-	*) #TODO - fix nix, but not with sticks, and definitely not with bricks
-		AM_CONDITIONAL([OS_WIN], false)
-		AM_CONDITIONAL([OS_OSX], false)
-		AM_CONDITIONAL([OS_NIX], true)
-		PKG_CHECK_MODULES([X11], [x11])
-		PKG_CHECK_MODULES([XINERAMA], [xinerama])
-		PKG_CHECK_MODULES([GTK], [gtk+-x11-2.0])
-		;;
-esac
-
-# 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 jansson
-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]))
-
-wxVersion=2.9.0
-WX_CONFIG_OPTIONS
-WX_CONFIG_CHECK(
-	$wxVersion, [wxWin=1], [wxWin=0,
-	AC_MSG_ERROR([
-		wxWidgets must be installed on your system.
- 
-		Please check that wx-config is in path, the directory
-		where wxWidgets libraries are installed (returned by
-		'wx-config --libs' or 'wx-config --static --libs' command)
-		is in LD_LIBRARY_PATH or equivalent variable and
-		wxWidgets version is $wxVersion or above.
-		]) ],
-	[core], [--version=2.9])
-
-CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
-CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
-CFLAGS="$CFLAGS $WX_CFLAGS_ONLY  "
-LIBS="$LIBS $WX_LIBS"
-
-# 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])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STDBOOL
-AC_C_INLINE
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_INT8_T
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
-AC_TYPE_UINT8_T
-AC_CHECK_TYPES([ptrdiff_t])
-
-# Checks for library functions.
-AC_FUNC_FSEEKO
-AC_FUNC_STRTOD
-AC_CHECK_FUNCS([memmove memset socket strstr strtol strtoul])
-
-AC_CONFIG_FILES([makefile
-		 build/makefile
-		 obs/makefile
-		 test/makefile
-		 test/test-input/makefile
-		 libobs/makefile
-		 libobs-opengl/makefile])
-
-AC_OUTPUT

+ 0 - 45
libobs-opengl/makefile.am

@@ -1,45 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-AM_CFLAGS = -DGLEW_NO_GLU -DGLEW_STATIC -isystem$(top_srcdir)/libobs -isystem./glew/include
-
-if OS_WIN
-if ARCH_X86
-libobs_opengldir = ../build/bin/32bit
-else
-libobs_opengldir = ../build/bin/64bit
-endif
-else
-libobs_opengldir = $(libdir)
-endif
-
-libobs_opengl_LTLIBRARIES = libobs-opengl.la
-
-libobs_opengl_la_LDFLAGS = -no-undefined
-libobs_opengl_la_LIBADD = ../libobs/libobs.la
-if OS_WIN
-libobs_opengl_la_LDFLAGS += -mwindows -avoid-version
-libobs_opengl_la_LIBADD += -lopengl32
-endif
-libobs_opengl_la_SOURCES = gl-helpers.c \
-			   gl-indexbuffer.c \
-			   gl-shader.c \
-			   gl-shaderparser.c \
-			   gl-stagesurf.c \
-			   gl-subsystem.c \
-			   gl-texture2d.c \
-			   gl-texturecube.c \
-			   gl-vertexbuffer.c \
-			   gl-zstencil.c \
-			   glew/src/glew.c
-
-if OS_OSX
-libobs_opengl_la_SOURCES += gl-cocoa.m
-libobs_opengl_la_LDFLAGS += -framework Cocoa -framework IOSurface
-endif
-
-if OS_WIN
-libobs_opengl_la_SOURCES += gl-windows.c
-endif
-
-if OS_NIX
-libobs_opengl_la_SOURCES += gl-x11.c
-endif

+ 0 - 73
libobs/makefile.am

@@ -1,73 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
-if OS_WIN
-if ARCH_X86
-libobsdir = ../build/bin/32bit
-else
-libobsdir = ../build/bin/64bit
-endif
-else
-libobsdir = $(libdir)
-endif
-
-libobs_LTLIBRARIES = libobs.la
-libobs_la_LDFLAGS = -no-undefined --version-info 0:0:0
-
-if OS_WIN
-libobs_la_LDFLAGS += -avoid-version
-endif
-
-libobs_la_SOURCES = obs.c \
-		    obs-display.c \
-		    obs-module.c \
-		    obs-output.c \
-		    obs-scene.c \
-		    obs-source.c \
-		    obs-encoder.c \
-		    obs-video.c \
-		    util/base.c \
-		    util/bmem.c \
-		    util/cf-lexer.c \
-		    util/cf-parser.c \
-		    util/config-file.c \
-		    util/dstr.c \
-		    util/lexer.c \
-		    util/platform.c \
-		    util/text-lookup.c \
-		    util/utf8.c \
-		    media-io/audio-io.c \
-		    media-io/format-conversion.c \
-		    media-io/audio-resampler-ffmpeg.c \
-		    media-io/video-io.c \
-		    graphics/axisang.c \
-		    graphics/bounds.c \
-		    graphics/effect.c \
-		    graphics/effect-parser.c \
-		    graphics/graphics.c \
-		    graphics/graphics-imports.c \
-		    graphics/math-extra.c \
-		    graphics/matrix3.c \
-		    graphics/matrix4.c \
-		    graphics/plane.c \
-		    graphics/quat.c \
-		    graphics/shader-parser.c \
-		    graphics/texture-render.c \
-		    graphics/vec2.c \
-		    graphics/vec3.c \
-		    graphics/vec4.c \
-		    callback/calldata.c \
-		    callback/proc.c \
-		    callback/signal.c
-
-if OS_WIN
-libobs_la_SOURCES += util/platform-windows.c obs-windows.c
-endif
-
-if OS_OSX
-libobs_la_SOURCES += util/platform-cocoa.m obs-cocoa.c
-libobs_la_OBJCFLAGS = -fobjc-arc
-endif
-
-if OS_NIX
-libobs_la_SOURCES += util/platform-nix.c obs-nix.c
-endif

+ 0 - 4
makefile.am

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

+ 0 - 39
obs/makefile.am

@@ -1,39 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-AM_CPPFLAGS = -I$(top_srcdir)/libobs
-
-if OS_WIN
-if ARCH_X86_64
-obsdir = ../build/bin/64bit
-else
-obsdir = ../build/bin/32bit
-endif
-else
-obsdir = $(bindir)
-endif
-
-obs_PROGRAMS = obs
-obs_LDADD = $(top_srcdir)/libobs/libobs.la
-obs_SOURCES = window-basic-main.cpp \
-	      window-basic-settings.cpp \
-	      window-namedialog.cpp \
-	      settings-basic.cpp \
-	      settings-basic-general.cpp \
-	      settings-basic-video.cpp \
-	      obs-app.cpp \
-	      wx-subclass.cpp \
-	      wx-wrappers.cpp \
-	      forms/OBSWindows.cpp
-
-if OS_WIN
-obs_SOURCES += platform-windows.cpp
-endif
-
-if OS_OSX
-obs_SOURCES += platform-osx.mm
-endif
-
-if OS_NIX
-obs_CPPFLAGS = $(AM_CPPFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS) $(XINERAMA_CFLAGS)
-obs_SOURCES += platform-x11.cpp
-obs_LDADD += $(GTK_LIBS) $(X11_LIBS) $(XINERAMA_LIBS)
-endif

+ 0 - 4
test/makefile.am

@@ -1,4 +0,0 @@
-SUBDIRS = test-input
-if OS_WIN
-SUBDIRS += win
-endif

+ 0 - 23
test/test-input/makefile.am

@@ -1,23 +0,0 @@
-AM_CFLAGS = -isystem$(top_srcdir)/libobs
-
-if OS_WIN
-if ARCH_X86
-libtestdir = ../../build/plugins/32bit
-else
-libtestdir = ../../build/plugins/64bit
-endif
-else
-libtestdir = $(libdir)/obs-plugins
-endif
-
-libtest_LTLIBRARIES = libtest-input.la
-
-libtest_input_la_LDFLAGS = -no-undefined
-if OS_WIN
-libtest_input_la_LDFLAGS += -avoid-version
-endif
-libtest_input_la_LIBADD = $(top_srcdir)/libobs/libobs.la
-libtest_input_la_SOURCES = test-filter.c \
-			   test-input.c \
-			   test-random.c \
-			   test-sinewave.c

+ 0 - 8
test/win/makefile.am

@@ -1,8 +0,0 @@
-INCLUDES = -isystem$(top_srcdir)/libobs
-AM_CPPFLAGS = -DUNICODE -D_UNICODE
-
-builddir = ../../build
-build_PROGRAMS = test
-test_LDADD = $(top_srcdir)/libobs/libobs.la
-test_LDFLAGS = -mwindows
-test_SOURCES = test.cpp