summaryrefslogtreecommitdiffstats
path: root/loader
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-06 11:40:49 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-06 11:40:49 +0000
commit444ec084df588746449ef680aa4b4777c7fa5397 (patch)
tree71f547f4afbb823081f67e267b7bd7ee760990ee /loader
parent744aba2ae0b1984257836be97521be0fbb9f8b41 (diff)
downloadmpv-444ec084df588746449ef680aa4b4777c7fa5397.tar.bz2
mpv-444ec084df588746449ef680aa4b4777c7fa5397.tar.xz
Add proper compilation rules for qtx/list and qtx/qtxload and remove silly
compilation shell script. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25614 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader')
-rw-r--r--loader/Makefile13
-rwxr-xr-xloader/qtx/c.sh2
2 files changed, 11 insertions, 4 deletions
diff --git a/loader/Makefile b/loader/Makefile
index a09f073501..9cdade84f6 100644
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -35,8 +35,17 @@ include ../mpcommon.mak
CFLAGS+=-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
-dshow/test: dshow/test.c $(LIBNAME_COMMON) ../cpudetect.o ../get_path.o ../mp_msg.o ../mp_fifo.o ../osdep/libosdep.a
- $(CC) $(CFLAGS) -o $@ $^ -ltermcap -ldl -lm -lpthread -g -lstdc++
+TEST_OBJS = $(LIBNAME_COMMON) ../cpudetect.o ../mp_msg.o ../mp_fifo.o ../osdep/libosdep.a
+TEST_LDFLAGS = -ltermcap -ldl -lm -lpthread -g
+
+dshow/test: dshow/test.c ../get_path.o $(TEST_OBJS)
+ $(CC) $(CFLAGS) -o $@ $^ $(TEST_LDFLAGS) -lstdc++
+
+qtx/qtxload: qtx/qtxload.c $(TEST_OBJS)
+ $(CC) -o $@ $^ $(TEST_LDFLAGS)
+
+qtx/list: qtx/list.c $(TEST_OBJS)
+ $(CC) -o $@ $^ $(TEST_LDFLAGS)
clean::
rm -f dshow/*.o dshow/*.a dshow/*~
diff --git a/loader/qtx/c.sh b/loader/qtx/c.sh
deleted file mode 100755
index f8d36f62ab..0000000000
--- a/loader/qtx/c.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-
-gcc qtxload.c ../libloader.a ../../cpudetect.o ../../mp_msg-mencoder.o -ldl -lm -lpthread -g