summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--mplayer.rc39
2 files changed, 2 insertions, 41 deletions
diff --git a/Makefile b/Makefile
index 20104bf3d2..4caa61242d 100644
--- a/Makefile
+++ b/Makefile
@@ -204,12 +204,12 @@ VIDIX_LIBS =
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 --git a/mplayer.rc b/mplayer.rc
deleted file mode 100644
index 796f00177b..0000000000
--- a/mplayer.rc
+++ /dev/null
@@ -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 <winver.h>
-#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"
-