Commit: 641888650087541f1a51f23c3e84533d9d722267 - nlite (git)

Commit MetaInfo

• Revision: 641888650087541f1a51f23c3e84533d9d722267 (tree)
• Time: 2012-02-26 11:38:07
• Author: qwerty2501 <riot313@gmai...>
• Commiter: qwerty2501

Log Message

リリースビルド向けにプロジェクト設定変更

Change Summary

• add: Release/libs/Voice/mei_normal/README.txt
• modified: nlib/nlib.vcxproj
• modified: nlib_driver/nlib_driver.vcxproj
• modified: nlite.suo
• modified: nlite/nlite.vcxproj
• modified: nlite/stdafx.h
• modified: nlite_stub/nlite_stub.vcxproj
• modified: open_jtalk_lib/open_jtalk_lib.c
• modified: open_jtalk_lib/open_jtalk_lib.vcxproj
• modified: open_jtalk_lib/open_jtalk_lib.vcxproj.filters
• modified: shareCookie/shareCookie.c

Incremental Difference

--- /dev/null
+++ b/Release/libs/Voice/mei_normal/README.txt
@@ -0,0 +1,78 @@
+===============================================================================
+                     HTS Voice "Mei (Normal)" version 1.1
+                            release August 3, 2011
+
+
+The work is released as a part of MMDAgent (http://www.mmdagent.jp/).
+
+*******************************************************************************
+                                    Copying
+*******************************************************************************
+
+# ----------------------------------------------------------------- #
+#           HTS Voice "Mei (Normal)"                                #
+#           released by MMDAgent Project Team                       #
+#           http://www.mmdagent.jp/                                 #
+# ----------------------------------------------------------------- #
+#                                                                   #
+#  Copyright (c) 2009-2011  Nagoya Institute of Technology          #
+#                           Department of Computer Science          #
+#                                                                   #
+# Some rights reserved.                                             #
+#                                                                   #
+# This work is licensed under the Creative Commons Attribution 3.0  #
+# license.                                                          #
+#                                                                   #
+# You are free:                                                     #
+#  * to Share - to copy, distribute and transmit the work           #
+#  * to Remix - to adapt the work                                   #
+# Under the following conditions:                                   #
+#  * Attribution - You must attribute the work in the manner        #
+#    specified by the author or licensor (but not in any way that   #
+#    suggests that they endorse you or your use of the work).       #
+# With the understanding that:                                      #
+#  * Waiver - Any of the above conditions can be waived if you get  #
+#    permission from the copyright holder.                          #
+#  * Public Domain - Where the work or any of its elements is in    #
+#    the public domain under applicable law, that status is in no   #
+#    way affected by the license.                                   #
+#  * Other Rights - In no way are any of the following rights       #
+#    affected by the license:                                       #
+#     - Your fair dealing or fair use rights, or other applicable   #
+#       copyright exceptions and limitations;                       #
+#     - The author's moral rights;                                  #
+#     - Rights other persons may have either in the work itself or  #
+#       in how the work is used, such as publicity or privacy       #
+#       rights.                                                     #
+#  * Notice - For any reuse or distribution, you must make clear to #
+#    others the license terms of this work. The best way to do this #
+#    is with a link to this web page.                               #
+#                                                                   #
+# See http://creativecommons.org/ for details.                      #
+# ----------------------------------------------------------------- #
+
+See also "COPYRIGHT.txt" file in the current directory for details.
+
+*******************************************************************************
+                               Acknowledgements
+*******************************************************************************
+
+Keiichi Tokuda
+Akinobu Lee
+Keiichiro Oura
+
+*******************************************************************************
+                                  Who we are
+*******************************************************************************
+
+The MMDAgent project team is a voluntary group for developing the Toolkit for
+Building Voice Interaction System. Current members are
+
+ Keiichi Tokuda      http://www.sp.nitech.ac.jp/~tokuda/
+ Akinobu Lee         http://www.sp.nitech.ac.jp/~ri/
+ Keiichiro Oura      http://www.sp.nitech.ac.jp/~uratec/
+
+and the members are dynamically changing. The current formal contact address of
+MMDAgent project team and a mailing list for MMDAgent users can be found at
+http://www.mmdagent.jp/
+===============================================================================

--- a/nlib/nlib.vcxproj
+++ b/nlib/nlib.vcxproj
@@ -50,13 +50,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(SolutionDir);$(SolutionDir)\include;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir);$(SolutionDir)\include;$(IncludePath);$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-window|Win32'">
-    <IncludePath>$(SolutionDir);$(SolutionDir)\include;$(SolutionDir);$(SolutionDir)\nlite;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir);$(SolutionDir)\include;$(SolutionDir);$(SolutionDir)\nlite;$(IncludePath);$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(SolutionDir);$(SolutionDir)\include;$(SolutionDir);$(VCInstallDir)include;$(WindowsSdkDir)include;$(SolutionDir)include</IncludePath>
+    <IncludePath>$(SolutionDir);$(SolutionDir)\include;$(VCInstallDir)include;$(SolutionDir)include;$(IncludePath);$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -96,7 +96,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;XML_UNICODE_WCHAR_T;THREADSAFE_DEBUG;_LIB;XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFENDEBUG;_LIB;%(PreprocessorDefinitions);XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;XML_UNICODE_WCHAR_T;_LIB;_CRT_SECURE_NO_DEPRECATE;THREADSAFENDEBUG;%(PreprocessorDefinitions);THREADSAFE</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

