Index: trunk/ab5.0/abdev/ab-common-32.vsprops =================================================================== --- trunk/ab5.0/abdev/ab-common-32.vsprops (revision 825) +++ trunk/ab5.0/abdev/ab-common-32.vsprops (revision 825) @@ -0,0 +1,13 @@ + + + + Index: trunk/ab5.0/abdev/ab-common-64.vsprops =================================================================== --- trunk/ab5.0/abdev/ab-common-64.vsprops (revision 825) +++ trunk/ab5.0/abdev/ab-common-64.vsprops (revision 825) @@ -0,0 +1,17 @@ + + + + + Index: trunk/ab5.0/abdev/ab-common.vsprops =================================================================== --- trunk/ab5.0/abdev/ab-common.vsprops (revision 825) +++ trunk/ab5.0/abdev/ab-common.vsprops (revision 825) @@ -0,0 +1,21 @@ + + + + + Index: trunk/ab5.0/abdev/ab.sln =================================================================== --- trunk/ab5.0/abdev/ab.sln (revision 825) +++ trunk/ab5.0/abdev/ab.sln (revision 825) @@ -0,0 +1,74 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jenga", "..\jenga\projects\jenga\jenga.vcproj", "{F01805B6-65B4-4708-88F4-A5E07DEA9FBD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ab_common", "ab_common\ab_common.vcproj", "{87835C33-64C9-4BA5-9B39-608BA5394387}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "abdev", "abdev\abdev.vcproj", "{DC1B787E-510F-4F7D-8F9A-182600904D83}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compiler", "compiler_x86\compiler.vcproj", "{11F0E9AB-EAEC-4616-A9DD-838073342CBB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "res", "res\res.vcproj", "{BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icon_res", "icon_res\icon_res.vcproj", "{C487D66E-BED6-4046-9120-8F6BC9F1B300}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|Win32.ActiveCfg = Debug|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|Win32.Build.0 = Debug|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|x64.ActiveCfg = Debug|x64 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|x64.Build.0 = Debug|x64 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|Win32.ActiveCfg = Release|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|Win32.Build.0 = Release|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|x64.ActiveCfg = Release|x64 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|x64.Build.0 = Release|x64 + {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|Win32.ActiveCfg = Debug|Win32 + {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|Win32.Build.0 = Debug|Win32 + {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|x64.ActiveCfg = Debug|x64 + {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|x64.Build.0 = Debug|x64 + {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|Win32.ActiveCfg = Release|Win32 + {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|Win32.Build.0 = Release|Win32 + {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|x64.ActiveCfg = Release|x64 + {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|x64.Build.0 = Release|x64 + {DC1B787E-510F-4F7D-8F9A-182600904D83}.Debug|Win32.ActiveCfg = Debug|Win32 + {DC1B787E-510F-4F7D-8F9A-182600904D83}.Debug|Win32.Build.0 = Debug|Win32 + {DC1B787E-510F-4F7D-8F9A-182600904D83}.Debug|x64.ActiveCfg = Debug|x64 + {DC1B787E-510F-4F7D-8F9A-182600904D83}.Release|Win32.ActiveCfg = Release|Win32 + {DC1B787E-510F-4F7D-8F9A-182600904D83}.Release|Win32.Build.0 = Release|Win32 + {DC1B787E-510F-4F7D-8F9A-182600904D83}.Release|x64.ActiveCfg = Release|x64 + {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Debug|Win32.ActiveCfg = Debug|Win32 + {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Debug|Win32.Build.0 = Debug|Win32 + {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Debug|x64.ActiveCfg = Debug|x64 + {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Debug|x64.Build.0 = Debug|x64 + {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Release|Win32.ActiveCfg = Release|Win32 + {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Release|Win32.Build.0 = Release|Win32 + {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Release|x64.ActiveCfg = Release|x64 + {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Release|x64.Build.0 = Release|x64 + {BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}.Debug|Win32.ActiveCfg = Release|Win32 + {BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}.Debug|Win32.Build.0 = Release|Win32 + {BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}.Debug|x64.ActiveCfg = Release|Win32 + {BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}.Debug|x64.Build.0 = Release|Win32 + {BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}.Release|Win32.ActiveCfg = Release|Win32 + {BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}.Release|Win32.Build.0 = Release|Win32 + {BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}.Release|x64.ActiveCfg = Release|Win32 + {BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}.Release|x64.Build.0 = Release|Win32 + {C487D66E-BED6-4046-9120-8F6BC9F1B300}.Debug|Win32.ActiveCfg = Release|Win32 + {C487D66E-BED6-4046-9120-8F6BC9F1B300}.Debug|Win32.Build.0 = Release|Win32 + {C487D66E-BED6-4046-9120-8F6BC9F1B300}.Debug|x64.ActiveCfg = Release|Win32 + {C487D66E-BED6-4046-9120-8F6BC9F1B300}.Debug|x64.Build.0 = Release|Win32 + {C487D66E-BED6-4046-9120-8F6BC9F1B300}.Release|Win32.ActiveCfg = Release|Win32 + {C487D66E-BED6-4046-9120-8F6BC9F1B300}.Release|Win32.Build.0 = Release|Win32 + {C487D66E-BED6-4046-9120-8F6BC9F1B300}.Release|x64.ActiveCfg = Release|Win32 + {C487D66E-BED6-4046-9120-8F6BC9F1B300}.Release|x64.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Index: trunk/ab5.0/abdev/ab_common/ab_common.vcproj =================================================================== --- trunk/ab5.0/abdev/ab_common/ab_common.vcproj (revision 824) +++ trunk/ab5.0/abdev/ab_common/ab_common.vcproj (revision 825) @@ -12,4 +12,7 @@ Name="Win32" /> + @@ -17,8 +20,7 @@ @@ -41,13 +43,9 @@ Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_DEBUG;_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" - UsePrecompiledHeader="2" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + - + - - - - - - + + + + @@ -16,110 +19,8 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -381,14 +344,11 @@ - - - @@ -738,4 +690,12 @@ + + + @@ -746,5 +706,5 @@ - - - @@ -774,4 +726,12 @@ + + + @@ -782,5 +742,5 @@ - - - @@ -810,4 +762,12 @@ + + + @@ -818,5 +778,5 @@ - - - @@ -846,4 +798,12 @@ + + + @@ -854,5 +814,5 @@ - - - @@ -882,4 +834,12 @@ + + + @@ -890,5 +850,5 @@ - - - @@ -918,4 +870,12 @@ + + + @@ -926,5 +886,5 @@ - - - @@ -958,4 +910,12 @@ + + + @@ -966,5 +926,5 @@ - - - @@ -994,4 +946,12 @@ + + + @@ -1002,5 +962,5 @@ - - - @@ -1030,4 +982,12 @@ + + + @@ -1038,5 +998,5 @@ - - - @@ -1066,4 +1018,12 @@ + + + @@ -1074,5 +1034,5 @@ - - - @@ -1102,4 +1054,12 @@ + + + @@ -1110,5 +1070,5 @@ - - - @@ -1142,4 +1094,12 @@ + + + @@ -1150,5 +1110,5 @@ - - - @@ -1182,4 +1134,12 @@ + + + @@ -1190,5 +1150,5 @@ - - - @@ -1226,4 +1178,12 @@ + + + @@ -1234,5 +1194,5 @@ - - - @@ -1262,4 +1214,12 @@ + + + @@ -1270,5 +1230,5 @@ - - - @@ -1298,4 +1250,12 @@ + + + @@ -1306,5 +1266,5 @@ - - - @@ -1334,4 +1286,12 @@ + + + @@ -1342,5 +1302,5 @@ - - - @@ -1370,4 +1322,12 @@ + + + @@ -1378,5 +1338,5 @@ - - - @@ -1406,4 +1358,12 @@ + + + @@ -1414,5 +1374,5 @@ - - - @@ -1442,4 +1394,12 @@ + + + @@ -1450,5 +1410,5 @@ - - - @@ -1481,4 +1433,12 @@ + + + @@ -1489,5 +1449,5 @@ - - - @@ -1517,4 +1469,12 @@ + + + @@ -1525,5 +1485,5 @@ - - - @@ -1553,4 +1505,12 @@ + + + @@ -1561,5 +1521,5 @@ - - - @@ -1589,4 +1541,12 @@ + + + @@ -1597,5 +1557,5 @@ - - - @@ -1629,4 +1581,12 @@ + + + @@ -1637,5 +1597,5 @@ - - - @@ -1669,4 +1621,12 @@ + + + @@ -1677,5 +1637,5 @@ - - - @@ -1705,4 +1657,12 @@ + + + @@ -1713,5 +1673,5 @@ - - - @@ -1741,4 +1693,12 @@ + + + @@ -1749,5 +1709,5 @@ - - - @@ -1781,4 +1733,12 @@ + + + @@ -1789,5 +1749,5 @@ - - - @@ -1825,4 +1777,12 @@ + + + @@ -1833,5 +1793,5 @@ - - - @@ -1873,4 +1825,12 @@ + + + @@ -1881,5 +1841,5 @@ - - - @@ -1917,4 +1869,12 @@ + + + @@ -1925,5 +1885,5 @@ - - - @@ -1957,4 +1909,12 @@ + + + @@ -1965,5 +1925,5 @@ - - - @@ -2005,4 +1957,12 @@ + + + @@ -2013,5 +1973,5 @@ - - - @@ -2058,4 +2010,12 @@ + + + @@ -2066,5 +2026,5 @@ - - - @@ -2094,4 +2046,12 @@ + + + @@ -2102,5 +2062,5 @@ - - - @@ -2130,4 +2082,12 @@ + + + @@ -2138,5 +2098,5 @@ - - - @@ -2169,4 +2121,12 @@ + + + @@ -2177,5 +2137,5 @@ - - - @@ -2205,4 +2157,12 @@ + + + @@ -2213,5 +2173,5 @@ - - - @@ -2245,4 +2197,12 @@ + + + @@ -2253,5 +2213,5 @@ - - - @@ -2290,4 +2242,12 @@ + + + @@ -2298,5 +2258,5 @@ - - - @@ -2333,4 +2285,12 @@ + + + @@ -2341,5 +2301,5 @@ - - - @@ -2377,4 +2329,12 @@ + + + @@ -2385,5 +2345,5 @@ - - - @@ -2421,4 +2373,12 @@ + + + @@ -2429,5 +2389,5 @@ - - - @@ -2465,4 +2417,12 @@ + + + @@ -2473,5 +2433,5 @@ - - - @@ -2501,4 +2453,12 @@ + + + @@ -2509,5 +2469,5 @@ - - - @@ -2541,4 +2493,12 @@ + + + @@ -2549,5 +2509,5 @@ - - - @@ -2585,4 +2537,12 @@ + + + @@ -2593,5 +2553,5 @@ - - - @@ -2629,4 +2581,12 @@ + + + @@ -2637,5 +2597,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: trunk/ab5.0/abdev/compiler_x86/compiler.vcproj =================================================================== --- trunk/ab5.0/abdev/compiler_x86/compiler.vcproj (revision 825) +++ trunk/ab5.0/abdev/compiler_x86/compiler.vcproj (revision 825) @@ -0,0 +1,3308 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/ab5.0/abdev/compiler_x86/compiler_x86.vcproj =================================================================== --- trunk/ab5.0/abdev/compiler_x86/compiler_x86.vcproj (revision 824) +++ (revision ) @@ -1,1479 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: trunk/ab5.0/abdev/icon_res/StdAfx.cpp =================================================================== --- trunk/ab5.0/abdev/icon_res/StdAfx.cpp (revision 824) +++ (revision ) @@ -1,8 +1,0 @@ -// stdafx.cpp : 標準インクルードファイルを含むソース ファイル -// icon_res.pch 生成されるプリコンパイル済ヘッダー -// stdafx.obj 生成されるプリコンパイル済タイプ情報 - -#include "stdafx.h" - -// TODO: STDAFX.H に含まれていて、このファイルに記述されていない -// ヘッダーファイルを追加してください。 Index: trunk/ab5.0/abdev/icon_res/StdAfx.h =================================================================== --- trunk/ab5.0/abdev/icon_res/StdAfx.h (revision 824) +++ (revision ) @@ -1,24 +1,0 @@ -// stdafx.h : 標準のシステム インクルード ファイル、 -// または参照回数が多く、かつあまり変更されない -// プロジェクト専用のインクルード ファイルを記述します。 -// - -#if !defined(AFX_STDAFX_H__359C4D68_7507_4291_84FE_5004032BABD8__INCLUDED_) -#define AFX_STDAFX_H__359C4D68_7507_4291_84FE_5004032BABD8__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - - -// この位置にヘッダーを挿入してください -#define WIN32_LEAN_AND_MEAN // Windows ヘッダーから殆ど使用されないスタッフを除外します - -#include - -// TODO: プログラムで必要なヘッダー参照を追加してください。 - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ は前行の直前に追加の宣言を挿入します。 - -#endif // !defined(AFX_STDAFX_H__359C4D68_7507_4291_84FE_5004032BABD8__INCLUDED_) Index: trunk/ab5.0/abdev/icon_res/icon_res.cpp =================================================================== --- trunk/ab5.0/abdev/icon_res/icon_res.cpp (revision 824) +++ (revision ) @@ -1,13 +1,0 @@ -// icon_res.cpp : DLL アプリケーション用のエントリ ポイントを定義します。 -// - -#include "stdafx.h" - -BOOL APIENTRY DllMain( HANDLE hModule, - DWORD ul_reason_for_call, - LPVOID lpReserved - ) -{ - return TRUE; -} - Index: trunk/ab5.0/abdev/icon_res/icon_res.dsp =================================================================== --- trunk/ab5.0/abdev/icon_res/icon_res.dsp (revision 824) +++ (revision ) @@ -1,291 +1,0 @@ -# Microsoft Developer Studio Project File - Name="icon_res" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** 編集しないでください ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=icon_res - Win32 TheText_Release -!MESSAGE これは有効なﾒｲｸﾌｧｲﾙではありません。 このﾌﾟﾛｼﾞｪｸﾄをﾋﾞﾙﾄﾞするためには NMAKE を使用してください。 -!MESSAGE [ﾒｲｸﾌｧｲﾙのｴｸｽﾎﾟｰﾄ] ｺﾏﾝﾄﾞを使用して実行してください -!MESSAGE -!MESSAGE NMAKE /f "icon_res.mak". -!MESSAGE -!MESSAGE NMAKE の実行時に構成を指定できます -!MESSAGE ｺﾏﾝﾄﾞ ﾗｲﾝ上でﾏｸﾛの設定を定義します。例: -!MESSAGE -!MESSAGE NMAKE /f "icon_res.mak" CFG="icon_res - Win32 TheText_Release" -!MESSAGE -!MESSAGE 選択可能なﾋﾞﾙﾄﾞ ﾓｰﾄﾞ: -!MESSAGE -!MESSAGE "icon_res - Win32 TheText_Release" ("Win32 (x86) Dynamic-Link Library" 用) -!MESSAGE "icon_res - Win32 AB_Release" ("Win32 (x86) Dynamic-Link Library" 用) -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "icon_res - Win32 TheText_Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "icon_res___Win32_TheText_Release0" -# PROP BASE Intermediate_Dir "icon_res___Win32_TheText_Release0" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "icon_res___Win32_TheText_Release0" -# PROP Intermediate_Dir "icon_res___Win32_TheText_Release0" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICON_RES_EXPORTS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICON_RES_EXPORTS" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x411 /d "NDEBUG" -# ADD RSC /l 0x411 /d "NDEBUG" /d "THETEXT" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../TheText/SubOperation/icon_res.dll" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../TheText/SubOperation/icon_res.dll" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=copy D:\BasicProject\TheText\SubOperation\icon_res.dll D:\BasicProject\TheText_Standard\SubOperation\icon_res.dll -# End Special Build Tool - -!ELSEIF "$(CFG)" == "icon_res - Win32 AB_Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "icon_res___Win32_AB_Release0" -# PROP BASE Intermediate_Dir "icon_res___Win32_AB_Release0" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "icon_res___Win32_AB_Release0" -# PROP Intermediate_Dir "icon_res___Win32_AB_Release0" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICON_RES_EXPORTS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICON_RES_EXPORTS" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x411 /d "NDEBUG" -# ADD RSC /l 0x411 /d "NDEBUG" /d "ACTIVEBASIC" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../TheText/SubOperation/icon_res.dll" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../ActiveBasic/SubOperation/icon_res.dll" - -!ENDIF - -# Begin Target - -# Name "icon_res - Win32 TheText_Release" -# Name "icon_res - Win32 AB_Release" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\icon_res.cpp -# End Source File -# Begin Source File - -SOURCE=.\icon_res.rc -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD BASE CPP /Yc"stdafx.h" -# ADD CPP /Yc"stdafx.h" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\icon_ab\attach.ico -# End Source File -# Begin Source File - -SOURCE=.\icon_ab\BreakPoint.ico -# End Source File -# Begin Source File - -SOURCE=.\icon_ab\breakpoint_flag.ico -# End Source File -# Begin Source File - -SOURCE=.\icon_ab\community_find.ico -# End Source File -# Begin Source File - -SOURCE=.\icon_ab\community_forum.ico -# End Source File -# Begin Source File - -SOURCE=.\icon_ab\community_forum_secret.ico -# End Source File -# Begin Source File - -SOURCE=.\icon_ab\community_main.ico -# End Source File -# Begin Source File - -SOURCE=.\icon_ab\community_private_msg.ico -# End Source File -# Begin Source File - -SOURCE=.\icon_ab\DebugRun.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_allsave.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_conv_alpha_big.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_conv_alpha_small.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_conv_half.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_conv_hiragana.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_conv_katakana.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_conv_multi.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_copy.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_cut.ico -# End Source File -# Begin Source File - -SOURCE=.\icon_ab\menu_debugcompile.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_find.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_help.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_new.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_open.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_option.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_paste.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_preview.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_print.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_redo.ico -# End Source File -# Begin Source File - -SOURCE=.\icon_ab\menu_releasecompile.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_rightturn.ico -# End Source File -# Begin Source File - -SOURCE=.\icon_ab\menu_run.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_save.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_stringcount.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_topmost.ico -# End Source File -# Begin Source File - -SOURCE=.\icon\menu_undo.ico -# End Source File -# Begin Source File - -SOURCE=.\icon_ab\Pause.ico -# End Source File -# Begin Source File - -SOURCE=.\icon_ab\StepIn.ico -# End Source File -# Begin Source File - -SOURCE=.\icon_ab\StepOver.ico -# End Source File -# Begin Source File - -SOURCE=.\icon_ab\StepToCursor.ico -# End Source File -# Begin Source File - -SOURCE=.\icon_ab\Stop.ico -# End Source File -# End Group -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# End Target -# End Project Index: trunk/ab5.0/abdev/icon_res/icon_res.dsw =================================================================== --- trunk/ab5.0/abdev/icon_res/icon_res.dsw (revision 824) +++ (revision ) @@ -1,29 +1,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# 警告: このﾜｰｸｽﾍﾟｰｽ ﾌｧｲﾙ を編集または削除しないでください! - -############################################################################### - -Project: "icon_res"=.\icon_res.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - Index: trunk/ab5.0/abdev/icon_res/icon_res.vcproj =================================================================== --- trunk/ab5.0/abdev/icon_res/icon_res.vcproj (revision 825) +++ trunk/ab5.0/abdev/icon_res/icon_res.vcproj (revision 825) @@ -0,0 +1,304 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/ab5.0/abdev/res/res.cpp =================================================================== --- trunk/ab5.0/abdev/res/res.cpp (revision 824) +++ (revision ) @@ -1,15 +1,0 @@ -#include - -BOOL WINAPI DllMain(HANDLE hDLL,DWORD dwReason,LPVOID lpReserved){ - switch(dwReason){ - case DLL_PROCESS_ATTACH: - break; - case DLL_PROCESS_DETACH: - break; - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: - default: - break; - } - return TRUE; -} Index: trunk/ab5.0/abdev/res/res.dsp =================================================================== --- trunk/ab5.0/abdev/res/res.dsp (revision 824) +++ (revision ) @@ -1,314 +1,0 @@ -# Microsoft Developer Studio Project File - Name="res" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** 編集しないでください ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=res - Win32 Debug -!MESSAGE これは有効なﾒｲｸﾌｧｲﾙではありません。 このﾌﾟﾛｼﾞｪｸﾄをﾋﾞﾙﾄﾞするためには NMAKE を使用してください。 -!MESSAGE [ﾒｲｸﾌｧｲﾙのｴｸｽﾎﾟｰﾄ] ｺﾏﾝﾄﾞを使用して実行してください -!MESSAGE -!MESSAGE NMAKE /f "res.mak". -!MESSAGE -!MESSAGE NMAKE の実行時に構成を指定できます -!MESSAGE ｺﾏﾝﾄﾞ ﾗｲﾝ上でﾏｸﾛの設定を定義します。例: -!MESSAGE -!MESSAGE NMAKE /f "res.mak" CFG="res - Win32 Debug" -!MESSAGE -!MESSAGE 選択可能なﾋﾞﾙﾄﾞ ﾓｰﾄﾞ: -!MESSAGE -!MESSAGE "res - Win32 Release" ("Win32 (x86) Dynamic-Link Library" 用) -!MESSAGE "res - Win32 Debug" ("Win32 (x86) Dynamic-Link Library" 用) -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "res - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RES_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RES_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x411 /d "NDEBUG" -# ADD RSC /l 0x411 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../ActiveBasic/SubOperation/res.dll" - -!ELSEIF "$(CFG)" == "res - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RES_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RES_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x411 /d "_DEBUG" -# ADD RSC /l 0x411 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "res - Win32 Release" -# Name "res - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\res.cpp -# End Source File -# Begin Source File - -SOURCE=.\res.rc -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\base_directx.bmp -# End Source File -# Begin Source File - -SOURCE=.\base_dosprompt.bmp -# End Source File -# Begin Source File - -SOURCE=.\base_non.bmp -# End Source File -# Begin Source File - -SOURCE=.\base_prompt.bmp -# End Source File -# Begin Source File - -SOURCE=.\base_window.bmp -# End Source File -# Begin Source File - -SOURCE=.\BasicProgram.ico -# End Source File -# Begin Source File - -SOURCE=.\ToolbarIcon_Debugger\BreakPoint.ico -# End Source File -# Begin Source File - -SOURCE=.\cursor_arrow_to_right.cur -# End Source File -# Begin Source File - -SOURCE=.\cursor_fill.cur -# End Source File -# Begin Source File - -SOURCE=.\cursor_pen.cur -# End Source File -# Begin Source File - -SOURCE=.\ToolbarIcon_Debugger\DebugCompile.ico -# End Source File -# Begin Source File - -SOURCE=.\ToolbarIcon_Debugger\DebugRun.ico -# End Source File -# Begin Source File - -SOURCE=.\file_bmp.ico -# End Source File -# Begin Source File - -SOURCE=.\file_icon.ico -# End Source File -# Begin Source File - -SOURCE=.\folder_close.ico -# End Source File -# Begin Source File - -SOURCE=.\folder_open.ico -# End Source File -# Begin Source File - -SOURCE=.\html_general_parameter.ico -# End Source File -# Begin Source File - -SOURCE=.\html_parameter.ico -# End Source File -# Begin Source File - -SOURCE=.\ico00001.ico -# End Source File -# Begin Source File - -SOURCE=.\ico00002.ico -# End Source File -# Begin Source File - -SOURCE=.\icon1.ico -# End Source File -# Begin Source File - -SOURCE=.\member_private_function.ico -# End Source File -# Begin Source File - -SOURCE=.\member_private_variable.ico -# End Source File -# Begin Source File - -SOURCE=.\member_public_function.ico -# End Source File -# Begin Source File - -SOURCE=.\member_public_variable.ico -# End Source File -# Begin Source File - -SOURCE=.\menu.ico -# End Source File -# Begin Source File - -SOURCE=.\newfile_abp.ico -# End Source File -# Begin Source File - -SOURCE=.\newfile_html.ico -# End Source File -# Begin Source File - -SOURCE=.\newfile_icon.ico -# End Source File -# Begin Source File - -SOURCE=.\newfile_project.ico -# End Source File -# Begin Source File - -SOURCE=.\newfile_sbp.ico -# End Source File -# Begin Source File - -SOURCE=.\newfile_text.ico -# End Source File -# Begin Source File - -SOURCE=.\pair_statement.ico -# End Source File -# Begin Source File - -SOURCE=.\ToolbarIcon_Debugger\Pause.ico -# End Source File -# Begin Source File - -SOURCE=.\Procedure.ico -# End Source File -# Begin Source File - -SOURCE=.\program_folder.ico -# End Source File -# Begin Source File - -SOURCE=.\ToolbarIcon_Debugger\StepIn.ico -# End Source File -# Begin Source File - -SOURCE=.\ToolbarIcon_Debugger\StepOver.ico -# End Source File -# Begin Source File - -SOURCE=.\ToolbarIcon_Debugger\StepToCursor.ico -# End Source File -# Begin Source File - -SOURCE=.\ToolbarIcon_Debugger\Stop.ico -# End Source File -# Begin Source File - -SOURCE=.\TextDocument.ico -# End Source File -# Begin Source File - -SOURCE=.\TOOLBAR1.BMP -# End Source File -# Begin Source File - -SOURCE=.\toolbar2.bmp -# End Source File -# Begin Source File - -SOURCE=.\toolbar_basic_disabled.bmp -# End Source File -# Begin Source File - -SOURCE=.\toolbar_debugger.bmp -# End Source File -# Begin Source File - -SOURCE=.\toolbar_icon.bmp -# End Source File -# Begin Source File - -SOURCE=.\toolbar_standard.bmp -# End Source File -# Begin Source File - -SOURCE=.\toolbar_standard_disabled.bmp -# End Source File -# Begin Source File - -SOURCE=.\Window.ico -# End Source File -# Begin Source File - -SOURCE=.\zoomin.ico -# End Source File -# Begin Source File - -SOURCE=.\zoomout.ico -# End Source File -# End Group -# End Target -# End Project Index: trunk/ab5.0/abdev/res/res.dsw =================================================================== --- trunk/ab5.0/abdev/res/res.dsw (revision 824) +++ (revision ) @@ -1,29 +1,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# 警告: このﾜｰｸｽﾍﾟｰｽ ﾌｧｲﾙ を編集または削除しないでください! - -############################################################################### - -Project: "res"=.\res.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - Index: trunk/ab5.0/abdev/res/res.vcproj =================================================================== --- trunk/ab5.0/abdev/res/res.vcproj (revision 825) +++ trunk/ab5.0/abdev/res/res.vcproj (revision 825) @@ -0,0 +1,342 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/ab5.0/jenga/projects/jenga/jenga.vcproj =================================================================== --- trunk/ab5.0/jenga/projects/jenga/jenga.vcproj (revision 824) +++ trunk/ab5.0/jenga/projects/jenga/jenga.vcproj (revision 825) @@ -11,4 +11,7 @@ Name="Win32" /> + @@ -16,8 +19,7 @@ @@ -39,15 +41,10 @@ - - - - - - - - - - - - - - - - - @@ -193,5 +118,4 @@ + + + + + + + + + + + + + + + + +