Skip to content

Commit ec954cf

Browse files
smanderssmanders
committed
Ticket #1740: Migrate Code to Visual Studio 2010 (Update wx)
* renamed wxx projects to include vc8 * created new vc10 wxx projects * modified project settings so vc8 and vc10 can coexist * wxx projects no longer depend on version of wx in sdlExtern * fix link warning by adding "/Yldummylnk4206fix" to dummy.cpp (under Common Sources) git-svn-id: https://isrsvn.usurf.usu.edu/svn/isr/roots/wxWidgets/wxx/wxplotctrl@16054 a06e8daa-702c-0410-a579-eb5e6c4fa09d
1 parent cad0c4f commit ec954cf

8 files changed

Lines changed: 882 additions & 68 deletions

‎build/wxplotctrl.sln‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎build/wxplotctrl_sample_vc10.vcxproj‎

Lines changed: 225 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,225 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="ReleaseDLL|Win32">
9+
<Configuration>ReleaseDLL</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
</ItemGroup>
17+
<PropertyGroup Label="Globals">
18+
<ProjectName>plotctrl_sample</ProjectName>
19+
<ProjectGuid>{2FEF6C31-A20A-4067-9D98-A26464A41DE3}</ProjectGuid>
20+
<RootNamespace>plotctrl_sample</RootNamespace>
21+
</PropertyGroup>
22+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
23+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
24+
<ConfigurationType>Application</ConfigurationType>
25+
<UseOfMfc>false</UseOfMfc>
26+
</PropertyGroup>
27+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
28+
<ConfigurationType>Application</ConfigurationType>
29+
<UseOfMfc>false</UseOfMfc>
30+
</PropertyGroup>
31+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="Configuration">
32+
<ConfigurationType>Application</ConfigurationType>
33+
<UseOfMfc>false</UseOfMfc>
34+
</PropertyGroup>
35+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
36+
<ImportGroup Label="ExtensionSettings">
37+
</ImportGroup>
38+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
39+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
40+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
41+
</ImportGroup>
42+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
43+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
44+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
45+
</ImportGroup>
46+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets">
47+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
48+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
49+
</ImportGroup>
50+
<PropertyGroup Label="UserMacros" />
51+
<PropertyGroup>
52+
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
53+
<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">_vc8_$(Platform)_$(Configuration)\</OutDir>
54+
<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">_vc8_$(Platform)_$(Configuration)\</IntDir>
55+
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">false</LinkIncremental>
56+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_vc10_$(Platform)_$(Configuration)\</OutDir>
57+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_vc10_$(Platform)_$(Configuration)\</IntDir>
58+
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
59+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_vc10_$(Platform)_$(Configuration)\</OutDir>
60+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_vc10_$(Platform)_$(Configuration)\</IntDir>
61+
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
62+
</PropertyGroup>
63+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
64+
<Midl>
65+
<PreprocessorDefinitions>WIN32;WXUSINGDLL;__WXMSW__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
66+
<MkTypLibCompatible>true</MkTypLibCompatible>
67+
<SuppressStartupBanner>true</SuppressStartupBanner>
68+
<TargetEnvironment>Win32</TargetEnvironment>
69+
<TypeLibraryName>.\..\samples\plotctrl/wxplotctrl_plotctrl_sample.tlb</TypeLibraryName>
70+
<HeaderFileName>
71+
</HeaderFileName>
72+
</Midl>
73+
<ClCompile>
74+
<AdditionalOptions>/EHsc %(AdditionalOptions)</AdditionalOptions>
75+
<Optimization>MaxSpeed</Optimization>
76+
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
77+
<AdditionalIncludeDirectories>..\include;..\..\wxthings\include;$(ProjectDir)..\..;$(ProjectDir)..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
78+
<PreprocessorDefinitions>WIN32;WXUSINGDLL;__WXMSW__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
79+
<StringPooling>true</StringPooling>
80+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
81+
<FunctionLevelLinking>true</FunctionLevelLinking>
82+
<RuntimeTypeInfo>true</RuntimeTypeInfo>
83+
<PrecompiledHeaderOutputFile>$(IntDir)wxplotctrl_plotctrl_sample.pch</PrecompiledHeaderOutputFile>
84+
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
85+
<ObjectFileName>$(IntDir)</ObjectFileName>
86+
<ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
87+
<SuppressStartupBanner>true</SuppressStartupBanner>
88+
</ClCompile>
89+
<ResourceCompile>
90+
<PreprocessorDefinitions>WXUSINGDLL;__WXMSW__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
92+
</ResourceCompile>
93+
<Link>
94+
<OutputFile>$(TargetPath)</OutputFile>
95+
<SuppressStartupBanner>true</SuppressStartupBanner>
96+
<AdditionalLibraryDirectories>$(ProjectDir)../../../lib/vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
97+
<ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
98+
<SubSystem>Windows</SubSystem>
99+
<TargetMachine>MachineX86</TargetMachine>
100+
</Link>
101+
<Bscmake>
102+
<SuppressStartupBanner>true</SuppressStartupBanner>
103+
<OutputFile>$(OutDir)wxplotctrl_plotctrl_sample.bsc</OutputFile>
104+
</Bscmake>
105+
</ItemDefinitionGroup>
106+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
107+
<Midl>
108+
<PreprocessorDefinitions>WIN32;__WXMSW__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
109+
<MkTypLibCompatible>true</MkTypLibCompatible>
110+
<SuppressStartupBanner>true</SuppressStartupBanner>
111+
<TargetEnvironment>Win32</TargetEnvironment>
112+
<TypeLibraryName>.\..\samples\plotctrl/wxplotctrl_plotctrl_sample.tlb</TypeLibraryName>
113+
<HeaderFileName>
114+
</HeaderFileName>
115+
</Midl>
116+
<ClCompile>
117+
<AdditionalOptions>/EHsc %(AdditionalOptions)</AdditionalOptions>
118+
<Optimization>MaxSpeed</Optimization>
119+
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
120+
<AdditionalIncludeDirectories>..\include;..\..\wxthings\include;$(ProjectDir)..\..;$(ProjectDir)..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
121+
<PreprocessorDefinitions>WIN32;__WXMSW__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
122+
<StringPooling>true</StringPooling>
123+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
124+
<FunctionLevelLinking>true</FunctionLevelLinking>
125+
<RuntimeTypeInfo>true</RuntimeTypeInfo>
126+
<PrecompiledHeaderOutputFile>$(IntDir)wxplotctrl_plotctrl_sample.pch</PrecompiledHeaderOutputFile>
127+
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
128+
<ObjectFileName>$(IntDir)</ObjectFileName>
129+
<ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
130+
<SuppressStartupBanner>true</SuppressStartupBanner>
131+
</ClCompile>
132+
<ResourceCompile>
133+
<PreprocessorDefinitions>__WXMSW__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
134+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
135+
</ResourceCompile>
136+
<Link>
137+
<OutputFile>$(TargetPath)</OutputFile>
138+
<SuppressStartupBanner>true</SuppressStartupBanner>
139+
<AdditionalLibraryDirectories>$(ProjectDir)../../../lib/vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
140+
<ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
141+
<SubSystem>Windows</SubSystem>
142+
<TargetMachine>MachineX86</TargetMachine>
143+
</Link>
144+
<Bscmake>
145+
<SuppressStartupBanner>true</SuppressStartupBanner>
146+
<OutputFile>$(OutDir)wxplotctrl_plotctrl_sample.bsc</OutputFile>
147+
</Bscmake>
148+
</ItemDefinitionGroup>
149+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
150+
<Midl>
151+
<PreprocessorDefinitions>WIN32;_DEBUG;__WXDEBUG__;__WXMSW__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
152+
<MkTypLibCompatible>true</MkTypLibCompatible>
153+
<SuppressStartupBanner>true</SuppressStartupBanner>
154+
<TargetEnvironment>Win32</TargetEnvironment>
155+
<TypeLibraryName>.\..\samples\plotctrl/wxplotctrl_plotctrl_sample.tlb</TypeLibraryName>
156+
<HeaderFileName>
157+
</HeaderFileName>
158+
</Midl>
159+
<ClCompile>
160+
<AdditionalOptions>/EHsc %(AdditionalOptions)</AdditionalOptions>
161+
<Optimization>Disabled</Optimization>
162+
<AdditionalIncludeDirectories>..\include;..\..\wxthings\include;$(ProjectDir)..\..;$(ProjectDir)..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
163+
<PreprocessorDefinitions>WIN32;_DEBUG;__WXDEBUG__;__WXMSW__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
164+
<MinimalRebuild>true</MinimalRebuild>
165+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
166+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
167+
<RuntimeTypeInfo>true</RuntimeTypeInfo>
168+
<PrecompiledHeaderOutputFile>$(IntDir)wxplotctrl_plotctrl_sample.pch</PrecompiledHeaderOutputFile>
169+
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
170+
<ObjectFileName>$(IntDir)</ObjectFileName>
171+
<ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
172+
<WarningLevel>Level4</WarningLevel>
173+
<SuppressStartupBanner>true</SuppressStartupBanner>
174+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
175+
</ClCompile>
176+
<ResourceCompile>
177+
<PreprocessorDefinitions>_DEBUG;__WXDEBUG__;__WXMSW__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
178+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
179+
</ResourceCompile>
180+
<Link>
181+
<OutputFile>$(TargetPath)</OutputFile>
182+
<SuppressStartupBanner>true</SuppressStartupBanner>
183+
<AdditionalLibraryDirectories>$(ProjectDir)../../../lib/vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
184+
<GenerateDebugInformation>true</GenerateDebugInformation>
185+
<ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
186+
<SubSystem>Windows</SubSystem>
187+
<TargetMachine>MachineX86</TargetMachine>
188+
</Link>
189+
<Bscmake>
190+
<SuppressStartupBanner>true</SuppressStartupBanner>
191+
<OutputFile>$(OutDir)wxplotctrl_plotctrl_sample.bsc</OutputFile>
192+
</Bscmake>
193+
</ItemDefinitionGroup>
194+
<ItemGroup>
195+
<ClCompile Include="..\samples\plotctrl\wxplotctrl.cpp">
196+
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
197+
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
198+
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
199+
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
200+
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
201+
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
202+
</ClCompile>
203+
</ItemGroup>
204+
<ItemGroup>
205+
<ResourceCompile Include="..\samples\plotctrl\wxplotctrl.rc">
206+
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
207+
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\home\smanders\tmp\Contrib\wxplotctrl\samples\plotctrl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
208+
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
209+
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">\home\smanders\tmp\Contrib\wxplotctrl\samples\plotctrl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
210+
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
211+
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\home\smanders\tmp\Contrib\wxplotctrl\samples\plotctrl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
212+
</ResourceCompile>
213+
</ItemGroup>
214+
<ItemGroup>
215+
<ProjectReference Include="..\..\wxthings\build\wxthings_vc10.vcxproj">
216+
<Project>{4d8e76e1-a22a-43ab-a4bb-55493d825bdd}</Project>
217+
</ProjectReference>
218+
<ProjectReference Include="wxplotctrl_vc10.vcxproj">
219+
<Project>{63064ca6-5808-403f-87a1-09735ffc8302}</Project>
220+
</ProjectReference>
221+
</ItemGroup>
222+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
223+
<ImportGroup Label="ExtensionTargets">
224+
</ImportGroup>
225+
</Project>

‎build/wxplotctrl_sample_vc10.vcxproj.filters‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{fb1ddb35-5495-4e19-a2cd-790e366a1635}</UniqueIdentifier>
6+
</Filter>
7+
</ItemGroup>
8+
<ItemGroup>
9+
<ClCompile Include="..\samples\plotctrl\wxplotctrl.cpp">
10+
<Filter>Source Files</Filter>
11+
</ClCompile>
12+
</ItemGroup>
13+
<ItemGroup>
14+
<ResourceCompile Include="..\samples\plotctrl\wxplotctrl.rc">
15+
<Filter>Source Files</Filter>
16+
</ResourceCompile>
17+
</ItemGroup>
18+
</Project>

0 commit comments

Comments
 (0)