github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

OPTFLAGS already includes EXTRA_INC. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19042 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-07-12 17:58:07 +00:00
parent 72d1a2042f
commit f7d4dd174b
19 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gui/Makefile
View File

@ -2,7 +2,7 @@ include ../config.mak
LIBNAME = libgui.a
INCDIR = -I. -I.. -I../loader -I./wm -I./skin $(FREETYPE_INC) $(GTKINC) $(EXTRA_INC)
INCDIR = -I. -I.. -I../loader -I./wm -I./skin $(FREETYPE_INC) $(GTKINC)
CFLAGS = $(OPTFLAGS) $(INCDIR) $(DEBUG)

2
Makefile
View File

@ -40,7 +40,6 @@ SRCS_COMMON = asxparser.c \
SRCS_MENCODER = mencoder.c \
mp_msg-mencoder.c \
$(SRCS_COMMON) \
divx4_vbr.c \
libvo/aclib.c \
libvo/font_load.c \
libvo/osd.c \
@ -129,7 +128,6 @@ CFLAGS = $(OPTFLAGS) -I. \
$(CACA_INC) \
$(CDPARANOIA_INC) \
$(DVB_INC) \
$(EXTRA_INC) \
$(FONTCONFIG_INC) \
$(FREETYPE_INC) \
$(FRIBIDI_INC) \

2
TOOLS/netstream/Makefile
View File

@ -3,7 +3,7 @@ MPROOT=../..
include $(MPROOT)/config.mak
INCLUDE = -I$(MPROOT) -I$(MPROOT)/loader $(EXTRA_INC)
INCLUDE = -I$(MPROOT) -I$(MPROOT)/loader
CFLAGS = $(OPTFLAGS) $(INCLUDE)
.SUFFIXES: .c .cpp .o

2
input/Makefile
View File

@ -6,7 +6,7 @@ LIBNAME = libinput.a
SRCS=input.c joystick.c lirc.c
OBJS=$(SRCS:.c=.o)
CFLAGS = $(OPTFLAGS) -I. -I.. $(EXTRA_INC)
CFLAGS = $(OPTFLAGS) -I. -I..
.SUFFIXES: .c .o

2
libaf/Makefile
View File

@ -43,7 +43,7 @@ endif
OBJS=$(SRCS:.c=.o)
CFLAGS = $(OPTFLAGS) -I. -I.. $(LIBAV_INC) $(EXTRA_INC) -D_GNU_SOURCE
CFLAGS = $(OPTFLAGS) -I. -I.. $(LIBAV_INC) -D_GNU_SOURCE
ifeq ($(TARGET_OS),MINGW32)
CFLAGS += -D_IO_H_

1
libao2/Makefile
View File

@ -15,7 +15,6 @@ CFLAGS = $(OPTFLAGS) -I. -I.. \
$(DVB_INC) \
$(DXR2_INC) \
$(ESD_INC) \
$(EXTRA_INC) \
$(JACK_INC) \
$(OPENAL_INC) \
$(POLYP_INC) \

1
libass/Makefile
View File

@ -12,7 +12,6 @@ OBJS=$(SRCS:.c=.o)
CFLAGS = $(OPTFLAGS) \
-I. -I.. \
-I../libmpcodecs \
$(EXTRA_INC) \
-D_GNU_SOURCE \
$(FREETYPE_INC) \
$(FONTCONFIG_INC) \

2
libmenu/Makefile
View File

@ -19,7 +19,7 @@ EXTRA_INC += $(DVB_INC)
endif
OBJS=$(SRCS:.c=.o)
CFLAGS = $(OPTFLAGS) -I. -I.. -I../libmpcodecs $(EXTRA_INC)
CFLAGS = $(OPTFLAGS) -I. -I.. -I../libmpcodecs
.SUFFIXES: .c .o

1
libmpcodecs/Makefile
View File

@ -331,7 +331,6 @@ CFLAGS = $(OPTFLAGS) \
-I../libmpdemux \
-I../loader \
$(LIBAV_INC) \
$(EXTRA_INC) \
$(X264_INC) \
$(XVID_INC) \
-D_GNU_SOURCE \

2
libmpdemux/Makefile
View File

@ -206,7 +206,7 @@ endif
OBJS = $(SRCS:.c=.o)
OBJS += $(CPLUSPLUSSRCS:.cpp=.o)
INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)
INCLUDE = -I.. -I../loader $(CSS_INC) $(LIBAV_INC)
CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS
CPLUSPLUS = $(CC)

2
libmpdvdkit2/Makefile
View File

