summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-07 21:46:06 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-07 21:46:06 +0000
commitaf76be6e197382af491fadef3fcf821a721c99f5 (patch)
tree1b4d8a031c21897c8dca9850d0feaf28dc12222e /Makefile
parent2be57955c5be98511d56193cc98174752e516f6a (diff)
downloadmpv-af76be6e197382af491fadef3fcf821a721c99f5.tar.bz2
mpv-af76be6e197382af491fadef3fcf821a721c99f5.tar.xz
Add separate variables for CFLAGS that are specific to internal libraries
and only add them to CFLAGS when compiling objects from those libraries. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27436 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9f5224e158..23dc7fcfe1 100644
--- a/Makefile
+++ b/Makefile
@@ -783,8 +783,8 @@ mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplay
$(DEPS): help_mp.h
dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
-libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\"
-libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H
+libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS)
+libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED)
loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER)
#loader/%.o loader/%.d: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
@@ -792,6 +792,8 @@ loader/win32.o loader/win32.d: CFLAGS += $(CFLAGS_STACKREALIGN)
mp3lib/decode_i586.o: CFLAGS += -fomit-frame-pointer
+tremor/%.o tremor/%.d: CFLAGS += $(CFLAGS_TREMOR_LOW)
+
vidix/%: CFLAGS += $(CFLAGS_DHAHELPER) $(CFLAGS_SVGALIB_HELPER)
VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \