#35439 添付のランタイムを、VC++2013のものに変更。

#35444 DTXV.exeを動作させるため、xadec.dllを同exeと同じフォルダに移動。
#35444 xadec.dllを移動させるとDYXManiaGR.exeが起動できなくなるため、起動時のdll存在チェックコードを修正。

git-svn-id: http://svn.osdn.jp/svnroot/dtxmania/trunk@847 16f42ceb-6dc6-49c8-ba94-f2d53467949d

diff --git a/DTXManiaプロジェクト/コード/全体/Program.cs b/DTXManiaプロジェクト/コード/全体/Program.cs
index bc837f6..f160a5c 100644 (file)
--- a/DTXManiaプロジェクト/コード/全体/Program.cs
+++ b/DTXManiaプロジェクト/コード/全体/Program.cs
@@ -80,7 +80,7 @@ namespace DTXMania
                                        "FDK.dll またはその依存するdllが存在しません。" + newLine + "DTXManiaをダウンロードしなおしてください。",\r
                                        "FDK.dll, or its depended DLL, is not found." + newLine + "Please download DTXMania again."\r
                                        ) ) bDLLnotfound = true;\r
-                               if ( !tDLLの存在チェック( "dll\\xadec.dll",\r
+                               if ( !tDLLの存在チェック( "xadec.dll",           // #35444 2015.8.27 yyagi; Changed dll path\r
                                        "xadec.dll が存在しません。" + newLine + "DTXManiaをダウンロードしなおしてください。",\r
                                        "xadec.dll is not found." + newLine + "Please download DTXMania again."\r
                                        ) ) bDLLnotfound = true;\r

diff --git a/実行時フォルダ/DTXManiaGR.exe b/実行時フォルダ/DTXManiaGR.exe
index 71acb96..7db2d10 100644 (file)
Binary files a/実行時フォルダ/DTXManiaGR.exe and b/実行時フォルダ/DTXManiaGR.exe differ

diff --git a/実行時フォルダ/dll/Microsoft.VC90.CRT.manifest b/実行時フォルダ/dll/Microsoft.VC90.CRT.manifest
deleted file mode 100644 (file)
index 594cb76..0000000
--- a/実行時フォルダ/dll/Microsoft.VC90.CRT.manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">\r
-    <noInheritable></noInheritable>\r
-    <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.6161" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>\r
-    <file name="msvcr90.dll" hashalg="SHA1" hash="7021457b391b35606e708c69987e4b6f606609ee"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>S83+LBs1RkUxSkzia1WysaAhLbk=</dsig:DigestValue></asmv2:hash></file> <file name="msvcp90.dll" hashalg="SHA1" hash="88549dd3ce8eaa62ca8aad0e96ddd9fec2203628"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>cKyCmIKF+fcGn6qaBhKuun+wAcQ=</dsig:DigestValue></asmv2:hash></file> <file name="msvcm90.dll" hashalg="SHA1" hash="65ef374affa5b48827e539b35b3275c201b41fc9"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>r+4y/NnOFgaANxNXoHL1jF95DUg=</dsig:DigestValue></asmv2:hash></file>\r
-</assembly>
\ No newline at end of file

diff --git a/実行時フォルダ/dll/msvcm90.dll b/実行時フォルダ/dll/msvcm90.dll
deleted file mode 100644 (file)
index 434353d..0000000
Binary files a/実行時フォルダ/dll/msvcm90.dll and /dev/null differ

diff --git a/実行時フォルダ/dll/msvcp120.dll b/実行時フォルダ/dll/msvcp120.dll
new file mode 100644 (file)
index 0000000..a237d2d
Binary files /dev/null and b/実行時フォルダ/dll/msvcp120.dll differ

diff --git a/実行時フォルダ/dll/msvcp90.dll b/実行時フォルダ/dll/msvcp90.dll
deleted file mode 100644 (file)
index af6cc3d..0000000
Binary files a/実行時フォルダ/dll/msvcp90.dll and /dev/null differ

diff --git a/実行時フォルダ/dll/msvcr120.dll b/実行時フォルダ/dll/msvcr120.dll
new file mode 100644 (file)
index 0000000..8c36149
Binary files /dev/null and b/実行時フォルダ/dll/msvcr120.dll differ

diff --git a/実行時フォルダ/dll/msvcr90.dll b/実行時フォルダ/dll/msvcr90.dll
deleted file mode 100644 (file)
index ec7f83a..0000000
Binary files a/実行時フォルダ/dll/msvcr90.dll and /dev/null differ

diff --git a/実行時フォルダ/dll/xadec.dll b/実行時フォルダ/xadec.dll
similarity index 100%
rename from 実行時フォルダ/dll/xadec.dll
rename to 実行時フォルダ/xadec.dll