# HG changeset patch
# User tron
# Date 1134286609 0
# Node ID a85da8a7fac8ba93f5770dc5714378993705b52c
# Parent 65d4de069014d7c99e312595724b76d281083f64
(svn r3287) Turn the winres.o: openttd.rc special case into a normal %.o: %.rc rule
diff -r 65d4de069014 -r a85da8a7fac8 Makefile
--- a/Makefile Sat Dec 10 23:03:59 2005 +0000
+++ b/Makefile Sun Dec 11 07:36:49 2005 +0000
@@ -774,8 +774,7 @@
endif
ifdef WIN32
- # Resource file
- OBJS += winres.o
+ SRCS += ottdres.rc
endif
ifdef WITH_DIRECTMUSIC
@@ -854,10 +853,6 @@
@echo '===> Compiling language $(*F)'
$(Q)$(STRGEN) $(STRGEN_FLAGS) $< $(LANG_ERRORS) || rm -f $@
-winres.o: openttd.rc
- @echo '===> Compiling resource $<'
- $(Q)$(WINDRES) -o $@ $<
-
ifdef MORPHOS
release: all
$(Q)rm -fr "/t/openttd-$(RELEASE)-morphos.lha"
@@ -1024,6 +1019,10 @@
@echo '===> Compiling $<'
$(Q)$(CC) $(CFLAGS) $(CDEFS) -c -o $@ $<
+%.o: %.rc
+ @echo '===> Compiling resource $<'
+ $(Q)$(WINDRES) -o $@ $<
+
info:
@echo 'CFLAGS = $(CFLAGS)'
diff -r 65d4de069014 -r a85da8a7fac8 openttd.dsp
--- a/openttd.dsp Sat Dec 10 23:03:59 2005 +0000
+++ b/openttd.dsp Sun Dec 11 07:36:49 2005 +0000
@@ -327,7 +327,7 @@
# End Source File
# Begin Source File
-SOURCE=.\openttd.rc
+SOURCE=.\ottdres.rc
# End Source File
# Begin Source File
diff -r 65d4de069014 -r a85da8a7fac8 openttd.rc
--- a/openttd.rc Sat Dec 10 23:03:59 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "resource.h"
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include "windows.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral (Default) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-100 ICON DISCARDABLE "openttd.ico"
-101 ICON DISCARDABLE "mainicon.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-100 DIALOG DISCARDABLE 0, 0, 305, 70
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Fatal Application Failure"
-FONT 8, "MS Sans Serif"
-BEGIN
- PUSHBUTTON "&Close",12,7,49,50,14
- PUSHBUTTON "&Submit report",14,81,49,68,14,WS_DISABLED
- PUSHBUTTON "&Emergency save",13,155,49,68,14
- PUSHBUTTON "",15,243,49,55,14,WS_DISABLED
- EDITTEXT 11,7,70,291,118,ES_MULTILINE | ES_READONLY | WS_VSCROLL |
- WS_HSCROLL | NOT WS_TABSTOP
- LTEXT "",10,36,7,262,34
- ICON 100,IDC_STATIC,9,9,20,20
-END
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,4,0,1
- PRODUCTVERSION 0,4,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "000004b0"
- BEGIN
- VALUE "Comments", "This program is licensed under the GNU General Public License.\0"
- VALUE "CompanyName", "OpenTTD Development Team\0"
- VALUE "FileDescription", "OpenTTD\0"
- VALUE "FileVersion", "0.4.0.1\0"
- VALUE "InternalName", "openttd\0"
- VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2005. All Rights Reserved.\0"
- VALUE "LegalTrademarks", "\0"
- VALUE "OriginalFilename", "openttd.exe\0"
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "OpenTTD\0"
- VALUE "ProductVersion", "0.0.0.0\0"
- VALUE "SpecialBuild", "-\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x0, 1200
- END
-END
-
-#endif // !_MAC
-
-#endif // Neutral (Default) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Swedish resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE)
-#ifdef _WIN32
-LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
- "resrc1.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE
-BEGIN
- "#include ""resource.h""\r\n"
- "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
- "#include ""windows.h""\r\n"
- "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
- "#include ""winres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-#endif // Swedish resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
diff -r 65d4de069014 -r a85da8a7fac8 openttd.vcproj
--- a/openttd.vcproj Sat Dec 10 23:03:59 2005 +0000
+++ b/openttd.vcproj Sun Dec 11 07:36:49 2005 +0000
@@ -291,7 +291,7 @@
RelativePath=".\openttd.c">
+ RelativePath=".\ottdres.rc">
diff -r 65d4de069014 -r a85da8a7fac8 ottdres.rc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ottdres.rc Sun Dec 11 07:36:49 2005 +0000
@@ -0,0 +1,158 @@
+//Microsoft Developer Studio generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "resource.h"
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral (Default) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD)
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+100 ICON DISCARDABLE "openttd.ico"
+101 ICON DISCARDABLE "mainicon.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+100 DIALOG DISCARDABLE 0, 0, 305, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Fatal Application Failure"
+FONT 8, "MS Sans Serif"
+BEGIN
+ PUSHBUTTON "&Close",12,7,49,50,14
+ PUSHBUTTON "&Submit report",14,81,49,68,14,WS_DISABLED
+ PUSHBUTTON "&Emergency save",13,155,49,68,14
+ PUSHBUTTON "",15,243,49,55,14,WS_DISABLED
+ EDITTEXT 11,7,70,291,118,ES_MULTILINE | ES_READONLY | WS_VSCROLL |
+ WS_HSCROLL | NOT WS_TABSTOP
+ LTEXT "",10,36,7,262,34
+ ICON 100,IDC_STATIC,9,9,20,20
+END
+
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,4,0,1
+ PRODUCTVERSION 0,4,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "000004b0"
+ BEGIN
+ VALUE "Comments", "This program is licensed under the GNU General Public License.\0"
+ VALUE "CompanyName", "OpenTTD Development Team\0"
+ VALUE "FileDescription", "OpenTTD\0"
+ VALUE "FileVersion", "0.4.0.1\0"
+ VALUE "InternalName", "openttd\0"
+ VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2005. All Rights Reserved.\0"
+ VALUE "LegalTrademarks", "\0"
+ VALUE "OriginalFilename", "openttd.exe\0"
+ VALUE "PrivateBuild", "\0"
+ VALUE "ProductName", "OpenTTD\0"
+ VALUE "ProductVersion", "0.0.0.0\0"
+ VALUE "SpecialBuild", "-\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0, 1200
+ END
+END
+
+#endif // !_MAC
+
+#endif // Neutral (Default) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Swedish resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE)
+#ifdef _WIN32
+LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "resrc1.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "#include ""resource.h""\r\n"
+ "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
+ "#include ""windows.h""\r\n"
+ "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+ "#include ""winres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#endif // Swedish resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+