mirror of
https://github.com/mpv-player/mpv
synced 2024-12-25 16:33:02 +00:00
Unify include paths in the build system, part I.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19195 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
51a2db3628
commit
22b5b6d0f5
@ -2,7 +2,7 @@ include ../config.mak
|
|||||||
|
|
||||||
LIBNAME = libgui.a
|
LIBNAME = libgui.a
|
||||||
|
|
||||||
INCDIR = -I. -I.. -I../loader -I./wm -I./skin $(FREETYPE_INC) $(GTK_INC)
|
INCDIR = -I. -I.. -I../loader -I./wm -I./skin
|
||||||
|
|
||||||
CFLAGS = $(OPTFLAGS) $(INCDIR) -DDEBUG
|
CFLAGS = $(OPTFLAGS) $(INCDIR) -DDEBUG
|
||||||
|
|
||||||
|
13
Makefile
13
Makefile
@ -121,18 +121,7 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
|
|||||||
$(FRIBIDI_LIB) \
|
$(FRIBIDI_LIB) \
|
||||||
$(ENCA_LIB) \
|
$(ENCA_LIB) \
|
||||||
|
|
||||||
CFLAGS = $(OPTFLAGS) -I. \
|
CFLAGS = $(OPTFLAGS) -I. $(LIBAV_INC)
|
||||||
$(CACA_INC) \
|
|
||||||
$(CDPARANOIA_INC) \
|
|
||||||
$(DVB_INC) \
|
|
||||||
$(FONTCONFIG_INC) \
|
|
||||||
$(FREETYPE_INC) \
|
|
||||||
$(FRIBIDI_INC) \
|
|
||||||
$(SDL_INC) \
|
|
||||||
$(X11_INC) \
|
|
||||||
$(XVID_INC) \
|
|
||||||
$(LIBAV_INC) \
|
|
||||||
$(LIBCDIO_INC) \
|
|
||||||
|
|
||||||
#CFLAGS += -Wall
|
#CFLAGS += -Wall
|
||||||
|
|
||||||
|
24
configure
vendored
24
configure
vendored
@ -7338,7 +7338,10 @@ AWK = $_awk
|
|||||||
RANLIB = $_ranlib
|
RANLIB = $_ranlib
|
||||||
INSTALL = $_install
|
INSTALL = $_install
|
||||||
# FIXME: Should only be $_inc_extra, time to get rid of all --with-fooincdir.
|
# FIXME: Should only be $_inc_extra, time to get rid of all --with-fooincdir.
|
||||||
EXTRA_INC = $_inc_extra $_inc_libdts $_inc_mlib
|
EXTRA_INC = $_inc_extra $_inc_libdts $_inc_mlib $_inc_x11 $_inc_dxr2 $_inc_dvb \
|
||||||
|
$_inc_caca $_inc_arts $_inc_esd $_inc_polyp $_inc_jack $_inc_openal\
|
||||||
|
$_inc_sdl $_inc_xvid $_inc_x264 $_inc_directfb $_inc_cdparanoia \
|
||||||
|
$_inc_freetype $_inc_fontconfig $_inc_fribidi $_inc_libcdio $_inc_gtk
|
||||||
OPTFLAGS = -I../libvo -I../../libvo $_inc_x11 $CFLAGS \$(EXTRA_INC)
|
OPTFLAGS = -I../libvo -I../../libvo $_inc_x11 $CFLAGS \$(EXTRA_INC)
|
||||||
STRIPBINARIES = $_stripbinaries
|
STRIPBINARIES = $_stripbinaries
|
||||||
CHARSET = $_charset
|
CHARSET = $_charset
|
||||||
@ -7388,7 +7391,6 @@ HAVE_PTHREADS = $_pthreads
|
|||||||
MATH_LIB = $_ld_lm
|
MATH_LIB = $_ld_lm
|
||||||
LIBC_LIB = $_ld_libC
|
LIBC_LIB = $_ld_libC
|
||||||
|
|
||||||
X11_INC = $_inc_x11
|
|
||||||
X11DIR = $_ld_x11
|
X11DIR = $_ld_x11
|
||||||
|
|
||||||
HAVE_XVMC_ACCEL = $_xvmc
|
HAVE_XVMC_ACCEL = $_xvmc
|
||||||
@ -7403,8 +7405,6 @@ LIB=\$(LIBPREF)\$(NAME)\$(LIBSUF)
|
|||||||
X_LIB = $_ld_gl $_ld_dga $_ld_xv $_ld_xvmc $_ld_vm $_ld_xinerama $_ld_x11 $_ld_sock
|
X_LIB = $_ld_gl $_ld_dga $_ld_xv $_ld_xvmc $_ld_vm $_ld_xinerama $_ld_x11 $_ld_sock
|
||||||
GGI_LIB = $_ld_ggi
|
GGI_LIB = $_ld_ggi
|
||||||
MLIB_LIB = $_ld_mlib
|
MLIB_LIB = $_ld_mlib
|
||||||
DXR2_INC = $_inc_dxr2
|
|
||||||
DVB_INC = $_inc_dvb
|
|
||||||
PNG_LIB = $_ld_png
|
PNG_LIB = $_ld_png
|
||||||
JPEG_LIB = $_ld_jpeg
|
JPEG_LIB = $_ld_jpeg
|
||||||
GIF_LIB = $_ld_gif
|
GIF_LIB = $_ld_gif
|
||||||
@ -7412,7 +7412,6 @@ SDL_LIB = $_ld_sdl
|
|||||||
SVGA_LIB = $_ld_svga
|
SVGA_LIB = $_ld_svga
|
||||||
VESA_LIB = $_ld_vesa
|
VESA_LIB = $_ld_vesa
|
||||||
AA_LIB = $_ld_aa
|
AA_LIB = $_ld_aa
|
||||||
CACA_INC = $_inc_caca
|
|
||||||
CACA_LIB = $_ld_caca
|
CACA_LIB = $_ld_caca
|
||||||
|
|
||||||
# audio output
|
# audio output
|
||||||
@ -7424,15 +7423,10 @@ ALSA1X = $_alsa1x
|
|||||||
ALSA_LIB = $_ld_alsa
|
ALSA_LIB = $_ld_alsa
|
||||||
NAS_LIB = $_ld_nas
|
NAS_LIB = $_ld_nas
|
||||||
ARTS_LIB = $_ld_arts
|
ARTS_LIB = $_ld_arts
|
||||||
ARTS_INC = $_inc_arts
|
|
||||||
ESD_LIB = $_ld_esd
|
ESD_LIB = $_ld_esd
|
||||||
ESD_INC = $_inc_esd
|
|
||||||
POLYP_LIB = $_ld_polyp
|
POLYP_LIB = $_ld_polyp
|
||||||
POLYP_INC = $_inc_polyp
|
|
||||||
JACK_LIB = $_ld_jack
|
JACK_LIB = $_ld_jack
|
||||||
JACK_INC = $_inc_jack
|
|
||||||
OPENAL_LIB = $_ld_openal
|
OPENAL_LIB = $_ld_openal
|
||||||
OPENAL_INC = $_inc_openal
|
|
||||||
SGIAUDIO_LIB = $_ld_sgiaudio
|
SGIAUDIO_LIB = $_ld_sgiaudio
|
||||||
|
|
||||||
# input/demuxer/codecs
|
# input/demuxer/codecs
|
||||||
@ -7452,7 +7446,6 @@ DVDREAD_LIB = $_ld_dvdread
|
|||||||
DVDKIT2 = $_mpdvdkit
|
DVDKIT2 = $_mpdvdkit
|
||||||
DVDNAV = $_dvdnav
|
DVDNAV = $_dvdnav
|
||||||
DVDNAV_LIB = $_ld_dvdnav
|
DVDNAV_LIB = $_ld_dvdnav
|
||||||
SDL_INC = $_inc_sdl
|
|
||||||
WIN32DLL = $_win32
|
WIN32DLL = $_win32
|
||||||
W32_DEP = $_dep_win32
|
W32_DEP = $_dep_win32
|
||||||
W32_LIB = $_ld_win32
|
W32_LIB = $_ld_win32
|
||||||
@ -7476,30 +7469,22 @@ LIBDV = $_libdv
|
|||||||
ARCH_LIB = $_ld_arch $_ld_iconv
|
ARCH_LIB = $_ld_arch $_ld_iconv
|
||||||
XVID = $_xvid
|
XVID = $_xvid
|
||||||
XVID4 = $_xvid4
|
XVID4 = $_xvid4
|
||||||
XVID_INC = $_inc_xvid
|
|
||||||
XVID_LIB = $_ld_xvid
|
XVID_LIB = $_ld_xvid
|
||||||
X264 = $_x264
|
X264 = $_x264
|
||||||
X264_INC = $_inc_x264
|
|
||||||
X264_LIB = $_ld_x264
|
X264_LIB = $_ld_x264
|
||||||
CONFIG_DTS = $_libdts
|
CONFIG_DTS = $_libdts
|
||||||
DTS_LIB = $_ld_libdts
|
DTS_LIB = $_ld_libdts
|
||||||
DECORE_LIB = $_ld_mp3lame
|
DECORE_LIB = $_ld_mp3lame
|
||||||
MENCODER = $_mencoder
|
MENCODER = $_mencoder
|
||||||
ENCORE_LIB = $_ld_mp3lame
|
ENCORE_LIB = $_ld_mp3lame
|
||||||
DIRECTFB_INC = $_inc_directfb
|
|
||||||
DIRECTFB_LIB = $_ld_directfb
|
DIRECTFB_LIB = $_ld_directfb
|
||||||
CDDA = $_cdda
|
CDDA = $_cdda
|
||||||
CDPARANOIA_INC = $_inc_cdparanoia
|
|
||||||
CDPARANOIA_LIB = $_ld_cdparanoia
|
CDPARANOIA_LIB = $_ld_cdparanoia
|
||||||
FREETYPE = $_freetype
|
FREETYPE = $_freetype
|
||||||
FREETYPE_INC = $_inc_freetype
|
|
||||||
FREETYPE_LIB = $_ld_freetype
|
FREETYPE_LIB = $_ld_freetype
|
||||||
FONTCONFIG_INC = $_inc_fontconfig
|
|
||||||
FONTCONFIG_LIB = $_ld_fontconfig
|
FONTCONFIG_LIB = $_ld_fontconfig
|
||||||
CONFIG_ASS = $_ass
|
CONFIG_ASS = $_ass
|
||||||
FRIBIDI_INC = $_inc_fribidi
|
|
||||||
FRIBIDI_LIB = $_ld_fribidi
|
FRIBIDI_LIB = $_ld_fribidi
|
||||||
LIBCDIO_INC = $_inc_libcdio
|
|
||||||
LIBCDIO_LIB = $_ld_libcdio
|
LIBCDIO_LIB = $_ld_libcdio
|
||||||
LIBLZO_LIB= $_ld_liblzo
|
LIBLZO_LIB= $_ld_liblzo
|
||||||
LIBMAD = $_mad
|
LIBMAD = $_mad
|
||||||
@ -7559,7 +7544,6 @@ TARGET_BUILTIN_VECTOR = $_builtin_vector
|
|||||||
TARGET_BUILTIN_3DNOW = $_mm3dnow
|
TARGET_BUILTIN_3DNOW = $_mm3dnow
|
||||||
|
|
||||||
# --- GUI stuff ---
|
# --- GUI stuff ---
|
||||||
GTK_INC = $_inc_gtk
|
|
||||||
GTKLIB = $_ld_gtk
|
GTKLIB = $_ld_gtk
|
||||||
GLIBLIB = $_ld_glib
|
GLIBLIB = $_ld_glib
|
||||||
GTK_LIBS = $_ld_static \$(GTKLIB) \$(GLIBLIB)
|
GTK_LIBS = $_ld_static \$(GTKLIB) \$(GLIBLIB)
|
||||||
|
@ -10,16 +10,7 @@ SRCS=audio_out.c \
|
|||||||
|
|
||||||
OBJS=$(SRCS:.c=.o)
|
OBJS=$(SRCS:.c=.o)
|
||||||
|
|
||||||
CFLAGS = $(OPTFLAGS) -I. -I.. \
|
CFLAGS = $(OPTFLAGS) -I. -I..
|
||||||
$(ARTS_INC) \
|
|
||||||
$(DVB_INC) \
|
|
||||||
$(DXR2_INC) \
|
|
||||||
$(ESD_INC) \
|
|
||||||
$(JACK_INC) \
|
|
||||||
$(OPENAL_INC) \
|
|
||||||
$(POLYP_INC) \
|
|
||||||
$(SDL_INC) \
|
|
||||||
$(X11_INC) \
|
|
||||||
|
|
||||||
.SUFFIXES: .c .o
|
.SUFFIXES: .c .o
|
||||||
|
|
||||||
|
@ -13,8 +13,6 @@ CFLAGS = $(OPTFLAGS) \
|
|||||||
-I. -I.. \
|
-I. -I.. \
|
||||||
-I../libmpcodecs \
|
-I../libmpcodecs \
|
||||||
-D_GNU_SOURCE \
|
-D_GNU_SOURCE \
|
||||||
$(FREETYPE_INC) \
|
|
||||||
$(FONTCONFIG_INC) \
|
|
||||||
|
|
||||||
.SUFFIXES: .c .o
|
.SUFFIXES: .c .o
|
||||||
|
|
||||||
|
@ -15,11 +15,10 @@ SRCS= menu.c \
|
|||||||
|
|
||||||
ifeq ($(DVBIN),yes)
|
ifeq ($(DVBIN),yes)
|
||||||
SRCS += menu_dvbin.c
|
SRCS += menu_dvbin.c
|
||||||
EXTRA_INC += $(DVB_INC)
|
|
||||||
endif
|
endif
|
||||||
OBJS=$(SRCS:.c=.o)
|
OBJS=$(SRCS:.c=.o)
|
||||||
|
|
||||||
CFLAGS = $(OPTFLAGS) -I. -I.. -I../libmpcodecs $(FREETYPE_INC)
|
CFLAGS = $(OPTFLAGS) -I. -I.. -I../libmpcodecs
|
||||||
|
|
||||||
.SUFFIXES: .c .o
|
.SUFFIXES: .c .o
|
||||||
|
|
||||||
|
@ -323,8 +323,6 @@ CFLAGS = $(OPTFLAGS) \
|
|||||||
-I../libmpdemux \
|
-I../libmpdemux \
|
||||||
-I../loader \
|
-I../loader \
|
||||||
$(LIBAV_INC) \
|
$(LIBAV_INC) \
|
||||||
$(X264_INC) \
|
|
||||||
$(XVID_INC) \
|
|
||||||
-D_GNU_SOURCE \
|
-D_GNU_SOURCE \
|
||||||
|
|
||||||
.SUFFIXES: .c .o
|
.SUFFIXES: .c .o
|
||||||
|
@ -208,7 +208,7 @@ endif
|
|||||||
OBJS = $(SRCS:.c=.o)
|
OBJS = $(SRCS:.c=.o)
|
||||||
OBJS += $(CPLUSPLUSSRCS:.cpp=.o)
|
OBJS += $(CPLUSPLUSSRCS:.cpp=.o)
|
||||||
INCLUDE = -I.. -I../loader $(LIBAV_INC)
|
INCLUDE = -I.. -I../loader $(LIBAV_INC)
|
||||||
CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
|
CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS)
|
||||||
CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS
|
CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS
|
||||||
CPLUSPLUS = $(CC)
|
CPLUSPLUS = $(CC)
|
||||||
|
|
||||||
|
@ -38,11 +38,6 @@ endif
|
|||||||
|
|
||||||
CFLAGS = $(OPTFLAGS) -I. -I.. -I../osdep \
|
CFLAGS = $(OPTFLAGS) -I. -I.. -I../osdep \
|
||||||
$(LIBAV_INC) \
|
$(LIBAV_INC) \
|
||||||
$(FREETYPE_INC) \
|
|
||||||
$(SDL_INC) \
|
|
||||||
$(X11_INC) \
|
|
||||||
$(DXR2_INC) \
|
|
||||||
$(DIRECTFB_INC) \
|
|
||||||
-DMPG12PLAY \
|
-DMPG12PLAY \
|
||||||
|
|
||||||
#CFLAGS += -Wall
|
#CFLAGS += -Wall
|
||||||
@ -61,9 +56,6 @@ $(LIBNAME): $(OBJS)
|
|||||||
$(AR) r $(LIBNAME) $(OBJS)
|
$(AR) r $(LIBNAME) $(OBJS)
|
||||||
$(RANLIB) $(LIBNAME)
|
$(RANLIB) $(LIBNAME)
|
||||||
|
|
||||||
vo_mpegpes.o: vo_mpegpes.c
|
|
||||||
$(CC) -c $(CFLAGS) $(DVB_INC) -o $@ $<
|
|
||||||
|
|
||||||
all: $(LIBNAME)
|
all: $(LIBNAME)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
Loading…
Reference in New Issue
Block a user