updated mecab-dict-index.exe to support Windows XP. Visual C++ 2013 (VS2013 Update...

diff --git a/include/jtalk/libopenjtalk/mecab/src/Makefile.mak b/include/jtalk/libopenjtalk/mecab/src/Makefile.mak
index 7ee6c3d..e935cae 100644 (file)
--- a/include/jtalk/libopenjtalk/mecab/src/Makefile.mak
+++ b/include/jtalk/libopenjtalk/mecab/src/Makefile.mak
@@ -1,7 +1,7 @@
 \r
 CC = cl\r
 \r
-CFLAGS = /O2 /Ob2 /Oi /Ot /Oy /GT /GL /TP /EHsc /D CHARSET_SHIFT_JIS /D DIC_VERSION=102 /D MECAB_WITHOUT_MUTEX_LOCK /D MECAB_DEFAULT_RC=\"dummy\" /D PACKAGE=\"open_jtalk\" /D VERSION=\"1.01\" /D HAVE_WINDOWS_H\r
+CFLAGS = /O2 /Ob2 /Oi /Ot /Oy /GT /GL /TP /EHsc /D CHARSET_SHIFT_JIS /D DIC_VERSION=102 /D MECAB_WITHOUT_MUTEX_LOCK /D MECAB_DEFAULT_RC=\"dummy\" /D PACKAGE=\"open_jtalk\" /D VERSION=\"1.01\" /D HAVE_WINDOWS_H /D _USING_V110_SDK71_\r
 LFLAGS = /LTCG\r
 \r
 CORES = char_property.obj connector.obj context_id.obj dictionary.obj dictionary_compiler.obj dictionary_generator.obj dictionary_rewriter.obj eval.obj feature_index.obj iconv_utils.obj lbfgs.obj learner.obj learner_tagger.obj libmecab.obj mecab.obj nbest_generator.obj param.obj string_buffer.obj tagger.obj tokenizer.obj utils.obj viterbi.obj writer.obj\r
@@ -14,7 +14,7 @@ mecab.lib: $(CORES)
        lib $(LFLAGS) /OUT:$@ $(CORES)\r
 \r
 mecab-dict-index.exe: mecab-dict-index.obj\r
-       link /LTCG /OUT:$@ $(LIBS) $(@B).obj\r
+       link /SUBSYSTEM:CONSOLE,"5.01" /MACHINE:X86 /LTCG /OUT:$@ $(LIBS) $(@B).obj\r
 \r
 .cpp.obj:\r
        $(CC) $(CFLAGS) /c $<\r

diff --git a/jptools/build-and-test.cmd b/jptools/build-and-test.cmd
index feb06ec..4947091 100644 (file)
--- a/jptools/build-and-test.cmd
+++ b/jptools/build-and-test.cmd
@@ -1,4 +1,3 @@
-call setenv-x86.cmd\r
 cd ..\include\jtalk\r
 call all-clean.cmd\r
 call all-build.cmd\r

diff --git a/jptools/clean.cmd b/jptools/clean.cmd
new file mode 100644 (file)
index 0000000..e4a77fe
--- /dev/null
+++ b/jptools/clean.cmd
@@ -0,0 +1,3 @@
+cd ..\include\jtalk
+call all-clean.cmd
+cd ..\..\jptools

diff --git a/jptools/setup-vc2013.cmd b/jptools/setup-vc2013.cmd
new file mode 100644 (file)
index 0000000..b6476a5
--- /dev/null
+++ b/jptools/setup-vc2013.cmd
@@ -0,0 +1 @@
+call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\vcvars32.bat"