--- a/nlib_driver/nlib_driver.vcxproj
+++ b/nlib_driver/nlib_driver.vcxproj
@@ -52,17 +52,17 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <LibraryPath>$(SolutionDir)lib\$(Configuration);$(LibraryPath)</LibraryPath>
-    <IncludePath>$(SolutionDir);$(SolutionDir)\Include;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir);$(SolutionDir)\Include;$(SolutionDir)\Include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-window|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <LibraryPath>$(SolutionDir)lib\$(Configuration);$(LibraryPath)</LibraryPath>
-    <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir);$(SolutionDir)\Include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <LibraryPath>$(SolutionDir)lib\$(Configuration);$(LibraryPath)</LibraryPath>
-    <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir);$(SolutionDir)\Include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Binary files a/nlite.suo and b/nlite.suo differ

--- a/nlite/nlite.vcxproj
+++ b/nlite/nlite.vcxproj
@@ -52,20 +52,20 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(solutiondir)\nlib;$(solutiondir)\include\WTL\include;$(solutiondir);$(solutiondir)\include;$(solutiondir)\expat;$(IncludePath);$(solutiondir)\speaker;$(IncludePath)</IncludePath>
+    <IncludePath>$(solutiondir)\nlib;$(solutiondir)\include\WTL\include;$(solutiondir);$(solutiondir)\include;$(solutiondir)\expat;$(IncludePath);$(solutiondir)\speaker;$(IncludePath);$(IncludePath)</IncludePath>
     <EmbedManifest>false</EmbedManifest>
     <CustomBuildAfterTargets>
     </CustomBuildAfterTargets>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-window|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(solutiondir)\nlib;$(solutiondir)\include\WTL\include;$(solutiondir);$(solutiondir)\include;$(solutiondir)\expat;$(solutiondir)nlib\;$(solutiondir)memorypool\;$(solutiondir)shareCookie\;$(solutiondir);$(IncludePath);$(solutiondir)\speaker;$(IncludePath)</IncludePath>
+    <IncludePath>$(solutiondir)\nlib;$(solutiondir)\include\WTL\include;$(solutiondir);$(solutiondir)\include;$(solutiondir)\expat;$(solutiondir)nlib\;$(solutiondir)memorypool\;$(solutiondir)shareCookie\;$(solutiondir);$(IncludePath);$(solutiondir)\speaker;$(IncludePath);$(IncludePath)</IncludePath>
     <CustomBuildAfterTargets>
     </CustomBuildAfterTargets>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(solutiondir)\nlib;$(solutiondir)\include\WTL\include;$(solutiondir);$(solutiondir)\include;$(solutiondir)\expat;$(WDDK)inc\atl71;$(BOOST);$(IncludePath);$(solutiondir)\speaker;$(IncludePath)</IncludePath>
+    <IncludePath>$(solutiondir)\nlib;$(solutiondir)\include\WTL\include;$(solutiondir);$(solutiondir)\include;$(solutiondir)\expat;$(WDDK)inc\atl71;$(BOOST);$(IncludePath);$(solutiondir)\speaker;$(IncludePath);$(IncludePath)</IncludePath>
     <CustomBuildAfterTargets>
     </CustomBuildAfterTargets>
   </PropertyGroup>
@@ -115,7 +115,8 @@ xcopy "$(ProjectDir)libs" "$(targetdir)libs" /e /y</Command>
       </Command>
     </PreBuildEvent>
     <PostBuildEvent>
