Commit MetaInfo

Revision992cc97a1df0155ba768eded8ca27de6f5a78f40 (tree)
Zeit2022-01-03 01:07:00
AutorSHIRAKATA Kentaro <argrath@ub32...>
CommiterSHIRAKATA Kentaro

Log Message

fix #43519

Ändern Zusammenfassung

Diff

--- a/ChangeLog.j
+++ b/ChangeLog.j
@@ -1,3 +1,6 @@
1+ * 次の問題を修正
2+ * unix系でビルド・プレイできない (#43519)
3+
14 Sat Jan 1 2022 SHIRAKATA Kentaro <argrath@ub32.org>
25
36 * 次の問題を修正
--- a/util/makedefs.c
+++ b/util/makedefs.c
@@ -1559,33 +1559,16 @@ build_savebones_compat_string()
15591559 #ifdef VERSION_COMPATIBILITY
15601560 unsigned long uver = VERSION_COMPATIBILITY;
15611561 #endif
1562-#if 0 /*JP*/
15631562 Strcpy(save_bones_compat_buf,
15641563 "save and bones files accepted from version");
1565-#else
1566- Strcpy(save_bones_compat_buf,
1567- "使えるセーブと骨ファイルはバージョン");
1568-#endif
15691564 #ifdef VERSION_COMPATIBILITY
1570-#if 0 /*JP*/
15711565 Sprintf(eos(save_bones_compat_buf), "s %lu.%lu.%lu through %d.%d.%d",
15721566 ((uver & 0xFF000000L) >> 24), ((uver & 0x00FF0000L) >> 16),
15731567 ((uver & 0x0000FF00L) >> 8), VERSION_MAJOR, VERSION_MINOR,
15741568 PATCHLEVEL);
15751569 #else
1576- Sprintf(eos(save_bones_compat_buf), "%lu.%lu.%luから%d.%d.%d",
1577- ((uver & 0xFF000000L) >> 24), ((uver & 0x00FF0000L) >> 16),
1578- ((uver & 0x0000FF00L) >> 8), VERSION_MAJOR, VERSION_MINOR,
1579- PATCHLEVEL);
1580-#endif
1581-#else
1582-#if 0 /*JP*/
15831570 Sprintf(eos(save_bones_compat_buf), " %d.%d.%d only", VERSION_MAJOR,
15841571 VERSION_MINOR, PATCHLEVEL);
1585-#else
1586- Sprintf(eos(save_bones_compat_buf), "%d.%d.%dのみ", VERSION_MAJOR,
1587- VERSION_MINOR, PATCHLEVEL);
1588-#endif
15891572 #endif
15901573 }
15911574
@@ -1597,17 +1580,11 @@ static const char *build_opts[] = {
15971580 "ANSI default terminal",
15981581 #endif
15991582 #ifdef TEXTCOLOR
1600-/*JP
16011583 "color",
1602-*/
1603- "カラー",
16041584 #endif
16051585 #ifdef TTY_GRAPHICS
16061586 #ifdef TTY_TILES_ESCCODES
1607-/*JP
16081587 "console escape codes for tile hinting",
1609-*/
1610- "タイルのヒントのためのコンソールエスケープコード",
16111588 #endif
16121589 #endif
16131590 #ifdef COM_COMPL
@@ -1624,28 +1601,16 @@ static const char *build_opts[] = {
16241601 #endif
16251602 #ifdef DLB
16261603 #ifndef VERSION_IN_DLB_FILENAME
1627-/*JP
16281604 "data librarian",
1629-*/
1630- "データファイル",
16311605 #else
1632-/*JP
16331606 "data librarian with a version-dependent name",
1634-*/
1635- "バージョン依存ファイル名が付いたデータファイル",
16361607 #endif
16371608 #endif
16381609 #ifdef DUMPLOG
1639-/*JP
16401610 "end-of-game dumplogs",
1641-*/
1642- "ゲーム終了時データダンプ",
16431611 #endif
16441612 #ifdef HOLD_LOCKFILE_OPEN
1645-/*JP
16461613 "exclusive lock on level 0 file",
1647-*/
1648- "レベル0ファイルでの排他ロック",
16491614 #endif
16501615 #if defined(MSGHANDLER) && (defined(POSIX_TYPES) || defined(__GNUC__))
16511616 "external program as a message handler",
@@ -1654,28 +1619,16 @@ static const char *build_opts[] = {
16541619 "floppy drive support",
16551620 #endif
16561621 #ifdef INSURANCE
1657-/*JP
16581622 "insurance files for recovering from crashes",
1659-*/
1660- "クラッシュからの復旧のための保険ファイル",
16611623 #endif
16621624 #ifdef LOGFILE
1663-/*JP
16641625 "log file",
1665-*/
1666- "ログファイル",
16671626 #endif
16681627 #ifdef XLOGFILE
1669-/*JP
16701628 "extended log file",
1671-*/
1672- "拡張ログファイル",
16731629 #endif
16741630 #ifdef PANICLOG
1675-/*JP
16761631 "errors and warnings log file",
1677-*/
1678- "エラーと警告のログファイル",
16791632 #endif
16801633 #ifdef MAIL
16811634 "mail daemon",
@@ -1684,10 +1637,7 @@ static const char *build_opts[] = {
16841637 "MSDOS protected mode",
16851638 #endif
16861639 #ifdef NEWS
1687-/*JP
16881640 "news file",
1689-*/
1690- "ニュースファイル",
16911641 #endif
16921642 #ifdef OVERLAY
16931643 #ifdef MOVERLAY
@@ -1701,116 +1651,62 @@ static const char *build_opts[] = {
17011651 #endif
17021652 #endif
17031653 /* pattern matching method will be substituted by nethack at run time */
1704-/*JP
17051654 "pattern matching via :PATMATCH:",
1706-*/
1707- ":PATMATCH:によるパターンマッチング",
17081655 #ifdef USE_ISAAC64
1709-/*JP
17101656 "pseudo random numbers generated by ISAAC64",
1711-*/
1712- "ISAAC64による疑似乱数",
17131657 #ifdef DEV_RANDOM
17141658 #ifdef NHSTDC
17151659 /* include which specific one */
1716-/*JP
17171660 "strong PRNG seed available from " DEV_RANDOM,
1718-*/
1719- DEV_RANDOM "による強力な疑似乱数の種",
17201661 #else
1721-/*JP
17221662 "strong PRNG seed available from DEV_RANDOM",
1723-*/
1724- "DEV_RANDOMによる強力な疑似乱数の種",
17251663 #endif
17261664 #else
17271665 #ifdef WIN32
1728-/*JP
17291666 "strong PRNG seed available from CNG BCryptGenRandom()",
1730-*/
1731- "CNG BCryptGenRandom()による強力な疑似乱数の種",
17321667 #endif
17331668 #endif /* DEV_RANDOM */
17341669 #else /* ISAAC64 */
17351670 #ifdef RANDOM
1736-/*JP
17371671 "pseudo random numbers generated by random()",
1738-*/
1739- "random()による疑似乱数",
17401672 #else
1741-/*JP
17421673 "pseudo random numbers generated by C rand()",
1743-*/
1744- "C rand()による疑似乱数",
17451674 #endif
17461675 #endif
17471676 #ifdef SELECTSAVED
1748-/*JP
17491677 "restore saved games via menu",
1750-*/
1751- "セーブデータのメニュー選択",
17521678 #endif
17531679 #ifdef SCORE_ON_BOTL
1754-/*JP
17551680 "score on status line",
1756-*/
1757- "ステータス行のスコア表示",
17581681 #endif
17591682 #ifdef CLIPPING
1760-/*JP
17611683 "screen clipping",
1762-*/
1763- "画面のクリッピング",
17641684 #endif
17651685 #ifdef NO_TERMS
17661686 #ifdef MAC
1767-/*JP
17681687 "screen control via mactty",
1769-*/
1770- "macttyによる画面制御",
17711688 #endif
17721689 #ifdef SCREEN_BIOS
1773-/*JP
17741690 "screen control via BIOS",
1775-*/
1776- "BIOSによる画面制御",
17771691 #endif
17781692 #ifdef SCREEN_DJGPPFAST
1779-/*JP
17801693 "screen control via DJGPP fast",
1781-*/
1782- "DJGPP fastによる画面制御",
17831694 #endif
17841695 #ifdef SCREEN_VGA
1785-/*JP
17861696 "screen control via VGA graphics",
1787-*/
1788- "VGAグラフィックによる画面制御",
17891697 #endif
17901698 #ifdef WIN32CON
1791-/*JP
17921699 "screen control via WIN32 console I/O",
1793-*/
1794- "WIN32コンソールI/Oによる画面制御",
17951700 #endif
17961701 #endif
17971702 #ifdef SHELL
17981703 "shell command",
17991704 #endif
1800-/*JP
18011705 "traditional status display",
1802-*/
1803- "伝統的なステータス表示",
18041706 #ifdef STATUS_HILITES
1805-/*JP
18061707 "status via windowport with highlighting",
1807-*/
1808- "ハイライト付きのウィンドウによるステータス",
18091708 #else
1810-/*JP
18111709 "status via windowport without highlighting",
1812-*/
1813- "ハイライトなしのウィンドウによるステータス",
18141710 #endif
18151711 #ifdef SUSPEND
18161712 "suspend command",
@@ -1838,10 +1734,7 @@ static const char *build_opts[] = {
18381734 "timed wait for display effects",
18391735 #endif
18401736 #ifdef USER_SOUNDS
1841-/*JP
18421737 "user sounds",
1843-*/
1844- "サウンド",
18451738 #endif
18461739 #ifdef PREFIXES_IN_USE
18471740 "variable playground",
@@ -1856,16 +1749,10 @@ static const char *build_opts[] = {
18561749 "run-length compression of map in save files",
18571750 #endif
18581751 #ifdef SYSCF
1859-/*JP
18601752 "system configuration at run-time",
1861-*/
1862- "実行時設定ファイル",
18631753 #endif
18641754 save_bones_compat_buf,
1865-/*JP
18661755 "and basic NetHack features"
1867-*/
1868- "JNetHack基本機能"
18691756 };
18701757
18711758 struct win_info {
@@ -1885,18 +1772,12 @@ static struct win_info window_opts[] = {
18851772 #else
18861773 /* assume that one or more of IBMgraphics, DECgraphics, or MACgraphics
18871774 can be enabled; we can't tell from here whether that is accurate */
1888-/*JP
18891775 "traditional text with optional line-drawing"
1890-*/
1891- "伝統的なテキスト表示"
18921776 #endif
18931777 },
18941778 #endif
18951779 #ifdef CURSES_GRAPHICS
1896-/*JP
18971780 { "curses", "terminal-based graphics" },
1898-*/
1899- { "curses", "端末ベースグラフィック" },
19001781 #endif
19011782 #ifdef X11_GRAPHICS
19021783 { "X11", "X11" },
@@ -2029,10 +1910,7 @@ do_options()
20291910 #endif
20301911 );
20311912
2032-/*JP
20331913 Fprintf(ofp, "\nOptions compiled into this edition:\n");
2034-*/
2035- Fprintf(ofp, "\nコンパイル時オプション:\n");
20361914 length = COLNO + 1; /* force 1st item onto new line */
20371915 for (i = 0; i < SIZE(build_opts); i++) {
20381916 opt_out_words(strcat(strcpy(buf, build_opts[i]),
@@ -2042,12 +1920,8 @@ do_options()
20421920 Fprintf(ofp, "\n"); /* terminate last line of words */
20431921
20441922 winsyscnt = SIZE(window_opts) - 1;
2045-#if 0 /*JP:T*/
20461923 Fprintf(ofp, "\nSupported windowing system%s:\n",
20471924 (winsyscnt > 1) ? "s" : "");
2048-#else
2049- Fprintf(ofp, "\n対応ウィンドウシステム:\n");
2050-#endif
20511925 length = COLNO + 1; /* force 1st item onto new line */
20521926 for (i = 0; i < winsyscnt; i++) {
20531927 Sprintf(buf, "\"%s\"", window_opts[i].id);
@@ -2058,25 +1932,14 @@ do_options()
20581932 * 2 : foo and bar (note no period; comes from 'with default' below)
20591933 * 3+: for, bar, and quux
20601934 */
2061-#if 0 /*JP*/
20621935 opt_out_words(strcat(buf, (winsyscnt == 1) ? "." /* no 'default' */
20631936 : (winsyscnt == 2 && i == 0) ? " and"
20641937 : (i == winsyscnt - 2) ? ", and"
20651938 : ","),
20661939 &length);
2067-#else
2068- opt_out_words(strcat(buf, (winsyscnt == 1) ? "." /* no 'default' */
2069- : (winsyscnt == 2 && i == 0) ? ", "
2070- : (i == winsyscnt - 2) ? ", "
2071- : ","),
2072- &length);
2073-#endif
20741940 }
20751941 if (winsyscnt > 1) {
2076-/*JP
20771942 Sprintf(buf, "with a default of \"%s\".", DEFAULT_WINDOW_SYS);
2078-*/
2079- Sprintf(buf, "デフォルトは\"%s\".", DEFAULT_WINDOW_SYS);
20801943 opt_out_words(buf, &length);
20811944 }
20821945 Fprintf(ofp, "\n"); /* terminate last line of words */
Show on old repository browser