Skip to content

Commit

Permalink
DLL version 111015, cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
nishimotz committed Oct 15, 2011
1 parent 77dce01 commit 8f06316
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 9 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Expand Up @@ -10,3 +10,8 @@ autom4te.cache
mecab/config.h
mecab/stamp-h1
*.in
*.lib
*.obj
*.dll
*.exp

20 changes: 13 additions & 7 deletions Makefile.mak
Expand Up @@ -5,9 +5,9 @@ all:
cd text2mecab
nmake /f Makefile.mak
cd ..
cd mecab
nmake /f Makefile.mak
cd ..
rem cd mecab
rem nmake /f Makefile.mak
rem cd ..
cd mecab2njd
nmake /f Makefile.mak
cd ..
Expand Down Expand Up @@ -38,12 +38,15 @@ all:
cd jpcommon
nmake /f Makefile.mak
cd ..
cd bin
nmake /f Makefile.mak
cd ..
cd mecab-naist-jdic
cd lib
nmake /f Makefile.mak
cd ..
rem cd bin
rem nmake /f Makefile.mak
rem cd ..
rem cd mecab-naist-jdic
rem nmake /f Makefile.mak
rem cd ..

clean:
cd text2mecab
Expand Down Expand Up @@ -88,6 +91,9 @@ clean:
cd mecab-naist-jdic
nmake /f Makefile.mak clean
cd ..
cd lib
nmake /f Makefile.mak
cd ..

install::
@if not exist "$(INSTALLDIR)\bin" mkdir "$(INSTALLDIR)\bin"
Expand Down
6 changes: 5 additions & 1 deletion lib/libopenjtalk.c
Expand Up @@ -78,7 +78,7 @@

char *jt_version()
{
return "libopenjtalk 20110508";
return "libopenjtalk 20111015";
}

void *jt_malloc(unsigned int size)
Expand Down Expand Up @@ -362,6 +362,7 @@ void OpenJTalk_clear(OpenJTalk * open_jtalk)
HTS_Engine_clear(&open_jtalk->engine);
}

#if 0
void Usage()
{
fprintf(stderr, "\n");
Expand Down Expand Up @@ -451,6 +452,7 @@ void Usage()

exit(0);
}
#endif

/* Getfp: wrapper for fopen */
FILE *Getfp(const char *name, const char *opt)
Expand All @@ -465,6 +467,7 @@ FILE *Getfp(const char *name, const char *opt)
return (fp);
}

#if 0
// dummy function
int _libopenjtalk_main(char *buff, char *owfile)
{
Expand Down Expand Up @@ -767,4 +770,5 @@ int _libopenjtalk_main(char *buff, char *owfile)
fclose(logfp);
return 0;
}
#endif

1 change: 0 additions & 1 deletion lib/libopenjtalk.def
Expand Up @@ -240,7 +240,6 @@ EXPORTS
OpenJTalk_initialize @242
OpenJTalk_load @243
OpenJTalk_synthesis @244
Usage @245
jt_free @247
jt_malloc @248
jt_save_logs @249
Expand Down

0 comments on commit 8f06316

Please sign in to comment.