vlc | branch: master | Pierre Ynard <linkfa...@yahoo.fr> | Tue Sep 11 22:40:21 2012 +0200| [29c379038e57bd874e072b8acc481ec5df5da5b9] | committer: Pierre Ynard
Remove WinCE resources > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=29c379038e57bd874e072b8acc481ec5df5da5b9 --- share/Makefile.am | 6 -- share/newres.h | 35 ----------- share/resource.h | 31 ---------- share/vlc_wince_rc.rc | 156 ------------------------------------------------- 4 files changed, 228 deletions(-) diff --git a/share/Makefile.am b/share/Makefile.am index 0c6b76f..88972f4 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -39,7 +39,6 @@ endif EXTRA_DIST += \ $(skins2_default_vlt_FILES) \ - $(DIST_rsrc) \ $(DIST_skins2) \ $(DIST_icons) \ $(DIST_http_lua) \ @@ -67,11 +66,6 @@ osdmenu/default.cfg: osdmenu/default.cfg.in $(top_builddir)/config.status $(AM_V_GEN)mkdir -p osdmenu; \ sed -e 's,\@vlcdatadir\@,$(vlcdatadir),g' < "$<" > $@ -DIST_rsrc = \ - newres.h \ - resource.h \ - vlc_wince_rc.rc - DIST_icons = \ vlc48x48.ico \ vlc512x512.png diff --git a/share/newres.h b/share/newres.h deleted file mode 100644 index a80948a..0000000 --- a/share/newres.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef __NEWRES_H__ -#define __NEWRES_H__ - -#if defined(_WIN32_WCE) - #if !defined(WCEOLE_ENABLE_DIALOGEX) - #define DIALOGEX DIALOG DISCARDABLE - #endif - #include <commctrl.h> - #define SHMENUBAR RCDATA - #if defined(WIN32_PLATFORM_PSPC) && (_WIN32_WCE >= 300) - #include <aygshell.h> - #else - #define I_IMAGENONE (-2) - #define NOMENU 0xFFFF - #define IDS_SHNEW 1 - - #define IDM_SHAREDNEW 10 - #define IDM_SHAREDNEWDEFAULT 11 - #endif -#endif // _WIN32_WCE - - -#ifdef RC_INVOKED -#ifndef _INC_WINDOWS -#define _INC_WINDOWS - #include "winuser.h" // extract from windows header -#endif -#endif - -#ifdef IDC_STATIC -#undef IDC_STATIC -#endif -#define IDC_STATIC (-1) - -#endif //__NEWRES_H__ diff --git a/share/resource.h b/share/resource.h deleted file mode 100644 index 4765f24..0000000 --- a/share/resource.h +++ /dev/null @@ -1,31 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by vlc_wince_rc.rc -// -#define IDS_APP_TITLE 1 -#define IDS_HELLO 2 -#define IDC_NIOUP 3 -#define IDI_NIOUP 101 -#define IDM_MENU 102 -#define IDD_ABOUTBOX 103 -#define IDM_FILE_EXIT 40002 -#define IDM_HELP_ABOUT 40003 -#define IDM_PLOP 40004 -#define ID_VIEW_PLAYLIST 40005 -#define ID_VIEW_MESSAGES 40006 -#define ID_SETTINGS_AUDIO 40007 -#define ID_SETTINGS_SUBTITLES 40008 -#define ID_SETTINGS 40011 -#define ID_FILE_OPENFILE 40012 -#define ID_FILE_NETWORKSTREAM 40013 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 104 -#define _APS_NEXT_COMMAND_VALUE 40014 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/share/vlc_wince_rc.rc b/share/vlc_wince_rc.rc deleted file mode 100644 index 88eae8d..0000000 --- a/share/vlc_wince_rc.rc +++ /dev/null @@ -1,156 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "newres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_NIOUP ICON DISCARDABLE "vlc.ico" - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""newres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDM_MENU MENU DISCARDABLE -BEGIN - POPUP "&File" - BEGIN - MENUITEM "Open File...", ID_FILE_OPENFILE, GRAYED - MENUITEM "Network Stream...", ID_FILE_NETWORKSTREAM - , GRAYED - MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_FILE_EXIT - END - POPUP "View" - BEGIN - MENUITEM "Playlist...", ID_VIEW_PLAYLIST, GRAYED - MENUITEM "Messages...", ID_VIEW_MESSAGES, GRAYED - END - POPUP "Settings" - BEGIN - MENUITEM "Audio", ID_SETTINGS_AUDIO, GRAYED - MENUITEM "Subtitles", ID_SETTINGS_SUBTITLES - , GRAYED - MENUITEM SEPARATOR - MENUITEM "Preferences...", ID_SETTINGS, GRAYED - END - POPUP "&Help" - BEGIN - MENUITEM "&About...", IDM_HELP_ABOUT - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 127, 42 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -EXSTYLE 0x80000000L -CAPTION "About PocketVLC" -FONT 8, "System" -BEGIN - ICON IDI_NIOUP,IDC_STATIC,7,7,21,20 - LTEXT "VLC Version Tarass",IDC_STATIC,38,10,70,8,SS_NOPREFIX - LTEXT "Copyright (C) VideoLAN (Centrale Reseaux) and its contributors",IDC_STATIC,30,27,80,8 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_ABOUTBOX, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 120 - TOPMARGIN, 7 - BOTTOMMARGIN, 35 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -IDC_NIOUP ACCELERATORS DISCARDABLE -BEGIN - VK_F1, IDM_PLOP, VIRTKEY, NOINVERT - VK_F4, IDM_FILE_EXIT, VIRTKEY, ALT, NOINVERT - VK_F8, IDM_HELP_ABOUT, VIRTKEY, NOINVERT -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits