Changeset 828 in dev for trunk/ab5.0/abdev/ab.sln


Ignore:
Timestamp:
Mar 19, 2012, 1:59:48 AM (13 years ago)
Author:
イグトランス (egtra)
Message:

egtraブランチの内容をマージ。

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/ab5.0/abdev

    • Property svn:ignore set to
      *.opensdf
      *.sdf
      *.suo
      *.user
      int
      ipch
      out

  • trunk/ab5.0/abdev/ab.sln

    r825 r828  
    11
    2 Microsoft Visual Studio Solution File, Format Version 9.00
    3 # Visual Studio 2005
    4 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jenga", "..\jenga\projects\jenga\jenga.vcproj", "{F01805B6-65B4-4708-88F4-A5E07DEA9FBD}"
     2Microsoft Visual Studio Solution File, Format Version 11.00
     3# Visual Studio 2010
     4Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compiler", "compiler.vcxproj", "{11F0E9AB-EAEC-4616-A9DD-838073342CBB}"
    55EndProject
    6 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ab_common", "ab_common\ab_common.vcproj", "{87835C33-64C9-4BA5-9B39-608BA5394387}"
     6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "abdev", "abdev\abdev.vcxproj", "{DC1B787E-510F-4F7D-8F9A-182600904D83}"
     7    ProjectSection(ProjectDependencies) = postProject
     8        {D4E28FAB-FF4C-AA37-608F-28BC70C05ED9} = {D4E28FAB-FF4C-AA37-608F-28BC70C05ED9}
     9        {634BD4DB-1BB9-5CF1-C1AE-2CFB4209C080} = {634BD4DB-1BB9-5CF1-C1AE-2CFB4209C080}
     10    EndProjectSection
    711EndProject
    8 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "abdev", "abdev\abdev.vcproj", "{DC1B787E-510F-4F7D-8F9A-182600904D83}"
     12Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ab_common", "ab_common\ab_common.vcxproj", "{87835C33-64C9-4BA5-9B39-608BA5394387}"
    913EndProject
    10 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compiler", "compiler_x86\compiler.vcproj", "{11F0E9AB-EAEC-4616-A9DD-838073342CBB}"
     14Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jenga", "..\jenga\projects\jenga\jenga.vcxproj", "{F01805B6-65B4-4708-88F4-A5E07DEA9FBD}"
    1115EndProject
    12 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "res", "res\res.vcproj", "{BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}"
     16Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ab-test", "ab-test\ab-test.vcxproj", "{B91DE511-E024-4EB9-B5FD-B2043E79AE44}"
    1317EndProject
    14 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icon_res", "icon_res\icon_res.vcproj", "{C487D66E-BED6-4046-9120-8F6BC9F1B300}"
     18Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "abdev-impl", "abdev-impl\abdev-impl.vcxproj", "{58FF88A2-86BC-4480-95F4-71AF693FEF28}"
     19EndProject
     20Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icon_res", "icon_res\icon_res.vcxproj", "{634BD4DB-1BB9-5CF1-C1AE-2CFB4209C080}"
     21EndProject
     22Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "res", "res\res.vcxproj", "{D4E28FAB-FF4C-AA37-608F-28BC70C05ED9}"
     23EndProject
     24Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compiler-impl", "compiler-impl\compiler-impl.vcxproj", "{0BD5002D-76EB-4BC4-9FBB-CA74D956B1FE}"
    1525EndProject
    1626Global
    … …  
    2232    EndGlobalSection
    2333    GlobalSection(ProjectConfigurationPlatforms) = postSolution
     34        {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Debug|Win32.ActiveCfg = Debug|Win32
     35        {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Debug|Win32.Build.0 = Debug|Win32
     36        {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Debug|x64.ActiveCfg = Debug|x64
     37        {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Debug|x64.Build.0 = Debug|x64
     38        {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Release|Win32.ActiveCfg = Release|Win32
     39        {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Release|Win32.Build.0 = Release|Win32
     40        {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Release|x64.ActiveCfg = Release|x64
     41        {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Release|x64.Build.0 = Release|x64
     42        {DC1B787E-510F-4F7D-8F9A-182600904D83}.Debug|Win32.ActiveCfg = Debug|Win32
     43        {DC1B787E-510F-4F7D-8F9A-182600904D83}.Debug|Win32.Build.0 = Debug|Win32
     44        {DC1B787E-510F-4F7D-8F9A-182600904D83}.Debug|x64.ActiveCfg = Debug|Win32
     45        {DC1B787E-510F-4F7D-8F9A-182600904D83}.Release|Win32.ActiveCfg = Release|Win32
     46        {DC1B787E-510F-4F7D-8F9A-182600904D83}.Release|Win32.Build.0 = Release|Win32
     47        {DC1B787E-510F-4F7D-8F9A-182600904D83}.Release|x64.ActiveCfg = Release|x64
     48        {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|Win32.ActiveCfg = Debug|Win32
     49        {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|Win32.Build.0 = Debug|Win32
     50        {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|x64.ActiveCfg = Debug|x64
     51        {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|x64.Build.0 = Debug|x64
     52        {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|Win32.ActiveCfg = Release|Win32
     53        {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|Win32.Build.0 = Release|Win32
     54        {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|x64.ActiveCfg = Release|x64
     55        {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|x64.Build.0 = Release|x64
    2456        {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|Win32.ActiveCfg = Debug|Win32
    2557        {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|Win32.Build.0 = Debug|Win32
    … …  
    3062        {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|x64.ActiveCfg = Release|x64
    3163        {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|x64.Build.0 = Release|x64
    32         {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|Win32.ActiveCfg = Debug|Win32
    33         {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|Win32.Build.0 = Debug|Win32
    34         {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|x64.ActiveCfg = Debug|x64
    35         {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|x64.Build.0 = Debug|x64
    36         {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|Win32.ActiveCfg = Release|Win32
    37         {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|Win32.Build.0 = Release|Win32
    38         {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|x64.ActiveCfg = Release|x64
    39         {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|x64.Build.0 = Release|x64
    40         {DC1B787E-510F-4F7D-8F9A-182600904D83}.Debug|Win32.ActiveCfg = Debug|Win32
    41         {DC1B787E-510F-4F7D-8F9A-182600904D83}.Debug|Win32.Build.0 = Debug|Win32
    42         {DC1B787E-510F-4F7D-8F9A-182600904D83}.Debug|x64.ActiveCfg = Debug|x64
    43         {DC1B787E-510F-4F7D-8F9A-182600904D83}.Release|Win32.ActiveCfg = Release|Win32
    44         {DC1B787E-510F-4F7D-8F9A-182600904D83}.Release|Win32.Build.0 = Release|Win32
    45         {DC1B787E-510F-4F7D-8F9A-182600904D83}.Release|x64.ActiveCfg = Release|x64
    46         {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Debug|Win32.ActiveCfg = Debug|Win32
    47         {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Debug|Win32.Build.0 = Debug|Win32
    48         {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Debug|x64.ActiveCfg = Debug|x64
    49         {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Debug|x64.Build.0 = Debug|x64
    50         {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Release|Win32.ActiveCfg = Release|Win32
    51         {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Release|Win32.Build.0 = Release|Win32
    52         {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Release|x64.ActiveCfg = Release|x64
    53         {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Release|x64.Build.0 = Release|x64
    54         {BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}.Debug|Win32.ActiveCfg = Release|Win32
    55         {BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}.Debug|Win32.Build.0 = Release|Win32
    56         {BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}.Debug|x64.ActiveCfg = Release|Win32
    57         {BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}.Debug|x64.Build.0 = Release|Win32
    58         {BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}.Release|Win32.ActiveCfg = Release|Win32
    59         {BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}.Release|Win32.Build.0 = Release|Win32
    60         {BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}.Release|x64.ActiveCfg = Release|Win32
    61         {BA6AC6FD-A1A0-4C01-B73C-863FE80D6E9B}.Release|x64.Build.0 = Release|Win32
    62         {C487D66E-BED6-4046-9120-8F6BC9F1B300}.Debug|Win32.ActiveCfg = Release|Win32
    63         {C487D66E-BED6-4046-9120-8F6BC9F1B300}.Debug|Win32.Build.0 = Release|Win32
    64         {C487D66E-BED6-4046-9120-8F6BC9F1B300}.Debug|x64.ActiveCfg = Release|Win32
    65         {C487D66E-BED6-4046-9120-8F6BC9F1B300}.Debug|x64.Build.0 = Release|Win32
    66         {C487D66E-BED6-4046-9120-8F6BC9F1B300}.Release|Win32.ActiveCfg = Release|Win32
    67         {C487D66E-BED6-4046-9120-8F6BC9F1B300}.Release|Win32.Build.0 = Release|Win32
    68         {C487D66E-BED6-4046-9120-8F6BC9F1B300}.Release|x64.ActiveCfg = Release|Win32
    69         {C487D66E-BED6-4046-9120-8F6BC9F1B300}.Release|x64.Build.0 = Release|Win32
     64        {B91DE511-E024-4EB9-B5FD-B2043E79AE44}.Debug|Win32.ActiveCfg = Debug|Win32
     65        {B91DE511-E024-4EB9-B5FD-B2043E79AE44}.Debug|Win32.Build.0 = Debug|Win32
     66        {B91DE511-E024-4EB9-B5FD-B2043E79AE44}.Debug|x64.ActiveCfg = Debug|x64
     67        {B91DE511-E024-4EB9-B5FD-B2043E79AE44}.Debug|x64.Build.0 = Debug|x64
     68        {B91DE511-E024-4EB9-B5FD-B2043E79AE44}.Release|Win32.ActiveCfg = Release|Win32
     69        {B91DE511-E024-4EB9-B5FD-B2043E79AE44}.Release|Win32.Build.0 = Release|Win32
     70        {B91DE511-E024-4EB9-B5FD-B2043E79AE44}.Release|x64.ActiveCfg = Release|x64
     71        {B91DE511-E024-4EB9-B5FD-B2043E79AE44}.Release|x64.Build.0 = Release|x64
     72        {58FF88A2-86BC-4480-95F4-71AF693FEF28}.Debug|Win32.ActiveCfg = Debug|Win32
     73        {58FF88A2-86BC-4480-95F4-71AF693FEF28}.Debug|Win32.Build.0 = Debug|Win32
     74        {58FF88A2-86BC-4480-95F4-71AF693FEF28}.Debug|x64.ActiveCfg = Debug|x64
     75        {58FF88A2-86BC-4480-95F4-71AF693FEF28}.Debug|x64.Build.0 = Debug|x64
     76        {58FF88A2-86BC-4480-95F4-71AF693FEF28}.Release|Win32.ActiveCfg = Release|Win32
     77        {58FF88A2-86BC-4480-95F4-71AF693FEF28}.Release|Win32.Build.0 = Release|Win32
     78        {58FF88A2-86BC-4480-95F4-71AF693FEF28}.Release|x64.ActiveCfg = Release|x64
     79        {58FF88A2-86BC-4480-95F4-71AF693FEF28}.Release|x64.Build.0 = Release|x64
     80        {634BD4DB-1BB9-5CF1-C1AE-2CFB4209C080}.Debug|Win32.ActiveCfg = AB_Release|Win32
     81        {634BD4DB-1BB9-5CF1-C1AE-2CFB4209C080}.Debug|Win32.Build.0 = AB_Release|Win32
     82        {634BD4DB-1BB9-5CF1-C1AE-2CFB4209C080}.Debug|x64.ActiveCfg = AB_Release|Win32
     83        {634BD4DB-1BB9-5CF1-C1AE-2CFB4209C080}.Release|Win32.ActiveCfg = AB_Release|Win32
     84        {634BD4DB-1BB9-5CF1-C1AE-2CFB4209C080}.Release|Win32.Build.0 = AB_Release|Win32
     85        {634BD4DB-1BB9-5CF1-C1AE-2CFB4209C080}.Release|x64.ActiveCfg = AB_Release|Win32
     86        {D4E28FAB-FF4C-AA37-608F-28BC70C05ED9}.Debug|Win32.ActiveCfg = Release|Win32
     87        {D4E28FAB-FF4C-AA37-608F-28BC70C05ED9}.Debug|Win32.Build.0 = Release|Win32
     88        {D4E28FAB-FF4C-AA37-608F-28BC70C05ED9}.Debug|x64.ActiveCfg = Release|Win32
     89        {D4E28FAB-FF4C-AA37-608F-28BC70C05ED9}.Release|Win32.ActiveCfg = Release|Win32
     90        {D4E28FAB-FF4C-AA37-608F-28BC70C05ED9}.Release|Win32.Build.0 = Release|Win32
     91        {D4E28FAB-FF4C-AA37-608F-28BC70C05ED9}.Release|x64.ActiveCfg = Release|Win32
     92        {0BD5002D-76EB-4BC4-9FBB-CA74D956B1FE}.Debug|Win32.ActiveCfg = Debug|Win32
     93        {0BD5002D-76EB-4BC4-9FBB-CA74D956B1FE}.Debug|Win32.Build.0 = Debug|Win32
     94        {0BD5002D-76EB-4BC4-9FBB-CA74D956B1FE}.Debug|x64.ActiveCfg = Debug|x64
     95        {0BD5002D-76EB-4BC4-9FBB-CA74D956B1FE}.Debug|x64.Build.0 = Debug|x64
     96        {0BD5002D-76EB-4BC4-9FBB-CA74D956B1FE}.Release|Win32.ActiveCfg = Release|Win32
     97        {0BD5002D-76EB-4BC4-9FBB-CA74D956B1FE}.Release|Win32.Build.0 = Release|Win32
     98        {0BD5002D-76EB-4BC4-9FBB-CA74D956B1FE}.Release|x64.ActiveCfg = Release|x64
     99        {0BD5002D-76EB-4BC4-9FBB-CA74D956B1FE}.Release|x64.Build.0 = Release|x64
    70100    EndGlobalSection
    71101    GlobalSection(SolutionProperties) = preSolution
Note: See TracChangeset for help on using the changeset viewer.