Skip to content
This repository has been archived by the owner on Jan 14, 2020. It is now read-only.

Clean up of code and more VS support #6

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Clean up of code and more VS support #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1ead6e8
Initial attempt at clean up
Sarkie Feb 17, 2013
ac75305
Fix readme
Sarkie Feb 17, 2013
1905aba
Normalize line endings
Sarkie Feb 17, 2013
15f8bc1
add empty folders
Sarkie Feb 17, 2013
6df500a
updated git ignore
Sarkie Feb 17, 2013
5af0a8e
ignore everything but keep the folder structur
Sarkie Feb 17, 2013
56549b4
last attempt...
Sarkie Feb 17, 2013
459e2de
last attempt...
Sarkie Feb 17, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 30 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,33 @@ DebugVC7
bin
*/ReleaseVC7
*vcxproj.user
Lib\DirectX_SDK\*
Lib\SDL\*
Lib\SDL_Mixer\*
_ReSharper*
vs/ipch/
*ncrunch*
/Lib/SDL/docs.html
/Lib/SDL/README.txt
/Lib/SDL/README-SDL.txt
/Lib/SDL/VisualC.html
/Lib/SDL/WhatsNew.txt
/Lib/SDL/docs
/Lib/SDL/include
/Lib/SDL/lib
/Lib/SDL/BUGS.txt
/Lib/SDL/COPYING.txt
/Lib/SDL_Mixer/include
/Lib/SDL_Mixer/lib
/Lib/SDL_Mixer/CHANGES.txt
/Lib/SDL_Mixer/COPYING.txt
/Lib/SDL_Mixer/README.txt
/Lib/DirectX_SDK/Developer Runtime
/Lib/DirectX_SDK/Documentation
/Lib/DirectX_SDK/Extras
/Lib/DirectX_SDK/Include
/Lib/DirectX_SDK/Lib
/Lib/DirectX_SDK/Redist
/Lib/DirectX_SDK/Samples
/Lib/DirectX_SDK/system
/Lib/DirectX_SDK/Utilities
0 Engine/Engine.vcproj → Engine/Engine_vs2005.vcproj
View file
Open in desktop
File renamed without changes.
137 changes: 137 additions & 0 deletions Engine/Engine_vs2010.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>Engine</ProjectName>
<ProjectGuid>{05511B4A-FB13-49E5-AE53-EE1F063C055D}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\DebugVC7\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\DebugVC7\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\ReleaseVC7\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\ReleaseVC7\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\Lib\SDL\include;src\enet\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>nDBGRECORD; nDEBUG; PLATFORM_WIN32; UDP_NETWORKING; WIN32; _LIB; _CRT_SECURE_NO_DEPRECATE; _CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalOptions> /J</AdditionalOptions>
<PrecompiledHeader>
</PrecompiledHeader>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0000</Culture>
</ResourceCompile>
<Lib>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>..\Lib\SDL\include;src\enet\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>nDBGRECORD; nDEBUG; PLATFORM_WIN32; UDP_NETWORKING; WIN32; _LIB; _CRT_SECURE_NO_DEPRECATE; _CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<AdditionalOptions> /J</AdditionalOptions>
<PrecompiledHeader>
</PrecompiledHeader>
<SuppressStartupBanner>true</SuppressStartupBanner>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0000</Culture>
</ResourceCompile>
<Lib>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="src\cache.c" />
<ClCompile Include="src\display.c" />
<ClCompile Include="src\draw.c" />
<ClCompile Include="src\enet\host.c" />
<ClCompile Include="src\enet\list.c" />
<ClCompile Include="src\enet\memory.c" />
<ClCompile Include="src\enet\packet.c" />
<ClCompile Include="src\enet\peer.c" />
<ClCompile Include="src\enet\protocol.c" />
<ClCompile Include="src\enet\unix.c" />
<ClCompile Include="src\enet\win32.c" />
<ClCompile Include="src\engine.c" />
<ClCompile Include="src\filesystem.c" />
<ClCompile Include="src\fixedPoint_math.c" />
<ClCompile Include="src\mmulti.c" />
<ClCompile Include="src\mmulti_stable.cpp" />
<ClCompile Include="src\network.c" />
<ClCompile Include="src\tiles.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\build.h" />
<ClInclude Include="src\cache.h" />
<ClInclude Include="src\display.h" />
<ClInclude Include="src\draw.h" />
<ClInclude Include="src\engine.h" />
<ClInclude Include="src\filesystem.h" />
<ClInclude Include="src\fixedPoint_math.h" />
<ClInclude Include="src\icon.h" />
<ClInclude Include="src\network.h" />
<ClInclude Include="src\platform.h" />
<ClInclude Include="src\tiles.h" />
<ClInclude Include="src\win32_compat.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
110 changes: 110 additions & 0 deletions Engine/Engine_vs2010.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{a665bcff-e251-4258-966e-820f5ab3fb7a}</UniqueIdentifier>
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{f5f8d725-c6ab-42af-a020-47339c1ad6c9}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl</Extensions>
</Filter>
<Filter Include="enet">
<UniqueIdentifier>{1668fee6-0cdc-4e34-b483-401fd77e2bd3}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\enet\host.c">
<Filter>enet</Filter>
</ClCompile>
<ClCompile Include="src\enet\list.c">
<Filter>enet</Filter>
</ClCompile>
<ClCompile Include="src\enet\memory.c">
<Filter>enet</Filter>
</ClCompile>
<ClCompile Include="src\enet\packet.c">
<Filter>enet</Filter>
</ClCompile>
<ClCompile Include="src\enet\peer.c">
<Filter>enet</Filter>
</ClCompile>
<ClCompile Include="src\enet\protocol.c">
<Filter>enet</Filter>
</ClCompile>
<ClCompile Include="src\enet\unix.c">
<Filter>enet</Filter>
</ClCompile>
<ClCompile Include="src\enet\win32.c">
<Filter>enet</Filter>
</ClCompile>
<ClCompile Include="src\cache.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\display.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\draw.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\engine.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\filesystem.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\fixedPoint_math.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\network.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\tiles.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\mmulti_stable.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\mmulti.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\build.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\cache.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\display.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\draw.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\engine.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\filesystem.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\fixedPoint_math.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\icon.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\network.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\platform.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\tiles.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\win32_compat.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
0 Engine/src/dummy_multi.c → Engine/src/unusued/dummy_multi.c
View file
Open in desktop
File renamed without changes.
0 Engine/src/multi.c → Engine/src/unusued/multi.c
View file
Open in desktop
File renamed without changes.
0 Game/Game.vcproj → Game/Game_vs2005.vcproj
View file
Open in desktop
File renamed without changes.