[MPlayer-cvslog] r22808 - trunk/Makefile
diego
subversion at mplayerhq.hu
Sat Mar 24 17:27:25 CET 2007
Author: diego
Date: Sat Mar 24 17:27:25 2007
New Revision: 22808
Modified:
trunk/Makefile
Log:
Move the addition of osdep/mplayer-rc.o to a place where it actually gets added to OBJS_MPLAYER.
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sat Mar 24 17:27:25 2007
@@ -114,6 +114,9 @@ PARTS-$(GUI) += Gui
LIBS_MPLAYER-$(LIBMENU) += libmenu/libmenu.a
PARTS-$(LIBMENU) += libmenu
+# Having this in libosdep.a is not enough.
+OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
+
ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
@@ -128,9 +131,6 @@ OBJS_COMMON = $(SRCS_COMMON:.c=.o)
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
-# Having this in libosdep.a is not enough.
-OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
-
COMMON_LIBS += osdep/libosdep.a
MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(LIBS_MPLAYER) $(COMMON_LIBS)
More information about the MPlayer-cvslog
mailing list