summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlucabe <lucabe@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-10 12:35:52 +0000
committerlucabe <lucabe@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-10 12:35:52 +0000
commit1e56d3bf137d5b4863976f366f054225536faabe (patch)
tree83f82c31725f351e5b9ab2260116f8a1e35377e8
parentc0fc839f3a03d6d39f724fa82ad474b33fcdfda1 (diff)
downloadmpv-1e56d3bf137d5b4863976f366f054225536faabe.tar.bz2
mpv-1e56d3bf137d5b4863976f366f054225536faabe.tar.xz
make libswscale build system similar to the libav* one
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18994 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile2
-rw-r--r--libswscale/Makefile56
2 files changed, 14 insertions, 44 deletions
diff --git a/Makefile b/Makefile
index 2e5aec7174..1429b856e7 100644
--- a/Makefile
+++ b/Makefile
@@ -313,7 +313,7 @@ libavformat/libavformat.a:
$(MAKE) -C libavformat LIBPREF=lib LIBSUF=.a
libswscale/libswscale.a:
- $(MAKE) -C libswscale
+ $(MAKE) -C libswscale LIBPREF=lib LIBSUF=.a
libmpeg2/libmpeg2.a:
$(MAKE) -C libmpeg2
diff --git a/libswscale/Makefile b/libswscale/Makefile
index 475bd31381..62aebc9a01 100644
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -1,52 +1,22 @@
include ../config.mak
-SWSLIB = libswscale.a
-
-SWSSRCS=swscale.c rgb2rgb.c yuv2rgb.c
+NAME=swscale
+ifeq ($(BUILD_SHARED),yes)
+LIBVERSION=$(SWSVERSION)
+LIBMAJOR=$(SWSMAJOR)
+endif
-SWSOBJS=$(SWSSRCS:.c=.o)
+# NOTE: -I.. is needed to include config.h
+CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
+ -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+ -D_GNU_SOURCE
+OBJS= swscale.o rgb2rgb.o yuv2rgb.o
ifeq ($(TARGET_ALTIVEC),yes)
-SWSOBJS += yuv2rgb_altivec.o
+OBJS+= yuv2rgb_altivec.o
endif
-CFLAGS = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
-# -I/usr/X11R6/include/
-
-.SUFFIXES: .c .o
-
-# .PHONY: all clean
-
-.c.o:
- $(CC) -c $(CFLAGS) -I.. -o $@ $<
-
-all: $(SWSLIB)
-
-$(SWSLIB): $(SWSOBJS)
- $(AR) r $(SWSLIB) $(SWSOBJS)
- $(RANLIB) $(SWSLIB)
-
-clean:
- rm -f *.o *.a *~ *.so cs_test swscale-example
-
-distclean: clean
- rm -f .depend
-
-dep: depend
-
-depend:
- $(CC) -MM $(CFLAGS) $(SWSSRCS) 1>.depend
-
-cs_test: cs_test.o $(SWSLIB)
- $(CC) cs_test.o $(SWSLIB) ../cpudetect.o -DFOR_MENCODER ../mp_msg.c -o cs_test -W -Wall
-
-swscale-example: swscale-example.o $(SWSLIB)
- $(CC) swscale-example.o $(SWSLIB) ../libmpcodecs/img_format.o -lm -o swscale-example -W -Wall
-#
-# include dependency files if they exist
-#
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+HEADERS = swscale.h rgb2rgb.h
+include $(SRC_PATH)/common.mak