kolan
/
gkrellm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- win32: remove unneeded resource files, gkrellm and gkrellmd now have separate ones 

- change locale path on win32 to ./share/locale
This commit is contained in:
Stefan Gehn 2008-02-01 20:39:28 +00:00
parent 1cdd02d10b
commit 8a7f42a251
3 changed files with 6 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -189,13 +189,13 @@ install_solaris: install_gkrellm.pc
install_windows: install_windows:
(${MAKE} INSTALL=/bin/install install_gkrellm.pc) (${MAKE} INSTALL=/bin/install install_gkrellm.pc)
(cd po && ${MAKE} \ (cd po && ${MAKE} \
INSTALL=/bin/install INSTALLDIR=$(INSTALLROOT) LOCALEDIR=$(INSTALLROOT)/locale \ INSTALL=/bin/install INSTALLDIR=$(INSTALLROOT) LOCALEDIR=$(INSTALLROOT)/share/locale \
install) install)
(cd src && ${MAKE} \ (cd src && ${MAKE} \
INSTALL=/bin/install INSTALLDIR=$(INSTALLROOT) LOCALEDIR=$(INSTALLROOT)/locale \ INSTALL=/bin/install INSTALLDIR=$(INSTALLROOT) LOCALEDIR=$(INSTALLROOT)/share/locale \
install_windows) install_windows)
(cd server && ${MAKE} \ (cd server && ${MAKE} \
INSTALL=/bin/install SINSTALLDIR=$(INSTALLROOT) LOCALEDIR=$(INSTALLROOT)/locale \ INSTALL=/bin/install SINSTALLDIR=$(INSTALLROOT) LOCALEDIR=$(INSTALLROOT)/share/locale \
install_windows) install_windows)
clean: clean:
@ -301,9 +301,9 @@ gtop1.0: gkrellm.pc
(cd server && ${MAKE} gkrellmd ) (cd server && ${MAKE} gkrellmd )
windows: gkrellm.pc_win windows: gkrellm.pc_win
(cd po && ${MAKE} LOCALEDIR="locale" all) (cd po && ${MAKE} LOCALEDIR="share/locale" all)
(cd src && ${MAKE} LOCALEDIR="locale" windows ) (cd src && ${MAKE} LOCALEDIR="share/locale" windows )
(cd server && ${MAKE} LOCALEDIR="locale" windows) (cd server && ${MAKE} LOCALEDIR="share/locale" windows)
msgmerge: msgmerge:
(cd po && ${MAKE} messages) (cd po && ${MAKE} messages)

16
resource.h
View File

@ -1,16 +0,0 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by resource.rc
//
#define IDI_ICON3 105
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 106
#define _APS_NEXT_COMMAND_VALUE 40005
#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

72
resource.rc
View File

@ -1,72 +0,0 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.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
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_ICON3 ICON "gkrellm.ico"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED