# HG changeset patch # User diego # Date 1088191277 0 # Node ID e93facc2c02010d56552143800e3ecde540b62ca # Parent ce6ab8cb8597b2238235b7b3dfceef71936ba28b mplayer.rc moved to osdep where it belongs, approved by Sascha. diff -r ce6ab8cb8597 -r e93facc2c020 Makefile --- a/Makefile Fri Jun 25 19:02:53 2004 +0000 +++ b/Makefile Fri Jun 25 19:21:17 2004 +0000 @@ -204,12 +204,12 @@ endif ifeq ($(TARGET_WIN32),yes) -OBJS_MPLAYER += mplayer-rc.o +OBJS_MPLAYER += osdep/mplayer-rc.o endif $(PRG): $(MPLAYER_DEP) ifeq ($(TARGET_WIN32),yes) - windres -o mplayer-rc.o mplayer.rc + windres -o osdep/mplayer-rc.o osdep/mplayer.rc endif $(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) -lm diff -r ce6ab8cb8597 -r e93facc2c020 mplayer.rc --- a/mplayer.rc Fri Jun 25 19:02:53 2004 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -/*Windows resource file for MPlayer - compile with - windres -o resfile.o mplayer.rc - and add resfile.o to OBJS_MPLAYER in Makefile*/ - -#include -#include "version.h" - -1 VERSIONINFO -FILEVERSION 0,0,9,0 -PRODUCTVERSION 0,0,9,0 -FILEOS VOS__WINDOWS32 -FILETYPE VFT_APP -{ - BLOCK "StringFileInfo" - { - BLOCK "000004b0" // LANG_NEUTRAL,UNICODE_CP - { - VALUE "Comments","MPlayer is distributed under the terms of the GNU General Public License Version 2. Sourcecode is available at http://www.mplayerhq.hu\000" - VALUE "CompanyName", "\000" - VALUE "FileDescription", "MPlayer - Movie Player\000" - VALUE "FileVersion",VERSION - VALUE "InternalName", "Counter Counter\000" - VALUE "LegalCopyright", " (C) 2000-2004 MPlayer Team\000" - //VALUE "LegalTrademarks"," \000"; - VALUE "OriginalFilename", "mplayer.exe\000" - VALUE "ProductName", "MPlayer - The Movie Player\000" - VALUE "ProductVersion",VERSION - //VALUE "SpecialBuild","\000" - } - } - BLOCK "VarFileInfo" - { - VALUE "Translation",0,0x04b0 - } -} - -IDI_ICON1 ICON DISCARDABLE "etc/mplayer.ico" -