-      <Command>xcopy "$(ProjectDir)output" "$(targetdir)" /e /y</Command>
+      <Command>mkdir "$(targetdir)libs" /y
+xcopy "$(ProjectDir)libs" "$(targetdir)libs" /e /y</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -125,7 +126,7 @@ xcopy "$(ProjectDir)libs" "$(targetdir)libs" /e /y</Command>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;XML_UNICODE_WCHAR_T;_DEBUG;_CRT_SECURE_NO_WARNINGS;XML_UNICODE_WCHAR_TNDEBUG;_WINDOWS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_WARNINGS;XML_UNICODE_WCHAR_TNDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -143,7 +144,8 @@ xcopy "$(ProjectDir)libs" "$(targetdir)libs" /e /y</Command>
       </Command>
     </PreBuildEvent>
     <PostBuildEvent>
-      <Command>xcopy "$(ProjectDir)output" "$(targetdir)" /e /y</Command>
+      <Command>mkdir "$(targetdir)libs" /y
+xcopy "$(ProjectDir)libs" "$(targetdir)libs" /e /y</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>

--- a/nlite/stdafx.h
+++ b/nlite/stdafx.h
@@ -7,7 +7,7 @@
 
 #include "targetver.h"
 
-#define DEBUG								//リリースビルドでもデバッグ関数が有効になる
+//#define DEBUG								//リリースビルドでもデバッグ関数が有効になる
 #define WIN32_LEAN_AND_MEAN					// Windows ヘッダーから使用されていない部分を除外します。
 #define _CRT_SECURE_NO_WARNINGS 1			//vc++のおせっかいな警告を消す
 #define  _CRT_NON_CONFORMING_SWPRINTFS 1	//vc++のおせっかいな警告を消す

--- a/nlite_stub/nlite_stub.vcxproj
+++ b/nlite_stub/nlite_stub.vcxproj
@@ -46,12 +46,15 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(solutiondir);$(SolutionDir)\include;$(IncludePath)</IncludePath>
+    <IncludePath>$(solutiondir);$(SolutionDir)\include;$(IncludePath);$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-window|Win32'">
-    <IncludePath>$(Solutiondir);$(Solutiondir)include\;$(IncludePath)</IncludePath>
+    <IncludePath>$(solutiondir);$(SolutionDir)\include;$(Solutiondir);$(Solutiondir)include\;$(IncludePath);$(IncludePath)</IncludePath>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IncludePath>$(solutiondir);$(SolutionDir)\include;$(APR)include;$(boost);$(WINDDK)inc\atl71;$(IncludePath);$(IncludePath)</IncludePath>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>

--- a/open_jtalk_lib/open_jtalk_lib.c
+++ b/open_jtalk_lib/open_jtalk_lib.c
@@ -45,8 +45,6 @@
 #include "jpcommon.h"
 #include "HTS_engine.h"
 
-#define OPENJTALK_EXPORTS
-
 #include "open_jtalk_lib.h"
 
 

--- a/open_jtalk_lib/open_jtalk_lib.vcxproj
+++ b/open_jtalk_lib/open_jtalk_lib.vcxproj
@@ -25,7 +25,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -41,7 +41,7 @@
     <IncludePath>$(ProjectDir)hts_engine_API\include;$(ProjectDir)open_jtalk\mecab\src;$(ProjectDir)open_jtalk\mecab2njd;$(ProjectDir)open_jtalk\njd;$(ProjectDir)open_jtalk\njd_set_accent_phrase;$(ProjectDir)open_jtalk\njd_set_accent_type;$(ProjectDir)open_jtalk\njd_set_digit;$(ProjectDir)open_jtalk\njd_set_long_vowel;$(ProjectDir)open_jtalk\njd_set_pronunciation;$(ProjectDir)open_jtalk\njd_set_unvoiced_vowel;$(ProjectDir)open_jtalk\njd2jpcommon;$(ProjectDir)open_jtalk\text2mecab;$(ProjectDir)open_jtalk\jpcommon;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)hts_engine_API\include;$(ProjectDir)open_jtalk\mecab\src;$(ProjectDir)open_jtalk\mecab2njd;$(ProjectDir)open_jtalk\njd;$(ProjectDir)open_jtalk\njd_set_accent_phrase;$(ProjectDir)open_jtalk\njd_set_accent_type;$(ProjectDir)open_jtalk\njd_set_digit;$(ProjectDir)open_jtalk\njd_set_long_vowel;$(ProjectDir)open_jtalk\njd_set_pronunciation;$(ProjectDir)open_jtalk\njd_set_unvoiced_vowel;$(ProjectDir)open_jtalk\njd2jpcommon;$(ProjectDir)open_jtalk\text2mecab;$(ProjectDir)open_jtalk\jpcommon;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -77,7 +77,6 @@
     <None Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="hts_engine_API\bin\hts_engine.c" />
     <ClCompile Include="hts_engine_API\lib\HTS_audio.c" />
     <ClCompile Include="hts_engine_API\lib\HTS_engine.c" />
     <ClCompile Include="hts_engine_API\lib\HTS_gstream.c" />
