1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
|
From 2117d311d348e9fdd20c26fe40d4a1e236d47b1d Mon Sep 17 00:00:00 2001
From: MURAOKA Taro <koron.kaoriya@gmail.com>
Date: Wed, 26 Oct 2011 19:45:35 +0900
Subject: [PATCH 14/36] support MinGW with lot of warnings
---
.hgignore | 1 +
Makefile | 21 +++++++++++++++++++--
compile/Make_mingw.mak | 41 +++++++++++++++++++++++++++++++++++++++++
dict/Makefile | 3 +--
dict/dict.mak | 5 +++++
src/migemo.h | 5 ++---
6 files changed, 69 insertions(+), 7 deletions(-)
create mode 100644 compile/Make_mingw.mak
diff --git a/.hgignore b/.hgignore
index 3ce9ec9..f193b22 100644
--- a/.hgignore
+++ b/.hgignore
@@ -4,6 +4,7 @@ syntax: glob
build/*
dict/SKK-JISYO.L
dict/base-dict
+dict/migemo-dict
dict/utf-8.d/*.dat
dict/utf-8.d/migemo-dict
tags
diff --git a/Makefile b/Makefile
index 228b7cb..2e894e8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,7 @@
#
# C/Migemo Makefile
#
-# Last Change: 19-Oct-2003.
-# Maintainer: MURAOKA Taro <koron@tka.att.ne.jp>
+# Maintainer: MURAOKA Taro <koron.kaoriya@gmail.com>
default: tags
@@ -42,6 +41,24 @@ cyg-clean:
cyg-distclean:
$(MAKE) -f compile/Make_cyg.mak distclean
+##############################################################################
+# for MinGW
+#
+mingw: mingw-rel
+mingw-all: mingw-rel mingw-dict
+mingw-rel:
+ $(MAKE) -f compile/Make_mingw.mak
+mingw-dict:
+ $(MAKE) -f compile/Make_mingw.mak dictionary
+mingw-install: mingw-all
+ $(MAKE) -f compile/Make_mingw.mak install
+mingw-uninstall:
+ $(MAKE) -f compile/Make_mingw.mak uninstall
+mingw-clean:
+ $(MAKE) -f compile/Make_mingw.mak clean
+mingw-distclean:
+ $(MAKE) -f compile/Make_mingw.mak distclean
+
##############################################################################
# for GNU/gcc (Linux and others)
# (Tested on Vine Linux 2.1.5)
diff --git a/compile/Make_mingw.mak b/compile/Make_mingw.mak
new file mode 100644
index 0000000..d86af84
--- /dev/null
+++ b/compile/Make_mingw.mak
@@ -0,0 +1,41 @@
+# vim:set ts=8 sts=8 sw=8 tw=0:
+#
+# MinGW用Makefile
+#
+# Base Idea: MATSUMOTO Yasuhiro
+# Maintainer: MURAOKA Taro <koron.kaoriya@gmail.com>
+
+##############################################################################
+# 環境に応じてこの変数を変更する
+#
+DLLNAME = migemo.dll
+libmigemo_LIB = $(outdir)libmigemo.dll.a
+libmigemo_DSO = $(outdir)$(DLLNAME)
+EXEEXT = .exe
+CFLAGS_MIGEMO =
+LDFLAGS_MIGEMO =
+CC = gcc
+
+include config.mk
+include compile/unix.mak
+include src/depend.mak
+include compile/clean_unix.mak
+include compile/clean.mak
+
+##############################################################################
+# 環境に応じてライブラリ構築法を変更する
+#
+$(libmigemo_LIB): $(libmigemo_DSO)
+$(libmigemo_DSO): $(libmigemo_OBJ) $(srcdir)migemo.def
+ dllwrap -o $(libmigemo_DSO) --dllname $(DLLNAME) --implib $(libmigemo_LIB) --def $(srcdir)migemo.def $(libmigemo_OBJ)
+
+install-lib: $(libmigemo_DSO) $(libmigemo_LIB)
+ $(INSTALL_DATA) $(libmigemo_LIB) $(libdir)
+ $(INSTALL_PROGRAM) $(libmigemo_DSO) $(bindir)
+
+uninstall-lib:
+ $(RM) $(bindir)/$(libmigemo_DSO)
+ $(RM) $(libdir)/$(libmigemo_LIB)
+
+dictionary:
+ cd dict && $(MAKE) mingw
diff --git a/dict/Makefile b/dict/Makefile
index 84bff2d..75c53fe 100644
--- a/dict/Makefile
+++ b/dict/Makefile
@@ -2,8 +2,7 @@
#
# t@C̃eiX(X^u)
#
-# Last Change: 16-May-2002.
-# Written By: MURAOKA Taro <koron@tka.att.ne.jp>
+# Written By: MURAOKA Taro <koron.kaoriya@gmail.com>
include ../config.mk
include dict.mak
diff --git a/dict/dict.mak b/dict/dict.mak
index c8fb150..8ea8a66 100644
--- a/dict/dict.mak
+++ b/dict/dict.mak
@@ -84,6 +84,11 @@ bc5: cp932 utf-8
#
cyg: euc-jp utf-8
+##############################################################################
+# for MinGW
+#
+mingw: cp932 utf-8
+
##############################################################################
# for GNU/gcc(Linux)
#
diff --git a/src/migemo.h b/src/migemo.h
index 4086887..b30b44a 100644
--- a/src/migemo.h
+++ b/src/migemo.h
@@ -2,14 +2,13 @@
/*
* migemo.h -
*
- * Written By: MURAOKA Taro <koron@tka.att.ne.jp>
- * Last Change: 21-Jun-2004.
+ * Written By: MURAOKA Taro <koron.kaoriya@gmail.com>
*/
#ifndef MIGEMO_H
#define MIGEMO_H
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN32__)
# define MIGEMO_CALLTYPE __stdcall
#else
# define MIGEMO_CALLTYPE
--
2.39.2
|
