From d5e7478d0936c70701177645e3b06c8446ba9262 Mon Sep 17 00:00:00 2001 From: havoc Date: Thu, 2 Sep 2004 13:46:30 +0000 Subject: [PATCH] now uses de-we's darkplaces icon in mingw builds, and has proper file info on the exe's properties dialog git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4419 d7cf8633-e32d-0410-b094-e92efae38249 --- darkplaces.rc | 97 +++++++++++++-------------------------------------- makefile.inc | 5 ++- 2 files changed, 29 insertions(+), 73 deletions(-) diff --git a/darkplaces.rc b/darkplaces.rc index 12241b9f..fe2c6b9e 100644 --- a/darkplaces.rc +++ b/darkplaces.rc @@ -1,72 +1,25 @@ -//Microsoft Developer Studio 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 DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -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_ICON1 ICON DISCARDABLE "darkplaces.ico" -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +#include // include for version info constants + +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "darkplaces.ico" + +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILETYPE VFT_APP +{ + BLOCK "StringFileInfo" + { + BLOCK "040904E4" + { + VALUE "CompanyName", "Forest Hale Digital Services" + VALUE "FileVersion", "1.0" + VALUE "FileDescription", "DarkPlaces Game Engine" + VALUE "InternalName", "darkplaces.exe" + VALUE "LegalCopyright", "id Software, Forest Hale, and contributors" + VALUE "LegalTrademarks", "" + VALUE "OriginalFilename", "darkplaces.exe" + VALUE "ProductName", "DarkPlaces" + VALUE "ProductVersion", "1.0" + } + } +} diff --git a/makefile.inc b/makefile.inc index 4b00184a..d0cf6b4b 100644 --- a/makefile.inc +++ b/makefile.inc @@ -193,7 +193,7 @@ OBJ_WINCD=cd_win.o #if you want no CD audio #OBJ_WINCD=$(OBJ_NOCD) -OBJ_WGL= builddate.c sys_win.o vid_wgl.o conproc.o $(OBJ_WINSOUND) $(OBJ_WINCD) $(OBJ_COMMON) +OBJ_WGL= builddate.c darkplaces.o sys_win.o vid_wgl.o conproc.o $(OBJ_WINSOUND) $(OBJ_WINCD) $(OBJ_COMMON) # Link LDFLAGS_WINCOMMON=-lwinmm -lwsock32 @@ -308,6 +308,9 @@ vid_sdl.o: vid_sdl.c sys_sdl.o: sys_sdl.c $(DO_CC) `sdl-config --cflags` +darkplaces.o: %.o : %.rc + windres -o $@ $< + .c.o: $(DO_CC) -- 2.39.2