]>
Commit | Line | Data |
---|---|---|
3653621f ER |
1 | #--- ./Makefile~ 2005-09-25 22:02:58.000000000 +0300 |
2 | #+++ ./Makefile 2005-09-25 22:05:35.000000000 +0300 | |
3 | #@@ -240,11 +240,15 @@ | |
4 | # OBJS_MPLAYER += osdep/mplayer-rc.o | |
5 | # endif | |
6 | # | |
7 | #-$(PRG): $(MPLAYER_DEP) | |
8 | #+ | |
9 | #+libmplayer-common.so: | |
10 | #+ $(CC) $(CFLAGS) -o libmplayer-common.so -shared $(COMMON_LIBS) | |
11 | #+ | |
12 | #+$(PRG): $(MPLAYER_DEP) libmplayer-common.so | |
13 | # ifeq ($(TARGET_WIN32),yes) | |
14 | # windres -o osdep/mplayer-rc.o osdep/mplayer.rc | |
15 | # endif | |
16 | #- $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) | |
17 | #+ $(CC) $(CFLAGS) -o $(PRG) -L. -lmplayer-common $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) | |
18 | # | |
19 | # mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a | |
20 | # winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \ | |
21 | #@@ -258,8 +262,8 @@ | |
22 | # $(CC) $(CFLAGS) -shared -Wl,-Bsymbolic -o mplayer_wine.so mplayer_wine.spec.c $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) -lwine $(ARCH_LIB) $(MATH_LIB) | |
23 | # | |
24 | # ifeq ($(MENCODER),yes) | |
25 | #-$(PRG_MENCODER): $(MENCODER_DEP) | |
26 | #- $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) | |
27 | #+$(PRG_MENCODER): $(MENCODER_DEP) libmplayer-common.so | |
28 | #+ $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) -L. -lmplayer-common libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) | |
29 | # endif | |
30 | # | |
31 | # codecs.conf.h: $(PRG_CFG) etc/codecs.conf | |
32 | --- ./Makefile~ 2005-09-25 22:02:58.000000000 +0300 | |
33 | +++ ./Makefile 2005-09-25 22:06:48.000000000 +0300 | |
34 | @@ -240,11 +240,18 @@ | |
35 | OBJS_MPLAYER += osdep/mplayer-rc.o | |
36 | endif | |
37 | ||
38 | -$(PRG): $(MPLAYER_DEP) | |
39 | + | |
40 | +SHARED_VERSION = 0.0.0 | |
41 | +# libtool --mode=link $(CC) $(CFLAGS) -o $@ -shared $(COMMON_LIBS) -avoid-version -release $(SHARED_VERSION) | |
42 | + | |
43 | +libmplayer.la: | |
44 | + libtool --mode=link $(CC) $(CFLAGS) -o $@ -shared $(COMMON_LIBS) -avoid-version -release $(SHARED_VERSION) | |
45 | + | |
46 | +$(PRG): $(MPLAYER_DEP) libmplayer.la | |
47 | ifeq ($(TARGET_WIN32),yes) | |
48 | windres -o osdep/mplayer-rc.o osdep/mplayer.rc | |
49 | endif | |
50 | - $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) | |
51 | + libtool --mode=link $(CC) $(CFLAGS) -o $(PRG) libmplayer.la $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) | |
52 | ||
53 | mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a | |
54 | winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \ | |
55 | @@ -258,8 +265,8 @@ | |
56 | $(CC) $(CFLAGS) -shared -Wl,-Bsymbolic -o mplayer_wine.so mplayer_wine.spec.c $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) -lwine $(ARCH_LIB) $(MATH_LIB) | |
57 | ||
58 | ifeq ($(MENCODER),yes) | |
59 | -$(PRG_MENCODER): $(MENCODER_DEP) | |
60 | - $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) | |
61 | +$(PRG_MENCODER): $(MENCODER_DEP) libmplayer.la | |
62 | + libtool --mode=link $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmplayer.la libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) | |
63 | endif | |
64 | ||
65 | codecs.conf.h: $(PRG_CFG) etc/codecs.conf |