From c380a91361db381747339a02e808e1b6850f7ce2 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Thu, 16 Jul 2020 12:25:51 +0200 Subject: [PATCH] Windows: add icon to sudoku.exe (PR #36) The changes proposed by Tadej Panjtar (tpanj) were obsolete WRT current Git repo. Thanks to tpanj anyway, I did also apply the simplifications of sudoku.rc. --- test/CMakeLists.txt | 2 +- test/sudoku.rc | 75 ++++++++------------------------------------- test/sudokurc.h | 16 ---------- 3 files changed, 13 insertions(+), 80 deletions(-) delete mode 100644 test/sudokurc.h diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index df5903cd0..bd8123fcd 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -100,7 +100,7 @@ CREATE_EXAMPLE (resizebox resizebox.cxx fltk) CREATE_EXAMPLE (rotated_text rotated_text.cxx fltk) CREATE_EXAMPLE (scroll scroll.cxx fltk) CREATE_EXAMPLE (subwindow subwindow.cxx fltk) -CREATE_EXAMPLE (sudoku "sudoku.cxx;sudoku.icns" "fltk_images;fltk;${AUDIOLIBS}") +CREATE_EXAMPLE (sudoku "sudoku.cxx;sudoku.icns;sudoku.rc" "fltk_images;fltk;${AUDIOLIBS}") CREATE_EXAMPLE (symbols symbols.cxx fltk) CREATE_EXAMPLE (tabs tabs.fl fltk) CREATE_EXAMPLE (table table.cxx fltk) diff --git a/test/sudoku.rc b/test/sudoku.rc index 36fb10d18..76c772e4f 100644 --- a/test/sudoku.rc +++ b/test/sudoku.rc @@ -1,72 +1,21 @@ -//Microsoft Developer Studio generated resource script. // -#include "sudokurc.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// +// Resource script for Sudoku game using the Fast Light Tool Kit (FLTK). // -// Generated from the TEXTINCLUDE 2 resource. +// Copyright 1998-2020 by Bill Spitzak and others. // -//#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 -///////////////////////////////////////////////////////////////////////////// +// This library is free software. Distribution and use rights are outlined in +// the file "COPYING" which should have been included with this file. If this +// file is missing or damaged, see the license at: // -// TEXTINCLUDE +// https://www.fltk.org/COPYING.php +// +// Please see the following page on how to report bugs and issues: +// +// https://www.fltk.org/bugs.php // -1 TEXTINCLUDE DISCARDABLE -BEGIN - "icons.h\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// // -// Icon +// Icon for executable // -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON ICON DISCARDABLE "sudoku.ico" -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +IDI_ICON ICON DISCARDABLE "sudoku.ico" diff --git a/test/sudokurc.h b/test/sudokurc.h deleted file mode 100644 index ce22927e8..000000000 --- a/test/sudokurc.h +++ /dev/null @@ -1,16 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by icons.rc -// -#define IDI_ICON 101 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 105 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif