Skip to content

Commit 9c726bd

Browse files
intorrXottab-DUTY
intorr
authored and
Xottab-DUTY
committed
Part 9 of project files refactoring (utils folder). But xrSE_Factory still broken.
1 parent 56d805d commit 9c726bd

24 files changed

+260
-3602
lines changed

‎src/utils/CompressionTest/CompressionTest.vcxproj

Lines changed: 22 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,13 @@
3636
<ConfigurationType>Application</ConfigurationType>
3737
<PlatformToolset>v141</PlatformToolset>
3838
<CharacterSet>MultiByte</CharacterSet>
39+
<WholeProgramOptimization>true</WholeProgramOptimization>
3940
</PropertyGroup>
4041
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4142
<ConfigurationType>Application</ConfigurationType>
4243
<PlatformToolset>v141</PlatformToolset>
4344
<CharacterSet>MultiByte</CharacterSet>
45+
<WholeProgramOptimization>true</WholeProgramOptimization>
4446
</PropertyGroup>
4547
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
4648
<ConfigurationType>Application</ConfigurationType>
@@ -93,127 +95,53 @@
9395
<PropertyGroup>
9496
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
9597
</PropertyGroup>
96-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
97-
<LinkIncremental>true</LinkIncremental>
98-
</PropertyGroup>
99-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
100-
<LinkIncremental>true</LinkIncremental>
101-
</PropertyGroup>
102-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
103-
<LinkIncremental>false</LinkIncremental>
104-
</PropertyGroup>
105-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
106-
<LinkIncremental>false</LinkIncremental>
107-
</PropertyGroup>
108-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
109-
<LinkIncremental>false</LinkIncremental>
110-
</PropertyGroup>
111-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
112-
<LinkIncremental>false</LinkIncremental>
113-
</PropertyGroup>
11498
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
115-
<ClCompile>
116-
<Optimization>Disabled</Optimization>
117-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118-
<MinimalRebuild>true</MinimalRebuild>
119-
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
120-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
121-
<PrecompiledHeader />
122-
<WarningLevel>Level3</WarningLevel>
123-
</ClCompile>
12499
<Link>
125100
<SubSystem>Console</SubSystem>
126-
<RandomizedBaseAddress>false</RandomizedBaseAddress>
127-
<TargetMachine>MachineX86</TargetMachine>
128101
</Link>
129-
</ItemDefinitionGroup>
130-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
131102
<ClCompile>
132-
<Optimization>Disabled</Optimization>
133-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
134-
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
135-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
136-
<PrecompiledHeader>
137-
</PrecompiledHeader>
138-
<WarningLevel>Level3</WarningLevel>
103+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
139104
</ClCompile>
105+
</ItemDefinitionGroup>
106+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
140107
<Link>
141108
<SubSystem>Console</SubSystem>
142-
<RandomizedBaseAddress>false</RandomizedBaseAddress>
143109
</Link>
144-
</ItemDefinitionGroup>
145-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
146110
<ClCompile>
147-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
149-
<DisableLanguageExtensions>false</DisableLanguageExtensions>
150-
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
151-
<PrecompiledHeader />
152-
<WarningLevel>Level3</WarningLevel>
153-
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
111+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
154112
</ClCompile>
113+
</ItemDefinitionGroup>
114+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
155115
<Link>
156116
<SubSystem>Console</SubSystem>
157-
<OptimizeReferences>true</OptimizeReferences>
158-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
159-
<RandomizedBaseAddress>false</RandomizedBaseAddress>
160-
<TargetMachine>MachineX86</TargetMachine>
161117
</Link>
162-
</ItemDefinitionGroup>
163-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
164118
<ClCompile>
165-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
166-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
167-
<DisableLanguageExtensions>false</DisableLanguageExtensions>
168-
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
169-
<PrecompiledHeader>
170-
</PrecompiledHeader>
171-
<WarningLevel>Level3</WarningLevel>
172-
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
119+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
173120
</ClCompile>
121+
</ItemDefinitionGroup>
122+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
174123
<Link>
175124
<SubSystem>Console</SubSystem>
176-
<OptimizeReferences>true</OptimizeReferences>
177-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
178-
<RandomizedBaseAddress>false</RandomizedBaseAddress>
179125
</Link>
180-
</ItemDefinitionGroup>
181-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
182126
<ClCompile>
183-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
184-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
185-
<DisableLanguageExtensions>false</DisableLanguageExtensions>
186-
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
187-
<PrecompiledHeader>
188-
</PrecompiledHeader>
189-
<WarningLevel>Level3</WarningLevel>
190-
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
127+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
191128
</ClCompile>
129+
</ItemDefinitionGroup>
130+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
192131
<Link>
193132
<SubSystem>Console</SubSystem>
194-
<OptimizeReferences>true</OptimizeReferences>
195-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
196-
<RandomizedBaseAddress>false</RandomizedBaseAddress>
197-
<TargetMachine>MachineX86</TargetMachine>
198133
</Link>
199-
</ItemDefinitionGroup>
200-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
201134
<ClCompile>
202-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
203-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
204-
<DisableLanguageExtensions>false</DisableLanguageExtensions>
205-
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
206-
<PrecompiledHeader>
207-
</PrecompiledHeader>
208-
<WarningLevel>Level3</WarningLevel>
209-
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
135+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
210136
</ClCompile>
137+
</ItemDefinitionGroup>
138+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
211139
<Link>
212140
<SubSystem>Console</SubSystem>
213-
<OptimizeReferences>true</OptimizeReferences>
214-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
215-
<RandomizedBaseAddress>false</RandomizedBaseAddress>
216141
</Link>
142+
<ClCompile>
143+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
144+
</ClCompile>
217145
</ItemDefinitionGroup>
218146
<ItemGroup>
219147
<ClInclude Include="..\..\xrCore\Coder.hpp" />
@@ -259,14 +187,7 @@
259187
<ClInclude Include="..\xrCompress\lzo\stats1c.h" />
260188
</ItemGroup>
261189
<ItemGroup>
262-
<ClCompile Include="..\..\xrCore\Model.cpp">
263-
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level1</WarningLevel>
264-
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level1</WarningLevel>
265-
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level1</WarningLevel>
266-
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level1</WarningLevel>
267-
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">Level1</WarningLevel>
268-
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">Level1</WarningLevel>
269-
</ClCompile>
190+
<ClCompile Include="..\..\xrCore\Model.cpp" />
270191
<ClCompile Include="..\xrCompress\lzo\alloc.c" />
271192
<ClCompile Include="..\xrCompress\lzo\io.c" />
272193
<ClCompile Include="..\xrCompress\lzo\lzo1.c" />
@@ -337,14 +258,7 @@
337258
<ClCompile Include="..\xrCompress\lzo\lzo_ptr.c" />
338259
<ClCompile Include="..\xrCompress\lzo\lzo_str.c" />
339260
<ClCompile Include="..\xrCompress\lzo\lzo_util.c" />
340-
<ClCompile Include="CompressionTest.cpp">
341-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
342-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
343-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
344-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
345-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
346-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
347-
</ClCompile>
261+
<ClCompile Include="CompressionTest.cpp" />
348262
</ItemGroup>
349263
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
350264
<ImportGroup Label="ExtensionTargets">

