Changeset 781 in dev


Ignore:
Timestamp:
Jan 27, 2011, 12:39:13 AM (14 years ago)
Author:
イグトランス (egtra)
Message:

abdev新ソース用プロジェクトabdev-implとAB全体の単体テスト用プロジェクトab-testの追加。LoadIcon代替関数の作成（テスト未記述）。

Location:
branches/egtra/ab5.0/abdev
Files:
18 added
6 edited

Legend:

Unmodified
Added
Removed

  • branches/egtra/ab5.0/abdev/ab.sln

    r777 r781  
    99EndProject
    1010Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jenga", "..\jenga\projects\jenga\jenga.vcxproj", "{F01805B6-65B4-4708-88F4-A5E07DEA9FBD}"
     11EndProject
     12Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ab-test", "ab-test\ab-test.vcxproj", "{B91DE511-E024-4EB9-B5FD-B2043E79AE44}"
     13EndProject
     14Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "abdev-impl", "abdev-impl\abdev-impl.vcxproj", "{58FF88A2-86BC-4480-95F4-71AF693FEF28}"
    1115EndProject
    1216Global
    … …  
    3236        {DC1B787E-510F-4F7D-8F9A-182600904D83}.Release|Win32.Build.0 = Release|Win32
    3337        {DC1B787E-510F-4F7D-8F9A-182600904D83}.Release|x64.ActiveCfg = Release|x64
    34         {DC1B787E-510F-4F7D-8F9A-182600904D83}.Release|x64.Build.0 = Release|x64
    3538        {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|Win32.ActiveCfg = Debug|Win32
    3639        {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|Win32.Build.0 = Debug|Win32
    … …  
    4952        {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|x64.ActiveCfg = Release|x64
    5053        {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|x64.Build.0 = Release|x64
     54        {B91DE511-E024-4EB9-B5FD-B2043E79AE44}.Debug|Win32.ActiveCfg = Debug|Win32
     55        {B91DE511-E024-4EB9-B5FD-B2043E79AE44}.Debug|Win32.Build.0 = Debug|Win32
     56        {B91DE511-E024-4EB9-B5FD-B2043E79AE44}.Debug|x64.ActiveCfg = Debug|x64
     57        {B91DE511-E024-4EB9-B5FD-B2043E79AE44}.Debug|x64.Build.0 = Debug|x64
     58        {B91DE511-E024-4EB9-B5FD-B2043E79AE44}.Release|Win32.ActiveCfg = Release|Win32
     59        {B91DE511-E024-4EB9-B5FD-B2043E79AE44}.Release|Win32.Build.0 = Release|Win32
     60        {B91DE511-E024-4EB9-B5FD-B2043E79AE44}.Release|x64.ActiveCfg = Release|x64
     61        {B91DE511-E024-4EB9-B5FD-B2043E79AE44}.Release|x64.Build.0 = Release|x64
     62        {58FF88A2-86BC-4480-95F4-71AF693FEF28}.Debug|Win32.ActiveCfg = Debug|Win32
     63        {58FF88A2-86BC-4480-95F4-71AF693FEF28}.Debug|Win32.Build.0 = Debug|Win32
     64        {58FF88A2-86BC-4480-95F4-71AF693FEF28}.Debug|x64.ActiveCfg = Debug|x64
     65        {58FF88A2-86BC-4480-95F4-71AF693FEF28}.Debug|x64.Build.0 = Debug|x64
     66        {58FF88A2-86BC-4480-95F4-71AF693FEF28}.Release|Win32.ActiveCfg = Release|Win32
     67        {58FF88A2-86BC-4480-95F4-71AF693FEF28}.Release|Win32.Build.0 = Release|Win32
     68        {58FF88A2-86BC-4480-95F4-71AF693FEF28}.Release|x64.ActiveCfg = Release|x64
     69        {58FF88A2-86BC-4480-95F4-71AF693FEF28}.Release|x64.Build.0 = Release|x64
    5170    EndGlobalSection
    5271    GlobalSection(SolutionProperties) = preSolution

  • branches/egtra/ab5.0/abdev/ab_common/ab_common.vcxproj

    r778 r781  
    6565  <PropertyGroup>
    6666    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    67     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(Platform)\</OutDir>
     67    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)-$(Platform)\</OutDir>
    6868    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(Platform)\</IntDir>
    69     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)-$(Platform)\</OutDir>
     69    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)-$(Platform)\</OutDir>
    7070    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)-$(Platform)\</IntDir>
    71     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(Platform)\</OutDir>
     71    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)-$(Platform)\</OutDir>
    7272    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(Platform)\</IntDir>
    73     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)-$(Platform)\</OutDir>
     73    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)-$(Platform)\</OutDir>
    7474    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)-$(Platform)\</IntDir>
    7575  </PropertyGroup>

  • branches/egtra/ab5.0/abdev/abdev/abdev.vcxproj

    r778 r781  
    2626  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2727    <ConfigurationType>Application</ConfigurationType>
    28     <UseOfMfc>false</UseOfMfc>
    2928    <CharacterSet>MultiByte</CharacterSet>
    3029    <PlatformToolset>Windows7.1SDK</PlatformToolset>
     30    <WholeProgramOptimization>true</WholeProgramOptimization>
    3131  </PropertyGroup>
    3232  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3333    <ConfigurationType>Application</ConfigurationType>
    34     <UseOfMfc>false</UseOfMfc>
    3534    <CharacterSet>MultiByte</CharacterSet>
    3635    <PlatformToolset>Windows7.1SDK</PlatformToolset>
    … …  
    3837  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3938    <ConfigurationType>Application</ConfigurationType>
    40     <UseOfMfc>false</UseOfMfc>
    4139    <CharacterSet>MultiByte</CharacterSet>
    4240    <PlatformToolset>Windows7.1SDK</PlatformToolset>
     41    <WholeProgramOptimization>true</WholeProgramOptimization>
    4342  </PropertyGroup>
    4443  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    4544    <ConfigurationType>Application</ConfigurationType>
    46     <UseOfMfc>false</UseOfMfc>
    4745    <CharacterSet>MultiByte</CharacterSet>
    4846    <PlatformToolset>Windows7.1SDK</PlatformToolset>
    … …  
    5553    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5654    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
     55    <Import Project="..\ab-common-32.props" />
    5756  </ImportGroup>
    5857  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5958    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6059    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
     60    <Import Project="..\ab-common-32.props" />
    6161  </ImportGroup>
    6262  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    … …  
    7272    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    7373    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\build\$(Configuration)\</OutDir>
    74     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(Platform)\</IntDir>
     74    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)-$(Platform)\</IntDir>
    7575    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    7676    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)-$(Platform)\</OutDir>
    77     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)-$(Platform)\</IntDir>
     77    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)-$(Platform)\</IntDir>
    7878    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    7979    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\build\$(Configuration)\</OutDir>
    80     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(Platform)\</IntDir>
     80    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)-$(Platform)\</IntDir>
    8181    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    8282    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)-$(Platform)\</OutDir>
    83     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)-$(Platform)\</IntDir>
     83    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)-$(Platform)\</IntDir>
    8484    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    85     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">abdev</TargetName>
    86     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">abdev</TargetName>
    87     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">abdev</TargetName>
    88     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">abdev</TargetName>
    8985  </PropertyGroup>
    9086  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    … …  
    262258  </ItemDefinitionGroup>
    263259  <ItemGroup>
     260    <ProjectReference Include="..\abdev-impl\abdev-impl.vcxproj">
     261      <Project>{58ff88a2-86bc-4480-95f4-71af693fef28}</Project>
     262      <Private>true</Private>
     263      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     264      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
     265      <LinkLibraryDependencies>true</LinkLibraryDependencies>
     266      <UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
     267    </ProjectReference>
    264268    <ProjectReference Include="..\ab_common\ab_common.vcxproj">
    265269      <Project>{87835c33-64c9-4ba5-9b39-608ba5394387}</Project>

  • branches/egtra/ab5.0/abdev/compiler.vcxproj

    r777 r781  
    202202      <AdditionalLibraryDirectories>..\jenga\lib\x86;lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    203203      <GenerateDebugInformation>true</GenerateDebugInformation>
    204       <ProgramDatabaseFile>.\Release/BasicCompiler32.pdb</ProgramDatabaseFile>
    205204      <GenerateMapFile>true</GenerateMapFile>
    206205      <SubSystem>Console</SubSystem>

  • branches/egtra/ab5.0/abdev/res/res.vcxproj

    r777 r781  
    1414  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    1515    <ConfigurationType>DynamicLibrary</ConfigurationType>
    16     <UseOfMfc>false</UseOfMfc>
    17     <CharacterSet>MultiByte</CharacterSet>
    1816    <PlatformToolset>Windows7.1SDK</PlatformToolset>
    1917  </PropertyGroup>
    2018  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    2119  <ImportGroup Label="ExtensionSettings">
     20    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
    2221  </ImportGroup>
    2322  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    … …  
    2726  <PropertyGroup Label="UserMacros" />
    2827  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    29     <LinkIncremental>false</LinkIncremental>
    30     <OutDir>$(SolutionDir)..\ActiveBasic\SubOperation\</OutDir>
     28    <OutDir>$(SolutionDir)..\build\release\system\</OutDir>
    3129  </PropertyGroup>
    3230  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … …  
    3735      <FunctionLevelLinking>true</FunctionLevelLinking>
    3836      <Optimization>MaxSpeed</Optimization>
    39       <SuppressStartupBanner>true</SuppressStartupBanner>
    40       <WarningLevel>Level3</WarningLevel>
     37      <WarningLevel>Level4</WarningLevel>
    4138      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;RES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    42       <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
    4339      <PrecompiledHeaderOutputFile>.\Release\res.pch</PrecompiledHeaderOutputFile>
    44       <ObjectFileName>.\Release\</ObjectFileName>
    45       <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
    4640    </ClCompile>
    4741    <Midl>
    … …  
    6256    <Link>
    6357      <LinkDLL>true</LinkDLL>
    64       <ImportLibrary>.\Release\res.lib</ImportLibrary>
    6558      <NoEntryPoint>true</NoEntryPoint>
    6659    </Link>
    … …  
    122115    <CustomBuild Include="zoomout.ico" />
    123116  </ItemGroup>
     117  <ItemGroup>
     118    <ClInclude Include="resource.h" />
     119  </ItemGroup>
    124120  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    125121  <ImportGroup Label="ExtensionTargets">
     122    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
    126123  </ImportGroup>
    127124</Project>

  • branches/egtra/ab5.0/abdev/res/res.vcxproj.filters

    r777 r781  
    175175    </CustomBuild>
    176176  </ItemGroup>
     177  <ItemGroup>
     178    <ClInclude Include="resource.h">
     179      <Filter>Header Files</Filter>
     180    </ClInclude>
     181  </ItemGroup>
    177182</Project>
Note: See TracChangeset for help on using the changeset viewer.