@ -34,7 +34,7 @@ endif
# \ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
# -funroll-loops removed, triggered gcc 3.0.4 (3.x?) bug
CFLAGS= -I. $(OPTFLAGS) $(EXTRA_INC)\
CFLAGS= -I. $(OPTFLAGS) \
-DSYS_LINUX -D__USE_UNIX98 -D_REENTRANT -D_GNU_SOURCE \
-DHAVE_DVDCSS_DVDCSS_H -DSTDC_HEADERS -DHAVE_LIMITS_H \
-DHAVE_ERRNO_H -DHAVE_INTTYPES_H -DHAVE_UNISTD_H \

2
libmpeg2/Makefile
View File

@ -13,7 +13,7 @@ SRCS = alloc.c \
slice.c \
OBJS = $(SRCS:.c=.o)
INCLUDE = -I. -I../libvo -I.. $(EXTRA_INC)
INCLUDE = -I. -I../libvo -I..
CFLAGS = $(OPTFLAGS) $(INCLUDE) -DMPG12PLAY
ifeq ($(TARGET_ARCH_X86),yes)

1
libvo/Makefile
View File

@ -41,7 +41,6 @@ CFLAGS = $(OPTFLAGS) -I. -I.. -I../osdep \
$(FREETYPE_INC) \
$(SDL_INC) \
$(X11_INC) \
$(EXTRA_INC) \
$(DXR2_INC) \
$(DIRECTFB_INC) \
-DMPG12PLAY \

2
loader/Makefile
View File

@ -21,7 +21,7 @@ endif
# Note: -D_FILE_OFFSET_BITS=32 is required to disable using mmap64(),
# as it's broken in glibc 2.1.2 (bad header) and 2.1.3 (bad code)
WARN_FLAGS =
CFLAGS=-I. -I.. $(OPTFLAGS) -U_FILE_OFFSET_BITS $(EXTRA_INC) $(WARN_FLAGS) -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
CFLAGS=-I. -I.. $(OPTFLAGS) -U_FILE_OFFSET_BITS $(WARN_FLAGS) -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
#CFLAGS=-I. -I.. -O $(WARN_FLAGS) -g #-fno-omit-frame-pointer
all: libloader.a

2
loader/dmo/Makefile
View File

@ -12,7 +12,7 @@ SRCS = DMO_AudioDecoder.c \
OBJS = $(SRCS:.c=.o)
INCLUDE = -I. -I../dshow -I.. $(EXTRA_INC)
INCLUDE = -I. -I../dshow -I..
CFLAGS = $(OPTFLAGS) $(INCLUDE) -DNOAVIFILE_HEADERS
.SUFFIXES: .c .o

2
loader/dshow/Makefile
View File

@ -17,7 +17,7 @@ OBJS = $(SRCS:.c=.o)
# OBJS = DS_AudioDec.o DS_VideoDec.o DS_Filter.o allocator.o cmediasample.o guids.o inputpin.o outputpin.o
INCLUDE = -I. -I.. $(EXTRA_INC) -DNOAVIFILE_HEADERS
INCLUDE = -I. -I.. -DNOAVIFILE_HEADERS
CFLAGS = $(OPTFLAGS) $(INCLUDE)
.SUFFIXES: .c .o

2
mp3lib/Makefile
View File

@ -7,7 +7,7 @@ OBJS = sr1.o
ifeq ($(TARGET_ARCH_SGI_MIPS),yes)
OPTFLAGS := $(OPTFLAGS:-O4=-O0)
endif
CFLAGS = -I.. $(OPTFLAGS) $(EXTRA_INC)
CFLAGS = -I.. $(OPTFLAGS)
ifeq ($(TARGET_ARCH_X86),yes)
SRCS += decode_i586.c
OBJS += decode_i586.o

2
osdep/Makefile
View File

@ -35,7 +35,7 @@ SRCS += $(getch)
OBJS=$(SRCS:.c=.o)
CFLAGS = $(OPTFLAGS) -I. -I.. $(EXTRA_INC)
CFLAGS = $(OPTFLAGS) -I. -I..
# -I/usr/X11R6/include/
.SUFFIXES: .c .o

2
tremor/Makefile
View File

@ -19,7 +19,7 @@ SRCS = bitwise.c \
window.c \
OBJS = $(SRCS:.c=.o)
INCLUDE = -I. -I.. $(EXTRA_INC)
INCLUDE = -I. -I..
CFLAGS = $(OPTFLAGS) $(INCLUDE) $(TREMOR_FLAGS)
.SUFFIXES: .c .o