‎src/utils/ETools/ETools.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ ETOOLS_API CDB::MODEL* __stdcall create_model(Fvector* V, int Vcnt, CDB::TRI* T,
191191
}
192192
ETOOLS_API void __stdcall destroy_model(CDB::MODEL*& M) { xr_delete(M); }
193193
ETOOLS_API CDB::RESULT* __stdcall r_begin() { return XRC.r_begin(); };
194-
ETOOLS_API CDB::RESULT* __stdcall r_end() { return XRC.r_end(); };
195194
ETOOLS_API int __stdcall r_count() { return XRC.r_count(); };
196195
ETOOLS_API void __stdcall ray_options(u32 flags) { XRC.ray_options(flags); }
197196
ETOOLS_API void __stdcall ray_query(

‎src/utils/ETools/ETools.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ ETOOLS_API CDB::MODEL* __stdcall create_model_clp(CDB::CollectorPacked*);
4141
ETOOLS_API CDB::MODEL* __stdcall create_model(Fvector* V, int Vcnt, CDB::TRI* T, int Tcnt);
4242
ETOOLS_API void __stdcall destroy_model(CDB::MODEL*&);
4343
ETOOLS_API CDB::RESULT* __stdcall r_begin();
44-
ETOOLS_API CDB::RESULT* __stdcall r_end();
4544
ETOOLS_API int __stdcall r_count();
4645
ETOOLS_API void __stdcall ray_options(u32 flags);
4746
ETOOLS_API void __stdcall ray_query(

0 commit comments

Comments
 (0)