mirror of https://github.com/mpv-player/mpv
Move some more compiler flags to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24043 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
185bc3320f
commit
6f0da163dd
|
@ -7371,6 +7371,11 @@ if test "$_largefiles" = yes || freebsd ; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Make sure config.h gets included.
|
||||||
|
if test "$_dvdread_internal" = yes || test "$_faad_internal" = yes ; then
|
||||||
|
CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
|
||||||
|
fi
|
||||||
|
|
||||||
CFLAGS="-I. -I.. -I../libavutil $CFLAGS"
|
CFLAGS="-I. -I.. -I../libavutil $CFLAGS"
|
||||||
CXXFLAGS=" $CFLAGS -D__STDC_LIMIT_MACROS"
|
CXXFLAGS=" $CFLAGS -D__STDC_LIMIT_MACROS"
|
||||||
|
|
||||||
|
@ -7682,13 +7687,17 @@ $_def_fast_inttypes
|
||||||
|
|
||||||
/* libdvdcss */
|
/* libdvdcss */
|
||||||
#define HAVE_ERRNO_H 1
|
#define HAVE_ERRNO_H 1
|
||||||
|
|
||||||
|
/* libdvdcss + libdvdread */
|
||||||
#define HAVE_LIMITS_H 1
|
#define HAVE_LIMITS_H 1
|
||||||
|
|
||||||
/* libdvdcss + libfaad2 */
|
/* libdvdcss + libfaad2 */
|
||||||
#define HAVE_UNISTD_H 1
|
#define HAVE_UNISTD_H 1
|
||||||
|
|
||||||
/* libfaad2 */
|
/* libfaad2 + libdvdread */
|
||||||
#define STDC_HEADERS 1
|
#define STDC_HEADERS 1
|
||||||
|
|
||||||
|
/* libfaad2 */
|
||||||
#define HAVE_MEMCPY 1
|
#define HAVE_MEMCPY 1
|
||||||
#define HAVE_STRCHR 1
|
#define HAVE_STRCHR 1
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ SRCS_COMMON = dvd_input.c \
|
||||||
nav_read.c \
|
nav_read.c \
|
||||||
md5.c \
|
md5.c \
|
||||||
|
|
||||||
CFLAGS = -D__USE_UNIX98 -D_GNU_SOURCE -DSTDC_HEADERS -DHAVE_LIMITS_H
|
CFLAGS = -D__USE_UNIX98 -D_GNU_SOURCE
|
||||||
|
|
||||||
CFLAGS-$(DVDCSS_INTERNAL) += -I../libdvdcss -DHAVE_DVDCSS_DVDCSS_H
|
CFLAGS-$(DVDCSS_INTERNAL) += -I../libdvdcss -DHAVE_DVDCSS_DVDCSS_H
|
||||||
|
|
||||||
|
|
|
@ -35,13 +35,15 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include "../config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Allow build on Cygwin*/
|
/* Allow build on Cygwin*/
|
||||||
#if defined(__CYGWIN__)
|
#if defined(__CYGWIN__)
|
||||||
#define __STRICT_ANSI__
|
#define __STRICT_ANSI__
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "../config.h"
|
|
||||||
|
|
||||||
#define INLINE __inline
|
#define INLINE __inline
|
||||||
#if 0 //defined(_WIN32) && !defined(_WIN32_WCE)
|
#if 0 //defined(_WIN32) && !defined(_WIN32_WCE)
|
||||||
#define ALIGN __declspec(align(16))
|
#define ALIGN __declspec(align(16))
|
||||||
|
|
|
@ -33,19 +33,17 @@
|
||||||
**/
|
**/
|
||||||
|
|
||||||
#ifndef __COMMON_H__
|
#ifndef __COMMON_H__
|
||||||
@@ -32,10 +35,13 @@
|
@@ -32,8 +35,13 @@
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
-# include "../config.h"
|
# include "../config.h"
|
||||||
|
#endif
|
||||||
|
+
|
||||||
+/* Allow build on Cygwin*/
|
+/* Allow build on Cygwin*/
|
||||||
+#if defined(__CYGWIN__)
|
+#if defined(__CYGWIN__)
|
||||||
+#define __STRICT_ANSI__
|
+#define __STRICT_ANSI__
|
||||||
#endif
|
+#endif
|
||||||
|
|
||||||
+#include "../config.h"
|
|
||||||
+
|
|
||||||
#define INLINE __inline
|
#define INLINE __inline
|
||||||
#if 0 //defined(_WIN32) && !defined(_WIN32_WCE)
|
#if 0 //defined(_WIN32) && !defined(_WIN32_WCE)
|
||||||
#define ALIGN __declspec(align(16))
|
#define ALIGN __declspec(align(16))
|
||||||
|
|
Loading…
Reference in New Issue