Skip to content

Commit 09b9364

Browse files
lloydwlloydw
committed
Bug fixes and header licenses
1 parent 0199dd0 commit 09b9364

File tree

274 files changed

+9346
-5896
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

274 files changed

+9346
-5896
lines changed

‎Build/RocketControls.vcproj

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<Configuration
2020
Name="Debug|Win32"
2121
OutputDirectory="$(IntDir)"
22-
IntermediateDirectory="build\$(ProjectName)\$(ConfigurationName)"
2322
ConfigurationType="2"
2423
InheritedPropertySheets=".\vsprops\BuildConfigurationDLLDebug.vsprops"
2524
CharacterSet="1"
@@ -87,7 +86,6 @@
8786
<Configuration
8887
Name="Release|Win32"
8988
OutputDirectory="$(IntDir)"
90-
IntermediateDirectory="build\$(ProjectName)\$(ConfigurationName)"
9189
ConfigurationType="2"
9290
InheritedPropertySheets=".\vsprops\BuildConfigurationDLLRelease.vsprops"
9391
CharacterSet="1"

‎Build/RocketControlsPython.vcproj

+241
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,241 @@
1+
<?xml version="1.0" encoding="Windows-1252"?>
2+
<VisualStudioProject
3+
ProjectType="Visual C++"
4+
Version="9.00"
5+
Name="RocketControlsPython"
6+
ProjectGUID="{206AC8CC-432B-4B7C-C497-2CF315AEE1C1}"
7+
RootNamespace="core"
8+
Keyword="Win32Proj"
9+
TargetFrameworkVersion="131072"
10+
>
11+
<Platforms>
12+
<Platform
13+
Name="Win32"
14+
/>
15+
</Platforms>
16+
<ToolFiles>
17+
</ToolFiles>
18+
<Configurations>
19+
<Configuration
20+
Name="Debug|Win32"
21+
ConfigurationType="2"
22+
InheritedPropertySheets=".\vsprops\BuildConfigurationDLLDebug.vsprops"
23+
>
24+
<Tool
25+
Name="VCPreBuildEventTool"
26+
/>
27+
<Tool
28+
Name="VCCustomBuildTool"
29+
/>
30+
<Tool
31+
Name="VCXMLDataGeneratorTool"
32+
/>
33+
<Tool
34+
Name="VCWebServiceProxyGeneratorTool"
35+
/>
36+
<Tool
37+
Name="VCMIDLTool"
38+
/>
39+
<Tool
40+
Name="VCCLCompilerTool"
41+
AdditionalIncludeDirectories="..\include\;..\Source\Core;..\..\support\boost\;..\..\support\python\include\;..\..\support\python\PC"
42+
WarningLevel="3"
43+
/>
44+
<Tool
45+
Name="VCManagedResourceCompilerTool"
46+
/>
47+
<Tool
48+
Name="VCResourceCompilerTool"
49+
/>
50+
<Tool
51+
Name="VCPreLinkEventTool"
52+
/>
53+
<Tool
54+
Name="VCLinkerTool"
55+
LinkLibraryDependencies="false"
56+
AdditionalDependencies="RocketCore_d.lib RocketControls_d.lib python27_d.lib boost_python-vc90-mt-gyd-1_44.lib"
57+
OutputFile="..\bin\_rocketcontrols_d.pyd"
58+
AdditionalLibraryDirectories="..\bin;..\..\support\lib"
59+
RandomizedBaseAddress="1"
60+
DataExecutionPrevention="0"
61+
/>
62+
<Tool
63+
Name="VCALinkTool"
64+
/>
65+
<Tool
66+
Name="VCManifestTool"
67+
/>
68+
<Tool
69+
Name="VCXDCMakeTool"
70+
/>
71+
<Tool
72+
Name="VCBscMakeTool"
73+
/>
74+
<Tool
75+
Name="VCFxCopTool"
76+
/>
77+
<Tool
78+
Name="VCAppVerifierTool"
79+
/>
80+
<Tool
81+
Name="VCPostBuildEventTool"
82+
/>
83+
</Configuration>
84+
<Configuration
85+
Name="Release|Win32"
86+
ConfigurationType="2"
87+
InheritedPropertySheets=".\vsprops\BuildConfigurationDLLRelease.vsprops"
88+
WholeProgramOptimization="1"
89+
>
90+
<Tool
91+
Name="VCPreBuildEventTool"
92+
/>
93+
<Tool
94+
Name="VCCustomBuildTool"
95+
/>
96+
<Tool
97+
Name="VCXMLDataGeneratorTool"
98+
/>
99+
<Tool
100+
Name="VCWebServiceProxyGeneratorTool"
101+
/>
102+
<Tool
103+
Name="VCMIDLTool"
104+
/>
105+
<Tool
106+
Name="VCCLCompilerTool"
107+
AdditionalIncludeDirectories="..\include\;..\Source\Core;..\..\support\boost\;..\..\support\python\include\;..\..\support\python\PC"
108+
WarningLevel="3"
109+
/>
110+
<Tool
111+
Name="VCManagedResourceCompilerTool"
112+
/>
113+
<Tool
114+
Name="VCResourceCompilerTool"
115+
/>
116+
<Tool
117+
Name="VCPreLinkEventTool"
118+
/>
119+
<Tool
120+
Name="VCLinkerTool"
121+
LinkLibraryDependencies="false"
122+
AdditionalDependencies="RocketCore.lib RocketControls.lib python27.lib boost_python-vc90-mt-1_44.lib"
123+
OutputFile="..\bin\_rocketcontrols.pyd"
124+
AdditionalLibraryDirectories="..\bin;..\..\support\lib"
125+
RandomizedBaseAddress="1"
126+
DataExecutionPrevention="0"
127+
/>
128+
<Tool
129+
Name="VCALinkTool"
130+
/>
131+
<Tool
132+
Name="VCManifestTool"
133+
/>
134+
<Tool
135+
Name="VCXDCMakeTool"
136+
/>
137+
<Tool
138+
Name="VCBscMakeTool"
139+
/>
140+
<Tool
141+
Name="VCFxCopTool"
142+
/>
143+
<Tool
144+
Name="VCAppVerifierTool"
145+
/>
146+
<Tool
147+
Name="VCPostBuildEventTool"
148+
/>
149+
</Configuration>
150+
</Configurations>
151+
<References>
152+
</References>
153+
<Files>
154+
<Filter
155+
Name="Elements"
156+
>
157+
<File
158+
RelativePath="..\Source\Controls\Python\DataGridRowProxy.cpp"
159+
>
160+
</File>
161+
<File
162+
RelativePath="..\Source\Controls\Python\DataGridRowProxy.h"
163+
>
164+
</File>
165+
<File
166+
RelativePath="..\Source\Controls\Python\ElementInterface.cpp"
167+
>
168+
</File>
169+
<File
170+
RelativePath="..\Source\Controls\Python\ElementInterface.h"
171+
>
172+
</File>
173+
<File
174+
RelativePath="..\Source\Controls\Python\SelectOptionProxy.cpp"
175+
>
176+
</File>
177+
<File
178+
RelativePath="..\Source\Controls\Python\SelectOptionProxy.h"
179+
>
180+
</File>
181+
</Filter>
182+
<Filter
183+
Name="Precompiled Header"
184+
>
185+
<File
186+
RelativePath="..\Source\Controls\Python\precompiled.cpp"
187+
>
188+
<FileConfiguration
189+
Name="Debug|Win32"
190+
>
191+
<Tool
192+
Name="VCCLCompilerTool"
193+
UsePrecompiledHeader="1"
194+
/>
195+
</FileConfiguration>
196+
<FileConfiguration
197+
Name="Release|Win32"
198+
>
199+
<Tool
200+
Name="VCCLCompilerTool"
201+
UsePrecompiledHeader="1"
202+
/>
203+
</FileConfiguration>
204+
</File>
205+
<File
206+
RelativePath="..\Source\Controls\Python\precompiled.h"
207+
>
208+
</File>
209+
</Filter>
210+
<Filter
211+
Name="DataSource"
212+
>
213+
<File
214+
RelativePath="..\Source\Controls\Python\DataFormatterWrapper.cpp"
215+
>
216+
</File>
217+
<File
218+
RelativePath="..\Source\Controls\Python\DataFormatterWrapper.h"
219+
>
220+
</File>
221+
<File
222+
RelativePath="..\Source\Controls\Python\DataSourceWrapper.cpp"
223+
>
224+
</File>
225+
<File
226+
RelativePath="..\Source\Controls\Python\DataSourceWrapper.h"
227+
>
228+
</File>
229+
</Filter>
230+
<File
231+
RelativePath="..\Source\Controls\Python\Module.cpp"
232+
>
233+
</File>
234+
<File
235+
RelativePath="..\Source\Controls\Python\Module.h"
236+
>
237+
</File>
238+
</Files>
239+
<Globals>
240+
</Globals>
241+
</VisualStudioProject>

