mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix VS solution and test
This commit is contained in:
Ted John
Marijn van der Werf
parent
a30f2b8f7f
commit
de5aa4b7d6
16
openrct2.sln
16
openrct2.sln
|
|
@ -5,6 +5,12 @@ VisualStudioVersion = 14.0.25420.1
|
|||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openrct2", "openrct2.vcxproj", "{D24D94F6-2A74-480C-B512-629C306CE92F}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testpaint", "test\testpaint\testpaint.vcxproj", "{57E60BA1-FB76-4316-909E-C1449C142327}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2202A816-377D-4FA0-A7AF-7D4105F8A4FB}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{480B577D-4E4A-4757-9A42-28A9AD33E6B0}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
|
|
@ -21,8 +27,18 @@ Global
|
|||
{D24D94F6-2A74-480C-B512-629C306CE92F}.Release|Win32.Build.0 = Release|Win32
|
||||
{D24D94F6-2A74-480C-B512-629C306CE92F}.Release|x64.ActiveCfg = Release|x64
|
||||
{D24D94F6-2A74-480C-B512-629C306CE92F}.Release|x64.Build.0 = Release|x64
|
||||
{57E60BA1-FB76-4316-909E-C1449C142327}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{57E60BA1-FB76-4316-909E-C1449C142327}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{57E60BA1-FB76-4316-909E-C1449C142327}.Debug|x64.ActiveCfg = Debug|Win32
|
||||
{57E60BA1-FB76-4316-909E-C1449C142327}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{57E60BA1-FB76-4316-909E-C1449C142327}.Release|Win32.Build.0 = Release|Win32
|
||||
{57E60BA1-FB76-4316-909E-C1449C142327}.Release|x64.ActiveCfg = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{D24D94F6-2A74-480C-B512-629C306CE92F} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB}
|
||||
{57E60BA1-FB76-4316-909E-C1449C142327} = {480B577D-4E4A-4757-9A42-28A9AD33E6B0}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{57E60BA1-FB76-4316-909E-C1449C142327}</ProjectGuid>
|
||||
<RootNamespace>PaintUnitTest</RootNamespace>
|
||||
<RootNamespace>testpaint</RootNamespace>
|
||||
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
|
|
@ -42,7 +42,14 @@
|
|||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<OutDir>$(SolutionDir)bin\</OutDir>
|
||||
<OutDir>$(SolutionDir)bin\testpaint</OutDir>
|
||||
<IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<TargetName>openrct2</TargetName>
|
||||
<IncludePath>$(SolutionDir)lib\include;$(SolutionDir)lib\include\breakpad;$(SolutionDir)lib\include\libspeex;$(SolutionDir)lib\include\sdl;$(SolutionDir)lib\include\jansson;$(SolutionDir)lib\include\sdl_ttf;$(SolutionDir)lib\include\libpng;$(SolutionDir)lib\include\zlib;$(IncludePath)</IncludePath>
|
||||
<LibraryPath>$(SolutionDir)lib;$(LibraryPath)</LibraryPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<OutDir>$(SolutionDir)bin\testpaint</OutDir>
|
||||
<IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<TargetName>openrct2</TargetName>
|
||||
<IncludePath>$(SolutionDir)lib\include;$(SolutionDir)lib\include\breakpad;$(SolutionDir)lib\include\libspeex;$(SolutionDir)lib\include\sdl;$(SolutionDir)lib\include\jansson;$(SolutionDir)lib\include\sdl_ttf;$(SolutionDir)lib\include\libpng;$(SolutionDir)lib\include\zlib;$(IncludePath)</IncludePath>
|
||||
|
|
@ -70,96 +77,96 @@
|
|||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="test\testpaint\data.h" />
|
||||
<ClInclude Include="test\testpaint\intercept.h" />
|
||||
<ClInclude Include="data.h" />
|
||||
<ClInclude Include="intercept.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="test\testpaint\compat.c" />
|
||||
<ClCompile Include="test\testpaint\data.c" />
|
||||
<ClCompile Include="test\testpaint\intercept.c" />
|
||||
<ClCompile Include="test\testpaint\main.cpp" />
|
||||
<ClCompile Include="src\addresses.c" />
|
||||
<ClCompile Include="src\diagnostic.c" />
|
||||
<ClCompile Include="src\hook.c" />
|
||||
<ClCompile Include="src\paint\map_element\map_element.c" />
|
||||
<ClCompile Include="src\ride\coaster\air_powered_vertical_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\bobsleigh_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\compact_inverted_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\corkscrew_roller_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\flying_roller_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\giga_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\heartline_twister_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\inverted_hairpin_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\inverted_impulse_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\inverted_roller_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\junior_roller_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\lay_down_roller_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\lim_launched_roller_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\looping_roller_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\mine_ride.c" />
|
||||
<ClCompile Include="src\ride\coaster\mine_train_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\mini_roller_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\mini_suspended_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\multi_dimension_roller_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\reverser_roller_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\reverse_freefall_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\side_friction_roller_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\spiral_roller_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\stand_up_roller_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\steeplechase.c" />
|
||||
<ClCompile Include="src\ride\coaster\suspended_swinging_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\twister_roller_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\vertical_drop_roller_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\virginia_reel.c" />
|
||||
<ClCompile Include="src\ride\coaster\wild_mouse.c" />
|
||||
<ClCompile Include="src\ride\coaster\wooden_roller_coaster.c" />
|
||||
<ClCompile Include="src\ride\coaster\wooden_wild_mouse.c" />
|
||||
<ClCompile Include="src\ride\gentle\car_ride.c" />
|
||||
<ClCompile Include="src\ride\gentle\circus_show.c" />
|
||||
<ClCompile Include="src\ride\gentle\crooked_house.c" />
|
||||
<ClCompile Include="src\ride\gentle\dodgems.c" />
|
||||
<ClCompile Include="src\ride\gentle\ferris_wheel.c" />
|
||||
<ClCompile Include="src\ride\gentle\flying_saucers.c" />
|
||||
<ClCompile Include="src\ride\gentle\ghost_train.c" />
|
||||
<ClCompile Include="src\ride\gentle\haunted_house.c" />
|
||||
<ClCompile Include="src\ride\gentle\maze.c" />
|
||||
<ClCompile Include="src\ride\gentle\merry_go_round.c" />
|
||||
<ClCompile Include="src\ride\gentle\mini_golf.c" />
|
||||
<ClCompile Include="src\ride\gentle\mini_helicopters.c" />
|
||||
<ClCompile Include="src\ride\gentle\monorail_cycles.c" />
|
||||
<ClCompile Include="src\ride\gentle\observation_tower.c" />
|
||||
<ClCompile Include="src\ride\gentle\space_rings.c" />
|
||||
<ClCompile Include="src\ride\gentle\spiral_slide.c" />
|
||||
<ClCompile Include="src\ride\ride_data.c" />
|
||||
<ClCompile Include="src\ride\shops\facility.c" />
|
||||
<ClCompile Include="src\ride\shops\misc.c" />
|
||||
<ClCompile Include="src\ride\shops\shop.c" />
|
||||
<ClCompile Include="src\ride\thrill\3d_cinema.c" />
|
||||
<ClCompile Include="src\ride\thrill\enterprise.c" />
|
||||
<ClCompile Include="src\ride\thrill\go_karts.c" />
|
||||
<ClCompile Include="src\ride\thrill\launched_freefall.c" />
|
||||
<ClCompile Include="src\ride\thrill\magic_carpet.c" />
|
||||
<ClCompile Include="src\ride\thrill\motion_simulator.c" />
|
||||
<ClCompile Include="src\ride\thrill\pirate_ship.c" />
|
||||
<ClCompile Include="src\ride\thrill\roto_drop.c" />
|
||||
<ClCompile Include="src\ride\thrill\swinging_inverter_ship.c" />
|
||||
<ClCompile Include="src\ride\thrill\top_spin.c" />
|
||||
<ClCompile Include="src\ride\thrill\twist.c" />
|
||||
<ClCompile Include="src\ride\track_data.c" />
|
||||
<ClCompile Include="src\ride\track_paint.c" />
|
||||
<ClCompile Include="src\ride\transport\chairlift.c" />
|
||||
<ClCompile Include="src\ride\transport\lift.c" />
|
||||
<ClCompile Include="src\ride\transport\minature_railway.c" />
|
||||
<ClCompile Include="src\ride\transport\monorail.c" />
|
||||
<ClCompile Include="src\ride\transport\suspended_monorail.c" />
|
||||
<ClCompile Include="src\ride\water\boat_ride.c" />
|
||||
<ClCompile Include="src\ride\water\dingy_slide.c" />
|
||||
<ClCompile Include="src\ride\water\log_flume.c" />
|
||||
<ClCompile Include="src\ride\water\river_rafts.c" />
|
||||
<ClCompile Include="src\ride\water\river_rapids.c" />
|
||||
<ClCompile Include="src\ride\water\splash_boats.c" />
|
||||
<ClCompile Include="src\ride\water\submarine_ride.c" />
|
||||
<ClCompile Include="src\ride\water\water_coaster.c" />
|
||||
<ClCompile Include="compat.c" />
|
||||
<ClCompile Include="data.c" />
|
||||
<ClCompile Include="intercept.c" />
|
||||
<ClCompile Include="main.cpp" />
|
||||
<ClCompile Include="..\..\src\addresses.c" />
|
||||
<ClCompile Include="..\..\src\diagnostic.c" />
|
||||
<ClCompile Include="..\..\src\hook.c" />
|
||||
<ClCompile Include="..\..\src\paint\map_element\map_element.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\air_powered_vertical_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\bobsleigh_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\compact_inverted_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\corkscrew_roller_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\flying_roller_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\giga_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\heartline_twister_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\inverted_hairpin_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\inverted_impulse_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\inverted_roller_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\junior_roller_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\lay_down_roller_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\lim_launched_roller_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\looping_roller_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\mine_ride.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\mine_train_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\mini_roller_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\mini_suspended_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\multi_dimension_roller_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\reverser_roller_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\reverse_freefall_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\side_friction_roller_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\spiral_roller_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\stand_up_roller_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\steeplechase.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\suspended_swinging_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\twister_roller_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\vertical_drop_roller_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\virginia_reel.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\wild_mouse.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\wooden_roller_coaster.c" />
|
||||
<ClCompile Include="..\..\src\ride\coaster\wooden_wild_mouse.c" />
|
||||
<ClCompile Include="..\..\src\ride\gentle\car_ride.c" />
|
||||
<ClCompile Include="..\..\src\ride\gentle\circus_show.c" />
|
||||
<ClCompile Include="..\..\src\ride\gentle\crooked_house.c" />
|
||||
<ClCompile Include="..\..\src\ride\gentle\dodgems.c" />
|
||||
<ClCompile Include="..\..\src\ride\gentle\ferris_wheel.c" />
|
||||
<ClCompile Include="..\..\src\ride\gentle\flying_saucers.c" />
|
||||
<ClCompile Include="..\..\src\ride\gentle\ghost_train.c" />
|
||||
<ClCompile Include="..\..\src\ride\gentle\haunted_house.c" />
|
||||
<ClCompile Include="..\..\src\ride\gentle\maze.c" />
|
||||
<ClCompile Include="..\..\src\ride\gentle\merry_go_round.c" />
|
||||
<ClCompile Include="..\..\src\ride\gentle\mini_golf.c" />
|
||||
<ClCompile Include="..\..\src\ride\gentle\mini_helicopters.c" />
|
||||
<ClCompile Include="..\..\src\ride\gentle\monorail_cycles.c" />
|
||||
<ClCompile Include="..\..\src\ride\gentle\observation_tower.c" />
|
||||
<ClCompile Include="..\..\src\ride\gentle\space_rings.c" />
|
||||
<ClCompile Include="..\..\src\ride\gentle\spiral_slide.c" />
|
||||
<ClCompile Include="..\..\src\ride\ride_data.c" />
|
||||
<ClCompile Include="..\..\src\ride\shops\facility.c" />
|
||||
<ClCompile Include="..\..\src\ride\shops\misc.c" />
|
||||
<ClCompile Include="..\..\src\ride\shops\shop.c" />
|
||||
<ClCompile Include="..\..\src\ride\thrill\3d_cinema.c" />
|
||||
<ClCompile Include="..\..\src\ride\thrill\enterprise.c" />
|
||||
<ClCompile Include="..\..\src\ride\thrill\go_karts.c" />
|
||||
<ClCompile Include="..\..\src\ride\thrill\launched_freefall.c" />
|
||||
<ClCompile Include="..\..\src\ride\thrill\magic_carpet.c" />
|
||||
<ClCompile Include="..\..\src\ride\thrill\motion_simulator.c" />
|
||||
<ClCompile Include="..\..\src\ride\thrill\pirate_ship.c" />
|
||||
<ClCompile Include="..\..\src\ride\thrill\roto_drop.c" />
|
||||
<ClCompile Include="..\..\src\ride\thrill\swinging_inverter_ship.c" />
|
||||
<ClCompile Include="..\..\src\ride\thrill\top_spin.c" />
|
||||
<ClCompile Include="..\..\src\ride\thrill\twist.c" />
|
||||
<ClCompile Include="..\..\src\ride\track_data.c" />
|
||||
<ClCompile Include="..\..\src\ride\track_paint.c" />
|
||||
<ClCompile Include="..\..\src\ride\transport\chairlift.c" />
|
||||
<ClCompile Include="..\..\src\ride\transport\lift.c" />
|
||||
<ClCompile Include="..\..\src\ride\transport\minature_railway.c" />
|
||||
<ClCompile Include="..\..\src\ride\transport\monorail.c" />
|
||||
<ClCompile Include="..\..\src\ride\transport\suspended_monorail.c" />
|
||||
<ClCompile Include="..\..\src\ride\water\boat_ride.c" />
|
||||
<ClCompile Include="..\..\src\ride\water\dingy_slide.c" />
|
||||
<ClCompile Include="..\..\src\ride\water\log_flume.c" />
|
||||
<ClCompile Include="..\..\src\ride\water\river_rafts.c" />
|
||||
<ClCompile Include="..\..\src\ride\water\river_rapids.c" />
|
||||
<ClCompile Include="..\..\src\ride\water\splash_boats.c" />
|
||||
<ClCompile Include="..\..\src\ride\water\submarine_ride.c" />
|
||||
<ClCompile Include="..\..\src\ride\water\water_coaster.c" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
|
|
|
|||
Loading…
Reference in New Issue