Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VS2010 projects relative paths updated. #37

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

VS2010 projects relative paths updated. #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 45 additions & 45 deletions build/vs2010/cyclone_vc10.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\tmp\Debug\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\tmp\Release\</IntDir>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\tmp\Debug\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\tmp\Release\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
Expand All @@ -54,15 +54,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderOutputFile>.\tmp\Debug/cyclone.pch</PrecompiledHeaderOutputFile>
<AssemblerListingLocation>.\tmp\Debug/</AssemblerListingLocation>
<ObjectFileName>.\tmp\Debug/</ObjectFileName>
<PrecompiledHeaderOutputFile>..\..\tmp\Debug/cyclone.pch</PrecompiledHeaderOutputFile>
<AssemblerListingLocation>..\..\tmp\Debug/</AssemblerListingLocation>
<ObjectFileName>..\..\tmp\Debug/</ObjectFileName>
<ProgramDataBaseFileName>.\tmp\Debug/</ProgramDataBaseFileName>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
Expand All @@ -75,23 +75,23 @@
<Culture>0x0809</Culture>
</ResourceCompile>
<Lib>
<OutputFile>..\lib\$(TargetFileName)</OutputFile>
<OutputFile>..\..\lib\win32\$(TargetFileName)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderOutputFile>.\tmp\Release/cyclone.pch</PrecompiledHeaderOutputFile>
<AssemblerListingLocation>.\tmp\Release/</AssemblerListingLocation>
<ObjectFileName>.\tmp\Release/</ObjectFileName>
<PrecompiledHeaderOutputFile>..\..\tmp\Release/cyclone.pch</PrecompiledHeaderOutputFile>
<AssemblerListingLocation>..\..\tmp\Release/</AssemblerListingLocation>
<ObjectFileName>..\..\tmp\Release/</ObjectFileName>
<ProgramDataBaseFileName>.\tmp\Release/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
Expand All @@ -102,43 +102,43 @@
<Culture>0x0809</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\lib\cyclone.lib</OutputFile>
<OutputFile>..\..\lib\win32\cyclone.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\body.cpp" />
<ClCompile Include="..\src\collide_coarse.cpp" />
<ClCompile Include="..\src\collide_fine.cpp" />
<ClCompile Include="..\src\contacts.cpp" />
<ClCompile Include="..\src\core.cpp" />
<ClCompile Include="..\src\fgen.cpp" />
<ClCompile Include="..\src\joints.cpp" />
<ClCompile Include="..\src\particle.cpp" />
<ClCompile Include="..\src\pcontacts.cpp" />
<ClCompile Include="..\src\pfgen.cpp" />
<ClCompile Include="..\src\plinks.cpp" />
<ClCompile Include="..\src\pworld.cpp" />
<ClCompile Include="..\src\random.cpp" />
<ClCompile Include="..\src\world.cpp" />
<ClCompile Include="..\..\src\body.cpp" />
<ClCompile Include="..\..\src\collide_coarse.cpp" />
<ClCompile Include="..\..\src\collide_fine.cpp" />
<ClCompile Include="..\..\src\contacts.cpp" />
<ClCompile Include="..\..\src\core.cpp" />
<ClCompile Include="..\..\src\fgen.cpp" />
<ClCompile Include="..\..\src\joints.cpp" />
<ClCompile Include="..\..\src\particle.cpp" />
<ClCompile Include="..\..\src\pcontacts.cpp" />
<ClCompile Include="..\..\src\pfgen.cpp" />
<ClCompile Include="..\..\src\plinks.cpp" />
<ClCompile Include="..\..\src\pworld.cpp" />
<ClCompile Include="..\..\src\random.cpp" />
<ClCompile Include="..\..\src\world.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\cyclone\body.h" />
<ClInclude Include="..\include\cyclone\collide_coarse.h" />
<ClInclude Include="..\include\cyclone\collide_fine.h" />
<ClInclude Include="..\include\cyclone\contacts.h" />
<ClInclude Include="..\include\cyclone\core.h" />
<ClInclude Include="..\include\cyclone\cyclone.h" />
<ClInclude Include="..\include\cyclone\fgen.h" />
<ClInclude Include="..\include\cyclone\joints.h" />
<ClInclude Include="..\include\cyclone\particle.h" />
<ClInclude Include="..\include\cyclone\pcontacts.h" />
<ClInclude Include="..\include\cyclone\pfgen.h" />
<ClInclude Include="..\include\cyclone\plinks.h" />
<ClInclude Include="..\include\cyclone\precision.h" />
<ClInclude Include="..\include\cyclone\pworld.h" />
<ClInclude Include="..\include\cyclone\random.h" />
<ClInclude Include="..\include\cyclone\world.h" />
<ClInclude Include="..\..\include\cyclone\body.h" />
<ClInclude Include="..\..\include\cyclone\collide_coarse.h" />
<ClInclude Include="..\..\include\cyclone\collide_fine.h" />
<ClInclude Include="..\..\include\cyclone\contacts.h" />
<ClInclude Include="..\..\include\cyclone\core.h" />
<ClInclude Include="..\..\include\cyclone\cyclone.h" />
<ClInclude Include="..\..\include\cyclone\fgen.h" />
<ClInclude Include="..\..\include\cyclone\joints.h" />
<ClInclude Include="..\..\include\cyclone\particle.h" />
<ClInclude Include="..\..\include\cyclone\pcontacts.h" />
<ClInclude Include="..\..\include\cyclone\pfgen.h" />
<ClInclude Include="..\..\include\cyclone\plinks.h" />
<ClInclude Include="..\..\include\cyclone\precision.h" />
<ClInclude Include="..\..\include\cyclone\pworld.h" />
<ClInclude Include="..\..\include\cyclone\random.h" />
<ClInclude Include="..\..\include\cyclone\world.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
60 changes: 30 additions & 30 deletions build/vs2010/cyclone_vc10.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,96 +15,96 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\body.cpp">
<ClCompile Include="..\..\src\body.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\collide_coarse.cpp">
<ClCompile Include="..\..\src\collide_coarse.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\collide_fine.cpp">
<ClCompile Include="..\..\src\collide_fine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\contacts.cpp">
<ClCompile Include="..\..\src\contacts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\core.cpp">
<ClCompile Include="..\..\src\core.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\fgen.cpp">
<ClCompile Include="..\..\src\fgen.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\joints.cpp">
<ClCompile Include="..\..\src\joints.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\particle.cpp">
<ClCompile Include="..\..\src\particle.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\pcontacts.cpp">
<ClCompile Include="..\..\src\pcontacts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\pfgen.cpp">
<ClCompile Include="..\..\src\pfgen.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\plinks.cpp">
<ClCompile Include="..\..\src\plinks.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\pworld.cpp">
<ClCompile Include="..\..\src\pworld.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\random.cpp">
<ClCompile Include="..\..\src\random.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\world.cpp">
<ClCompile Include="..\..\src\world.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\cyclone\body.h">
<ClInclude Include="..\..\include\cyclone\body.h">
<Filter>Header Files\cyclone</Filter>
</ClInclude>
<ClInclude Include="..\include\cyclone\collide_coarse.h">
<ClInclude Include="..\..\include\cyclone\collide_coarse.h">
<Filter>Header Files\cyclone</Filter>
</ClInclude>
<ClInclude Include="..\include\cyclone\collide_fine.h">
<ClInclude Include="..\..\include\cyclone\collide_fine.h">
<Filter>Header Files\cyclone</Filter>
</ClInclude>
<ClInclude Include="..\include\cyclone\contacts.h">
<ClInclude Include="..\..\include\cyclone\contacts.h">
<Filter>Header Files\cyclone</Filter>
</ClInclude>
<ClInclude Include="..\include\cyclone\core.h">
<ClInclude Include="..\..\include\cyclone\core.h">
<Filter>Header Files\cyclone</Filter>
</ClInclude>
<ClInclude Include="..\include\cyclone\cyclone.h">
<ClInclude Include="..\..\include\cyclone\cyclone.h">
<Filter>Header Files\cyclone</Filter>
</ClInclude>
<ClInclude Include="..\include\cyclone\fgen.h">
<ClInclude Include="..\..\include\cyclone\fgen.h">
<Filter>Header Files\cyclone</Filter>
</ClInclude>
<ClInclude Include="..\include\cyclone\joints.h">
<ClInclude Include="..\..\include\cyclone\joints.h">
<Filter>Header Files\cyclone</Filter>
</ClInclude>
<ClInclude Include="..\include\cyclone\particle.h">
<ClInclude Include="..\..\include\cyclone\particle.h">
<Filter>Header Files\cyclone</Filter>
</ClInclude>
<ClInclude Include="..\include\cyclone\pcontacts.h">
<ClInclude Include="..\..\include\cyclone\pcontacts.h">
<Filter>Header Files\cyclone</Filter>
</ClInclude>
<ClInclude Include="..\include\cyclone\pfgen.h">
<ClInclude Include="..\..\include\cyclone\pfgen.h">
<Filter>Header Files\cyclone</Filter>
</ClInclude>
<ClInclude Include="..\include\cyclone\plinks.h">
<ClInclude Include="..\..\include\cyclone\plinks.h">
<Filter>Header Files\cyclone</Filter>
</ClInclude>
<ClInclude Include="..\include\cyclone\precision.h">
<ClInclude Include="..\..\include\cyclone\precision.h">
<Filter>Header Files\cyclone</Filter>
</ClInclude>
<ClInclude Include="..\include\cyclone\pworld.h">
<ClInclude Include="..\..\include\cyclone\pworld.h">
<Filter>Header Files\cyclone</Filter>
</ClInclude>
<ClInclude Include="..\include\cyclone\random.h">
<ClInclude Include="..\..\include\cyclone\random.h">
<Filter>Header Files\cyclone</Filter>
</ClInclude>
<ClInclude Include="..\include\cyclone\world.h">
<ClInclude Include="..\..\include\cyclone\world.h">
<Filter>Header Files\cyclone</Filter>
</ClInclude>
</ItemGroup>
Expand Down
30 changes: 15 additions & 15 deletions build/vs2010/demo_ballistic_vc10.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\tmp\ballistic\Debug\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\tmp\ballistic\Debug\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\tmp\ballistic\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\tmp\ballistic\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
Expand All @@ -56,7 +56,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
Expand All @@ -69,16 +69,16 @@
<Link>
<AdditionalDependencies>cyclone_d.lib;opengl32.lib;glu32.lib;glut32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
<AdditionalLibraryDirectories>../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../../lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\tmp\ballistic\Debug/ballistic.pdb</ProgramDatabaseFile>
<ProgramDatabaseFile>..\..\tmp\ballistic\Debug/ballistic.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
Expand All @@ -89,7 +89,7 @@
<Link>
<AdditionalDependencies>cyclone.lib;opengl32.lib;glu32.lib;glut32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
<AdditionalLibraryDirectories>../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../../lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Expand All @@ -98,17 +98,17 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\demos\ballistic\ballistic.cpp" />
<ClCompile Include="..\src\demos\app.cpp" />
<ClCompile Include="..\src\demos\main.cpp">
<ClCompile Include="..\..\src\demos\ballistic\ballistic.cpp" />
<ClCompile Include="..\..\src\demos\app.cpp" />
<ClCompile Include="..\..\src\demos\main.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\src\demos\timing.cpp" />
<ClCompile Include="..\..\src\demos\timing.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\demos\app.h" />
<ClInclude Include="..\src\demos\timing.h" />
<ClInclude Include="..\..\src\demos\app.h" />
<ClInclude Include="..\..\src\demos\timing.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
12 changes: 6 additions & 6 deletions build/vs2010/demo_ballistic_vc10.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\demos\ballistic\ballistic.cpp">
<ClCompile Include="..\..\src\demos\ballistic\ballistic.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\demos\app.cpp">
<ClCompile Include="..\..\src\demos\app.cpp">
<Filter>Common Files</Filter>
</ClCompile>
<ClCompile Include="..\src\demos\main.cpp">
<ClCompile Include="..\..\src\demos\main.cpp">
<Filter>Common Files</Filter>
</ClCompile>
<ClCompile Include="..\src\demos\timing.cpp">
<ClCompile Include="..\..\src\demos\timing.cpp">
<Filter>Common Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\demos\app.h">
<ClInclude Include="..\..\src\demos\app.h">
<Filter>Common Files</Filter>
</ClInclude>
<ClInclude Include="..\src\demos\timing.h">
<ClInclude Include="..\..\src\demos\timing.h">
<Filter>Common Files</Filter>
</ClInclude>
</ItemGroup>
Expand Down
Loading