Skip to content

engine
engine
Commit b6199033 authored by Byurrrer's avatar Byurrrer
Browse files
Options

Перевел движковые либы на нормальный тип компоновки файлов

parent 21f47f61
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3094 additions and 2354 deletions
proj/sxaigrid/vs2013/sxaigrid.vcxproj
View file @ b6199033
......@@ -60,7 +60,7 @@
</PrecompiledHeader>
<WarningLevel>Level1</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXAIGRID_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXAIGRID_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
......@@ -91,8 +91,14 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\aigrid\aigrid.cpp" />
<ClCompile Include="..\..\..\source\aigrid\sxaigrid.cpp" />
<ClCompile Include="..\..\..\source\aigrid\sxaigrid_dll.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\aigrid\aigrid.h" />
<ClInclude Include="..\..\..\source\aigrid\sxaigrid.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
......
proj/sxaigrid/vs2013/sxaigrid.vcxproj.filters
View file @ b6199033
......@@ -18,5 +18,19 @@
<ClCompile Include="..\..\..\source\aigrid\sxaigrid_dll.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\aigrid\sxaigrid.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\aigrid\aigrid.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\aigrid\sxaigrid.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\aigrid\aigrid.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
proj/sxcore/vs2013/sxcore.vcxproj
View file @ b6199033
......@@ -15,12 +15,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\core\Config.cpp" />
<ClCompile Include="..\..\..\source\core\cvars.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\core\file.cpp" />
<ClCompile Include="..\..\..\source\core\loaderconfig.cpp" />
<ClCompile Include="..\..\..\source\core\sxcore.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
......@@ -33,13 +33,13 @@
<ItemGroup>
<ClInclude Include="..\..\..\source\core\concmd.h" />
<ClInclude Include="..\..\..\source\core\concurrent_queue.h" />
<ClInclude Include="..\..\..\source\core\Config.h" />
<ClInclude Include="..\..\..\source\core\cvars.h" />
<ClInclude Include="..\..\..\source\core\eventbridge.h" />
<ClInclude Include="..\..\..\source\core\eventchannel.h" />
<ClInclude Include="..\..\..\source\core\eventhandler.h" />
<ClInclude Include="..\..\..\source\core\eventhandlerqueue.h" />
<ClInclude Include="..\..\..\source\core\File.h" />
<ClInclude Include="..\..\..\source\core\LoaderConfig.h" />
<ClInclude Include="..\..\..\source\core\sxcore.h" />
<ClInclude Include="..\..\..\source\core\Task.h" />
<ClInclude Include="..\..\..\source\core\TaskManager.h" />
......
proj/sxcore/vs2013/sxcore.vcxproj.filters
View file @ b6199033
......@@ -19,15 +19,15 @@
<ClCompile Include="..\..\..\source\core\file.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\core\loaderconfig.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\core\Task.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\core\TaskManager.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\core\Config.cpp">
<Filter>Source</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Source">
......@@ -47,9 +47,6 @@
<ClInclude Include="..\..\..\source\core\cvars.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\core\LoaderConfig.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\core\Task.h">
<Filter>Header</Filter>
</ClInclude>
......@@ -77,5 +74,8 @@
<ClInclude Include="..\..\..\source\core\File.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\core\Config.h">
<Filter>Header</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
proj/sxgcore/vs2013/sxgcore.vcxproj
View file @ b6199033
......@@ -61,7 +61,7 @@
</PrecompiledHeader>
<WarningLevel>Level1</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SGCORE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SGCORE_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
......@@ -93,53 +93,44 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\gcore\baseobject.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\gcore\bound.cpp" />
<ClCompile Include="..\..\..\source\gcore\camera.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\CreatorTextures.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\dxdevice.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\GeomOptimize.cpp" />
<ClCompile Include="..\..\..\source\gcore\LoaderTextures.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\loader_static.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\loader_static.cpp" />
<ClCompile Include="..\..\..\source\gcore\shader.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\sky.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\sxgcore.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\sxgcore_dll.cpp" />
<ClCompile Include="..\..\..\source\gcore\workmodel.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\gcore\baseobject.h" />
<ClInclude Include="..\..\..\source\common\string.h" />
<ClInclude Include="..\..\..\source\gcore\bound.h" />
<ClInclude Include="..\..\..\source\gcore\camera.h" />
<ClInclude Include="..\..\..\source\gcore\creatortextures.h" />
<ClInclude Include="..\..\..\source\gcore\GeomOptimize.h" />
<ClInclude Include="..\..\..\source\gcore\LoaderTextures.h" />
<ClInclude Include="..\..\..\source\gcore\loader_static.h" />
<ClInclude Include="..\..\..\source\gcore\ModelFile.h" />
<ClInclude Include="..\..\..\source\gcore\shader.h" />
<ClInclude Include="..\..\..\source\gcore\sky.h" />
......
proj/sxgcore/vs2013/sxgcore.vcxproj.filters
View file @ b6199033
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\..\..\source\gcore\sxgcore_dll.cpp" />
<ClCompile Include="..\..\..\source\gcore\shader.cpp">
<Filter>Source</Filter>
</ClCompile>
......@@ -11,25 +10,28 @@
<ClCompile Include="..\..\..\source\gcore\sxgcore.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\workmodel.cpp">
<ClCompile Include="..\..\..\source\gcore\camera.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\baseobject.cpp">
<ClCompile Include="..\..\..\source\gcore\CreatorTextures.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\camera.cpp">
<ClCompile Include="..\..\..\source\gcore\LoaderTextures.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\CreatorTextures.cpp">
<ClCompile Include="..\..\..\source\gcore\GeomOptimize.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\dxdevice.cpp">
<ClCompile Include="..\..\..\source\gcore\bound.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\loader_static.cpp">
<ClCompile Include="..\..\..\source\gcore\sxgcore_dll.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\LoaderTextures.cpp">
<ClCompile Include="..\..\..\source\common\string.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\loader_static.cpp">
<Filter>Source</Filter>
</ClCompile>
</ItemGroup>
......@@ -57,14 +59,23 @@
<ClInclude Include="..\..\..\source\gcore\sxgcore.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\gcore\baseobject.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\gcore\camera.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\gcore\creatortextures.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\gcore\GeomOptimize.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\gcore\bound.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\common\string.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\gcore\loader_static.h">
<Filter>Header</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
proj/sxgeom/vs2013/sxgeom.vcxproj
View file @ b6199033
......@@ -11,25 +11,23 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\geom\geom_data.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\geom\green.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\geom\static_geom.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\geom\sxgeom.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\geom\sxgeom_dll.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\common\string.h" />
<ClInclude Include="..\..\..\source\geom\green.h" />
<ClInclude Include="..\..\..\source\geom\static_geom.h" />
<ClInclude Include="..\..\..\source\geom\sxgeom.h" />
......@@ -84,7 +82,7 @@
</PrecompiledHeader>
<WarningLevel>Level1</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXGEOM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXGEOM_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
......
proj/sxgeom/vs2013/sxgeom.vcxproj.filters
View file @ b6199033
......@@ -8,10 +8,10 @@
<ClCompile Include="..\..\..\source\geom\sxgeom.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\geom\geom_data.cpp">
<ClCompile Include="..\..\..\source\geom\green.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\geom\green.cpp">
<ClCompile Include="..\..\..\source\common\string.cpp">
<Filter>Source</Filter>
</ClCompile>
</ItemGroup>
......@@ -33,5 +33,8 @@
<ClInclude Include="..\..\..\source\geom\green.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\common\string.h">
<Filter>Header</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
proj/sxinput/vs2013/sxinput.vcxproj
View file @ b6199033
......@@ -60,7 +60,7 @@
</PrecompiledHeader>
<WarningLevel>Level1</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXINPUT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXINPUT_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
......@@ -93,11 +93,11 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\input\input.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\input\sxinput.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\input\sxinput_dll.cpp" />
......
proj/sxmtllight/vs2013/sxmtllight.vcxproj
View file @ b6199033
......@@ -60,7 +60,7 @@
</PrecompiledHeader>
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXMTLLIGHT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXMTLLIGHT_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
......@@ -92,35 +92,38 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\mtllight\light.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\mtllight\material.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\mtllight\ml_data.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\mtllight\reflection.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\mtllight\shadow.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\mtllight\sxmtllight.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\mtllight\sxmtllight_dll.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\common\string.h" />
<ClInclude Include="..\..\..\source\mtllight\light.h" />
<ClInclude Include="..\..\..\source\mtllight\material.h" />
<ClInclude Include="..\..\..\source\mtllight\ml_data.h" />
<ClInclude Include="..\..\..\source\mtllight\reflection.h" />
<ClInclude Include="..\..\..\source\mtllight\shadow.h" />
<ClInclude Include="..\..\..\source\mtllight\sxmtllight.h" />
......
proj/sxmtllight/vs2013/sxmtllight.vcxproj.filters
View file @ b6199033
......@@ -20,6 +20,9 @@
<ClCompile Include="..\..\..\source\mtllight\material.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\common\string.cpp">
<Filter>Source</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Source">
......@@ -45,5 +48,11 @@
<ClInclude Include="..\..\..\source\mtllight\material.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\mtllight\ml_data.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\common\string.h">
<Filter>Headers</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
proj/sxparticles/vs2013/sxparticles.vcxproj
View file @ b6199033
......@@ -60,7 +60,7 @@
</PrecompiledHeader>
<WarningLevel>Level1</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXPARTICLES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXPARTICLES_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
......@@ -92,23 +92,27 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\particles\effect.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\particles\emitter.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\particles\PESet.cpp" />
<ClCompile Include="..\..\..\source\particles\sxparticles.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\particles\sxparticles_dll.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\common\string.h" />
<ClInclude Include="..\..\..\source\particles\effect.h" />
<ClInclude Include="..\..\..\source\particles\emitter.h" />
<ClInclude Include="..\..\..\source\particles\PESet.h" />
<ClInclude Include="..\..\..\source\particles\sxparticles.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
......
proj/sxparticles/vs2013/sxparticles.vcxproj.filters
View file @ b6199033
......@@ -27,6 +27,12 @@
<ClCompile Include="..\..\..\source\particles\effect.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\particles\PESet.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\common\string.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\particles\effect.h">
......@@ -38,5 +44,11 @@
<ClInclude Include="..\..\..\source\particles\sxparticles.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\particles\PESet.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\common\string.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
proj/sxpp/vs2013/sxpp.vcxproj
View file @ b6199033
......@@ -61,7 +61,7 @@
</PrecompiledHeader>
<WarningLevel>Level1</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXPP_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
......@@ -93,8 +93,12 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\pp\sxpp.cpp" />
<ClCompile Include="..\..\..\source\pp\sxpp_dll.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\pp\sxpp.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
......
proj/sxpp/vs2013/sxpp.vcxproj.filters 0 → 100644
View file @ b6199033
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\..\..\source\pp\sxpp_dll.cpp" />
<ClCompile Include="..\..\..\source\pp\sxpp.cpp">
<Filter>Source</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Header">
<UniqueIdentifier>{b6a4ca41-48a8-4b3c-8b03-9f7246a23d6a}</UniqueIdentifier>
</Filter>
<Filter Include="Source">
<UniqueIdentifier>{575b3d59-7904-49db-b40c-fba7e7d13fa0}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\pp\sxpp.h">
<Filter>Header</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
proj/sxscore/vs2013/sxscore.vcxproj
View file @ b6199033
......@@ -11,8 +11,14 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\score\sound.cpp" />
<ClCompile Include="..\..\..\source\score\sxscore.cpp" />
<ClCompile Include="..\..\..\source\score\sxscore_dll.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\score\sound.h" />
<ClInclude Include="..\..\..\source\score\sxscore.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{120D29B8-D2D9-4B4E-8AC6-D951973B7398}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
......@@ -64,7 +70,7 @@
</PrecompiledHeader>
<WarningLevel>Level1</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXSCORE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXSCORE_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
......
proj/sxscore/vs2013/sxscore.vcxproj.filters
View file @ b6199033
......@@ -18,5 +18,19 @@
<ClCompile Include="..\..\..\source\score\sxscore_dll.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\score\sxscore.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\score\sound.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\score\sxscore.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\score\sound.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
source/aigrid/aigrid.cpp
View file @ b6199033
#include <aigrid/aigrid.h>
#include "aigrid.h"
void AIGrid::CorrectPosXZ(float3* pos)
{
......@@ -21,7 +21,7 @@ bool AIGrid::IsValidIdInArrQuads(ID id)
return (id >= 0 && ArrQuads.size() > id && !(ArrQuads[id]->IsClose));
}
inline bool AIGrid::AIGridCompareHeight(ID id1,ID id2)
bool AIGrid::AIGridCompareHeight(ID id1,ID id2)
{
return (
abs(
......@@ -61,13 +61,13 @@ void AIGrid::GridSave(const char* path)
{
if (ArrQuads.size() <= 0)
{
reportf(REPORT_MSG_LEVEL_WARRNING, "sxaigrid: AI grid not found\n");
g_fnReportf(REPORT_MSG_LEVEL_WARNING, "sxaigrid: AI grid not found\n");
return;
}
if (CountSplits <= 0)
{
reportf(REPORT_MSG_LEVEL_WARRNING, "sxaigrid: can not find path, because AI grid is not validate splits\n");
g_fnReportf(REPORT_MSG_LEVEL_WARNING, "sxaigrid: can not find path, because AI grid is not validate splits\n");
return;
}
......@@ -189,7 +189,7 @@ void AIGrid::GridLoad(const char* path)
fclose(file);
ReCreateBuffs();
reportf(REPORT_MSG_LEVEL_NOTICE, "sxaigrid: AI grid is loaded, count quads %d, count graph points %d\n", ArrQuads.size(), ArrGraphPointsIDs.size());
g_fnReportf(REPORT_MSG_LEVEL_NOTICE, "sxaigrid: AI grid is loaded, count quads %d, count graph points %d\n", ArrQuads.size(), ArrGraphPointsIDs.size());
GridTestValidation();
}
......@@ -273,7 +273,7 @@ void AIGrid::BBCreate(const float3* center, const float3* param)
{
if (ArrBound.size() > 1)
{
reportf(REPORT_MSG_LEVEL_WARRNING, "sxaigrid: bound box already splitting, unresolved create");
g_fnReportf(REPORT_MSG_LEVEL_WARNING, "sxaigrid: bound box already splitting, unresolved create");
return;
}
......@@ -296,7 +296,7 @@ void AIGrid::BBCreate(const float3* center, const float3* param)
ArrBound.push_back(tmpbb);
}
inline bool AIGrid::BBIsCreated() const
bool AIGrid::BBIsCreated() const
{
return (ArrBound.size() > 0);
}
......@@ -305,13 +305,13 @@ void AIGrid::BBSetDimensions(const float3* dim)
{
if (ArrBound.size() <= 0)
{
reportf(REPORT_MSG_LEVEL_WARRNING, "sxaigrid: bound box is not created");
g_fnReportf(REPORT_MSG_LEVEL_WARNING, "sxaigrid: bound box is not created");
return;
}
if (ArrBound.size() > 1)
{
reportf(REPORT_MSG_LEVEL_WARRNING, "sxaigrid: bound box already splitting, unresolved set dimensions");
g_fnReportf(REPORT_MSG_LEVEL_WARNING, "sxaigrid: bound box already splitting, unresolved set dimensions");
return;
}
......@@ -347,7 +347,7 @@ void AIGrid::BBGetDimensions(float3* dim) const
{
if (ArrBound.size() <= 0)
{
reportf(REPORT_MSG_LEVEL_WARRNING, "sxaigrid: bound box is not created");
g_fnReportf(REPORT_MSG_LEVEL_WARNING, "sxaigrid: bound box is not created");
return;
}
......@@ -363,13 +363,13 @@ void AIGrid::BBSetPos(const float3* pos)
{
if (ArrBound.size() <= 0)
{
reportf(REPORT_MSG_LEVEL_WARRNING, "sxaigrid: bound box is not created");
g_fnReportf(REPORT_MSG_LEVEL_WARNING, "sxaigrid: bound box is not created");
return;
}
if(ArrBound.size() > 1)
{
reportf(REPORT_MSG_LEVEL_WARRNING, "sxaigrid: bound box already splitting, unresolved set position");
g_fnReportf(REPORT_MSG_LEVEL_WARNING, "sxaigrid: bound box already splitting, unresolved set position");
return;
}
......@@ -399,7 +399,7 @@ void AIGrid::BBGetPos(float3* pos) const
{
if (ArrBound.size() <= 0)
{
reportf(REPORT_MSG_LEVEL_WARRNING, "sxaigrid: bound box is not created");
g_fnReportf(REPORT_MSG_LEVEL_WARNING, "sxaigrid: bound box is not created");
return;
}
......@@ -932,7 +932,7 @@ void AIGrid::GraphicsInit()
if (!DXDevice)
{
reportf(REPORT_MSG_LEVEL_ERROR, "sxaigrid: %s - dx device is not init", gen_msg_location);
g_fnReportf(REPORT_MSG_LEVEL_ERROR, "sxaigrid: %s - dx device is not init", gen_msg_location);
}
D3DVERTEXELEMENT9 InstanceAIQuad[] =
......@@ -1106,7 +1106,7 @@ void AIGrid::GridGenerate()
{
if (ArrQuads.size() <= 0)