OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

htdocs: Commit


Commit MetaInfo

Revision1859114777c3c573a1187b10b6bb03190a2d2d99 (tree)
Time2017-01-21 03:24:25
AuthorSHIRAKATA Kentaro <argrath@ub32...>
CommiterSHIRAKATA Kentaro

Log Message

patch for building with MinGW

Change Summary

Incremental Difference

--- /dev/null
+++ b/patch/Makefile.gcc.patch
@@ -0,0 +1,113 @@
1+diff -urN jnethack-3.6.0-0.6_souecepart/sys/winnt/Makefile.gcc jnethack-3.6.0-0.6_souecepart+/sys/winnt/Makefile.gcc
2+--- jnethack-3.6.0-0.6_souecepart/sys/winnt/Makefile.gcc Mon Jun 22 13:58:42 2015
3++++ jnethack-3.6.0-0.6_souecepart+/sys/winnt/Makefile.gcc Tue Jul 26 21:50:40 2016
4+@@ -41,10 +41,10 @@
5+ #
6+
7+ # 64 bit
8+-#TARGET_CPU=x64
9++TARGET_CPU=x64
10+ #
11+ # 32 bit
12+-TARGET_CPU=x86
13++#TARGET_CPU=x86
14+ #
15+ #---------------------------------------------------------------
16+ # 2. Where do you want the game to be built (which folder)?
17+@@ -97,6 +97,8 @@
18+ MSWIN = ../win/win32
19+ # Tile support files
20+ WSHR = ../win/share
21++# JP
22++JP = ../japanese
23+
24+ #
25+ # Object directory.
26+@@ -173,7 +175,7 @@
27+ # Setting up the compiler and linker
28+ # macros. All builds include the base ones.
29+ #==========================================
30+-cflags = -mms-bitfields
31++cflags = -mms-bitfields -finput-charset=CP932 -fexec-charset=CP932
32+ lflags =
33+ ifeq "$(DEBUGINFO)" "Y"
34+ cdebug = -g
35+@@ -282,9 +284,9 @@
36+ VOBJ10 = $(O)mail.o $(O)makemon.o $(O)mapglyph.o $(O)mcastu.o
37+ VOBJ11 = $(O)mhitm.o $(O)mhitu.o $(O)minion.o $(O)mklev.o
38+ VOBJ12 = $(O)mkmap.o $(O)mkmaze.o $(O)mkobj.o $(O)mkroom.o
39+-VOBJ13 = $(O)mon.o $(O)mondata.o $(O)monmove.o $(O)monst.o
40++VOBJ13 = $(O)mon.o $(O)mondata.o $(O)monmove.o $(O)monstj.o
41+ VOBJ14 = $(O)monstr.o $(O)mplayer.o $(O)mthrowu.o $(O)muse.o
42+-VOBJ15 = $(O)music.o $(O)o_init.o $(O)objects.o $(O)objnam.o
43++VOBJ15 = $(O)music.o $(O)o_init.o $(O)objectsj.o $(O)objnam.o
44+ VOBJ16 = $(O)options.o $(O)pager.o $(O)pickup.o $(O)pline.o
45+ VOBJ17 = $(O)polyself.o $(O)potion.o $(O)pray.o $(O)priest.o
46+ VOBJ18 = $(O)quest.o $(O)questpgr.o $(RANDOM) $(O)read.o
47+@@ -300,6 +302,8 @@
48+
49+ DLBOBJ = $(O)dlb.o
50+
51++JOBJ = $(O)jconj.o $(O)jlib.o
52++
53+ REGEX = $(O)cppregex.o
54+
55+ TTYOBJ = $(O)topl.o $(O)getline.o $(O)wintty.o
56+@@ -312,7 +316,7 @@
57+ $(VOBJ11) $(VOBJ12) $(VOBJ13) $(VOBJ14) $(VOBJ15) \
58+ $(VOBJ16) $(VOBJ17) $(VOBJ18) $(VOBJ19) $(VOBJ20) \
59+ $(VOBJ21) $(VOBJ22) $(VOBJ23) $(VOBJ24) $(VOBJ25) \
60+- $(VOBJ26) $(VOBJ27) $(REGEX)
61++ $(VOBJ26) $(VOBJ27) $(JOBJ) $(REGEX)
62+
63+ GUIOBJ = $(O)mhaskyn.o $(O)mhdlg.o \
64+ $(O)mhfont.o $(O)mhinput.o $(O)mhmain.o $(O)mhmap.o \
65+@@ -443,6 +447,13 @@
66+ $(cc) $(CFLAGS) -o$@ $<
67+
68+ #==========================================
69++# Rules for files in japanese
70++#==========================================
71++
72++$(OBJ)/%.o : $(JP)/%.c
73++ $(cc) $(CFLAGS) -o$@ $<
74++
75++#==========================================
76+ # Rules for files in win/win32
77+ #==========================================
78+
79+@@ -1086,7 +1097,6 @@
80+ $(O)ntsound.o: $(HACK_H) $(MSWSYS)/ntsound.c
81+ $(cc) $(CFLAGS) -o$@ $(MSWSYS)/ntsound.c
82+
83+-
84+ #if you aren't linking in the full gui then
85+ #include the following stub for proper linkage.
86+
87+@@ -1109,6 +1119,17 @@
88+ $(cc) $(CFLAGS) -o$@ $(U)panic.c
89+
90+ #
91++# Japanese translation
92++#
93++
94++$(O)jconj.o: ../japanese/jconj.c $(HACK_H)
95++ $(cc) $(CFLAGS) -o$@ ../japanese/jconj.c
96++$(O)jlib.o: ../japanese/jlib.c $(HACK_H)
97++ $(cc) $(CFLAGS) -o$@ ../japanese/jlib.c
98++#$(O)jtrns.o: ../japanese/jtrns.c $(HACK_H) ../include/jdata.h
99++# $(cc) $(CFLAGS) -o$@ ../japanese/jtrns.c
100++
101++#
102+ # The rest are stolen from sys/unix/Makefile.src,
103+ # with the following changes:
104+ # * ../include changed to $(INCL)
105+@@ -1304,6 +1325,8 @@
106+ $(O)o_init.o: o_init.c $(HACK_H) $(INCL)/lev.h
107+ $(O)objects.o: objects.c $(CONFIG_H) $(INCL)/obj.h $(INCL)/objclass.h \
108+ $(INCL)/prop.h $(INCL)/skills.h $(INCL)/color.h
109++$(O)objectsj.o: objectsj.c $(CONFIG_H) $(INCL)/obj.h $(INCL)/objclass.h \
110++ $(INCL)/prop.h $(INCL)/skills.h $(INCL)/color.h
111+ $(O)objnam.o: objnam.c $(HACK_H)
112+ $(O)options.o: options.c $(CONFIG_H) $(INCL)/objclass.h $(INCL)/flag.h \
113+ $(HACK_H) $(INCL)/tcap.h
--- a/patch/index.html
+++ b/patch/index.html
@@ -23,6 +23,7 @@
2323 <li><a href="centerpopups.patch">X11でダイアログをウィンドウ中心に表示するパッチ</a>
2424 <li><a href="report.patch">スコア送信機能を追加するパッチ</a>
2525 <li><a href="mt.patch">乱数発生器にMersenne Twisterを使用するパッチ(3.4.3-0.4用)</a>
26+<li><a href="Makefile.gcc.patch">MinGWでコンパイルするためのパッチ(3.6.0-0.6用)</a>
2627 </ul>
2728 <hr>
2829 Powered by <a href="http://sourceforge.jp"><img src="http://sourceforge.jp/sflogo.php?group_id=95" width="96" height="31" border="0" alt="SourceForge.jp"></a>
Show on old repository browser