| Revision | d92ec49ac7e12dbeef1445c51a9b190e307ef1db (tree) |
|---|---|
| Time | 2012-04-15 10:43:24 |
| Author | Hirami <tomohisa.hirami@nift...> |
| Commiter | Hirami |
Merge branch 'win32'
Win32/Tombo/Tombo.sln (diff) Win32/Tombo/Tombo/Tombo.vcxproj (diff) Win32/Tombo/Tombo/Tombo.vcxproj.filters (diff)| @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00 | ||
| 3 | 3 | # Visual Studio 2010 |
| 4 | 4 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tombo", "Tombo\Tombo.vcxproj", "{BD1B7E25-9555-4F73-B3F9-4AD2C559F235}" |
| 5 | 5 | EndProject |
| 6 | -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest", "..\..\UnitTest\UnitTest\UnitTest.vcxproj", "{AA7FA4D1-39CD-42D3-BAA5-A4E590786134}" | |
| 7 | -EndProject | |
| 8 | 6 | Global |
| 9 | 7 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
| 10 | 8 | Debug|Win32 = Debug|Win32 |
| @@ -14,10 +12,6 @@ Global | ||
| 14 | 12 | {BD1B7E25-9555-4F73-B3F9-4AD2C559F235}.Debug|Win32.ActiveCfg = Debug|Win32 |
| 15 | 13 | {BD1B7E25-9555-4F73-B3F9-4AD2C559F235}.Release|Win32.ActiveCfg = Release|Win32 |
| 16 | 14 | {BD1B7E25-9555-4F73-B3F9-4AD2C559F235}.Release|Win32.Build.0 = Release|Win32 |
| 17 | - {AA7FA4D1-39CD-42D3-BAA5-A4E590786134}.Debug|Win32.ActiveCfg = Debug|Win32 | |
| 18 | - {AA7FA4D1-39CD-42D3-BAA5-A4E590786134}.Debug|Win32.Build.0 = Debug|Win32 | |
| 19 | - {AA7FA4D1-39CD-42D3-BAA5-A4E590786134}.Release|Win32.ActiveCfg = Release|Win32 | |
| 20 | - {AA7FA4D1-39CD-42D3-BAA5-A4E590786134}.Release|Win32.Build.0 = Release|Win32 | |
| 21 | 15 | EndGlobalSection |
| 22 | 16 | GlobalSection(SolutionProperties) = preSolution |
| 23 | 17 | HideSolutionNode = FALSE |
| @@ -47,7 +47,7 @@ | ||
| 47 | 47 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| 48 | 48 | <ClCompile> |
| 49 | 49 | <Optimization>Disabled</Optimization> |
| 50 | - <AdditionalIncludeDirectories>../../../../Tombo\oniguruma;../../../../Tombo\Src\TomboLib;../../../../Tombo\expat\include;../../../../Tombo\Win32\Tombo\res;../../../../Tombo\Src;../../../../Tombo\Src\YAEdit;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 50 | + <AdditionalIncludeDirectories>../../../../Tombo\Win32\oniguruma;../../../../Tombo\Src\TomboLib;../../../../Tombo\Win32\expat\include;../../../../Tombo\Win32\Tombo\res;../../../../Tombo\Src;../../../../Tombo\Src\YAEdit;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 51 | 51 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;TOMBO;PLATFORM_WIN32;MBCS;_CRT_SECURE_NO_DEPRECATE</PreprocessorDefinitions> |
| 52 | 52 | <MinimalRebuild>true</MinimalRebuild> |
| 53 | 53 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
| @@ -240,15 +240,15 @@ | ||
| 240 | 240 | <ResourceCompile Include="..\res\Tombo.rc" /> |
| 241 | 241 | </ItemGroup> |
| 242 | 242 | <ItemGroup> |
| 243 | - <Library Include="..\..\..\expat\lib\Win32\libexpatw.lib" /> | |
| 244 | - <Library Include="..\..\..\oniguruma\win32\oniguruma.lib" /> | |
| 245 | - </ItemGroup> | |
| 246 | - <ItemGroup> | |
| 247 | 243 | <None Include="..\..\..\Src\image\draftimg.bmp" /> |
| 248 | 244 | <None Include="..\..\..\Src\image\memoimg.bmp" /> |
| 249 | 245 | <None Include="..\..\..\Src\image\Tombo.ICO" /> |
| 250 | 246 | <None Include="..\..\..\Src\image\toolbar.bmp" /> |
| 251 | 247 | </ItemGroup> |
| 248 | + <ItemGroup> | |
| 249 | + <Library Include="..\..\expat\lib\Win32\libexpatw.lib" /> | |
| 250 | + <Library Include="..\..\oniguruma\win32\oniguruma.lib" /> | |
| 251 | + </ItemGroup> | |
| 252 | 252 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 253 | 253 | <ImportGroup Label="ExtensionTargets"> |
| 254 | 254 | </ImportGroup> |
| @@ -471,10 +471,6 @@ | ||
| 471 | 471 | </ResourceCompile> |
| 472 | 472 | </ItemGroup> |
| 473 | 473 | <ItemGroup> |
| 474 | - <Library Include="..\..\..\expat\lib\Win32\libexpatw.lib" /> | |
| 475 | - <Library Include="..\..\..\oniguruma\win32\oniguruma.lib" /> | |
| 476 | - </ItemGroup> | |
| 477 | - <ItemGroup> | |
| 478 | 474 | <None Include="..\..\..\Src\image\memoimg.bmp"> |
| 479 | 475 | <Filter>リソース ファイル</Filter> |
| 480 | 476 | </None> |
| @@ -488,4 +484,8 @@ | ||
| 488 | 484 | <Filter>リソース ファイル</Filter> |
| 489 | 485 | </None> |
| 490 | 486 | </ItemGroup> |
| 487 | + <ItemGroup> | |
| 488 | + <Library Include="..\..\expat\lib\Win32\libexpatw.lib" /> | |
| 489 | + <Library Include="..\..\oniguruma\win32\oniguruma.lib" /> | |
| 490 | + </ItemGroup> | |
| 491 | 491 | </Project> |
| \ No newline at end of file |
Fork