@@ -105,7 +104,6 @@
     <ClCompile Include="open_jtalk\mecab\src\learner.cpp" />
     <ClCompile Include="open_jtalk\mecab\src\learner_tagger.cpp" />
     <ClCompile Include="open_jtalk\mecab\src\libmecab.cpp" />
-    <ClCompile Include="open_jtalk\mecab\src\mecab-dict-index.cpp" />
     <ClCompile Include="open_jtalk\mecab\src\mecab.cpp" />
     <ClCompile Include="open_jtalk\mecab\src\nbest_generator.cpp" />
     <ClCompile Include="open_jtalk\mecab\src\param.cpp" />

--- a/open_jtalk_lib/open_jtalk_lib.vcxproj.filters
+++ b/open_jtalk_lib/open_jtalk_lib.vcxproj.filters
@@ -63,9 +63,6 @@
     <ClCompile Include="open_jtalk\mecab\src\mecab.cpp">
       <Filter>ソース ファイル\lib</Filter>
     </ClCompile>
-    <ClCompile Include="open_jtalk\mecab\src\mecab-dict-index.cpp">
-      <Filter>ソース ファイル\lib</Filter>
-    </ClCompile>
     <ClCompile Include="open_jtalk\mecab\src\libmecab.cpp">
       <Filter>ソース ファイル\lib</Filter>
     </ClCompile>
@@ -111,12 +108,6 @@
     <ClCompile Include="hts_engine_API\lib\HTS_gstream.c">
       <Filter>ソース ファイル\lib</Filter>
     </ClCompile>
-    <ClCompile Include="hts_engine_API\bin\hts_engine.c">
-      <Filter>ソース ファイル\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="hts_engine_API\lib\HTS_engine.c">
-      <Filter>ソース ファイル\lib</Filter>
-    </ClCompile>
     <ClCompile Include="hts_engine_API\lib\HTS_audio.c">
       <Filter>ソース ファイル\lib</Filter>
     </ClCompile>
@@ -171,6 +162,9 @@
     <ClCompile Include="open_jtalk\mecab\src\writer.cpp">
       <Filter>ソース ファイル\lib</Filter>
     </ClCompile>
+    <ClCompile Include="hts_engine_API\lib\HTS_engine.c">
+      <Filter>ソース ファイル\lib</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="open_jtalk_lib.h">

--- a/shareCookie/shareCookie.c
+++ b/shareCookie/shareCookie.c
@@ -951,10 +951,11 @@ BROWSERTYPE getDefaultBrowserType(){
 	DWORD cName  = sizeof(browserName);
 	HKEY hKey;
 	//レジストリキーを読み取り専用でオープン
-	if(RegOpenKeyEx(HKEY_CURRENT_USER,L"Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\https\\UserChoice",0,KEY_READ,&hKey) != ERROR_SUCCESS){
+	if(RegOpenKeyEx(HKEY_CURRENT_USER,L"Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\http\\UserChoice",0,KEY_READ,&hKey) != ERROR_SUCCESS){
 		return COOKIE_ERR_INTERNETOPTION_NOTOPEN;
 	}
 
+	RegQueryValueEx(hKey,TEXT("Progid"),(LPDWORD)NULL,(LPDWORD)NULL,(LPBYTE)&browserName,&cName);
 
 	if(_tcscmp(browserName,TEXT("ChromeHTML")) == 0){
 
@@ -986,7 +987,7 @@ BROWSERTYPE getDefaultBrowserType(){
 	}
 	
 
-	RegQueryValueEx(hKey,TEXT("Progid"),(LPDWORD)NULL,(LPDWORD)NULL,(LPBYTE)&browserName,&cName);
+