‎Build/RocketCore.vcproj

+23-21
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<Configuration
2020
Name="Debug|Win32"
2121
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
22-
IntermediateDirectory="build\$(ProjectName)\$(ConfigurationName)"
2322
ConfigurationType="2"
2423
InheritedPropertySheets=".\vsprops\BuildConfigurationDLLDebug.vsprops"
2524
CharacterSet="1"
@@ -42,7 +41,7 @@
4241
<Tool
4342
Name="VCCLCompilerTool"
4443
AdditionalIncludeDirectories="..\Include;..\..\support\freetype\include"
45-
UsePrecompiledHeader="0"
44+
UsePrecompiledHeader="2"
4645
/>
4746
<Tool
4847
Name="VCManagedResourceCompilerTool"
@@ -85,7 +84,6 @@
8584
</Configuration>
8685
<Configuration
8786
Name="Release|Win32"
88-
IntermediateDirectory="build\$(ProjectName)\$(ConfigurationName)"
8987
ConfigurationType="2"
9088
InheritedPropertySheets=".\vsprops\BuildConfigurationDLLRelease.vsprops"
9189
CharacterSet="1"
@@ -109,7 +107,7 @@
109107
<Tool
110108
Name="VCCLCompilerTool"
111109
AdditionalIncludeDirectories="..\Include;..\..\support\freetype\include"
112-
UsePrecompiledHeader="0"
110+
UsePrecompiledHeader="2"
113111
/>
114112
<Tool
115113
Name="VCManagedResourceCompilerTool"
@@ -160,12 +158,20 @@
160158
<File
161159
RelativePath="..\Source\Core\precompiled.cpp"
162160
>
161+
<FileConfiguration
162+
Name="Debug|Win32"
163+
>
164+
<Tool
165+
Name="VCCLCompilerTool"
166+
UsePrecompiledHeader="1"
167+
/>
168+
</FileConfiguration>
163169
<FileConfiguration
164170
Name="Release|Win32"
165171
>
166172
<Tool
167173
Name="VCCLCompilerTool"
168-
UsePrecompiledHeader="0"
174+
UsePrecompiledHeader="1"
169175
/>
170176
</FileConfiguration>
171177
</File>
@@ -1182,22 +1188,6 @@
11821188
>
11831189
</File>
11841190
</Filter>
1185-
<Filter
1186-
Name="Trial"
1187-
>
1188-
<File
1189-
RelativePath="..\Source\Core\TrialLogo.cpp"
1190-
>
1191-
</File>
1192-
<File
1193-
RelativePath="..\Source\Core\TrialLogo.h"
1194-
>
1195-
</File>
1196-
<File
1197-
RelativePath="..\Source\Core\TrialLogoTexture.h"
1198-
>
1199-
</File>
1200-
</Filter>
12011191
<Filter
12021192
Name="Core"
12031193
>
@@ -1436,6 +1426,18 @@
14361426
RelativePath="..\Include\Rocket\Core\Variant.inl"
14371427
>
14381428
</File>
1429+
<File
1430+
RelativePath="..\Source\Core\Vector2.cpp"
1431+
>
1432+
</File>
1433+
<File
1434+
RelativePath="..\Include\Rocket\Core\Vector2.h"
1435+
>
1436+
</File>
1437+
<File
1438+
RelativePath="..\Include\Rocket\Core\Vector2.inl"
1439+
>
1440+
</File>
14391441
<File
14401442
RelativePath="..\Source\Core\WString.cpp"
14411443
>

0 commit comments

Comments
 (0)