Skip to content

D
deprecated-irrlicht-mac
Commit 24c7dd09 authored by hybrid's avatar hybrid
Browse files
Options

Merged revisions 1600:1650 from 1.4 branch. Just renaming of example 17. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1651 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 4b5ce62e
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 20 deletions
examples/17.SplitScreen/Makefile → examples/18.SplitScreen/Makefile
View file @ 24c7dd09
# Makefile for Irrlicht Examples # Makefile for Irrlicht Examples
# It's usually sufficient to change just the target name and source file list # It's usually sufficient to change just the target name and source file list
# and be sure that CXX is set to a valid compiler # and be sure that CXX is set to a valid compiler
Target = 17.SplitScreen Target = 18.SplitScreen
Sources = main.cpp Sources = main.cpp
# general compiler settings # general compiler settings
......
examples/17.SplitScreen/Quake3MapShader.sln → examples/18.SplitScreen/SplitScreen.sln
View file @ 24c7dd09
Microsoft Visual Studio Solution File, Format Version 8.00 Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "17.SplitScreen", "SplitScreen.vcproj", "{EB3B38EA-5CE7-4983-845B-880661E69D09}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "18.SplitScreen", "SplitScreen.vcproj", "{EB3B38EA-5CE7-4983-845B-880661E69D09}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
EndProjectSection EndProjectSection
EndProject EndProject
......
examples/17.SplitScreen/Quake3MapShader.vcproj → examples/18.SplitScreen/SplitScreen.vcproj
View file @ 24c7dd09
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="7.10" Version="7.10"
Name="17.SplitScreen" Name="18.SplitScreen"
ProjectGUID="{EB3B38EA-5CE7-4983-845B-880661E69D09}" ProjectGUID="{EB3B38EA-5CE7-4983-845B-880661E69D09}"
Keyword="Win32Proj"> Keyword="Win32Proj">
<Platforms> <Platforms>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="..\..\bin\Win32-VisualStudio\17.SplitScreen.exe" OutputFile="..\..\bin\Win32-VisualStudio\18.SplitScreen.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="..\..\bin\Win32-VisualStudio\17.SplitScreen.exe" OutputFile="..\..\bin\Win32-VisualStudio\18.SplitScreen.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
......
examples/17.SplitScreen/Quake3MapShader_vc8.vcproj → examples/18.SplitScreen/SplitScreen_vc8.vcproj
View file @ 24c7dd09
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
Name="17.SplitScreen_vc8" Name="18.SplitScreen_vc8"
ProjectGUID="{EB3B38EA-5CE7-4983-845B-880661E69D09}" ProjectGUID="{EB3B38EA-5CE7-4983-845B-880661E69D09}"
Keyword="Win32Proj" Keyword="Win32Proj"
> >
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="..\..\bin\Win32-VisualStudio\17.SplitScreen.exe" OutputFile="..\..\bin\Win32-VisualStudio\18.SplitScreen.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
GenerateDebugInformation="true" GenerateDebugInformation="true"
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="..\..\bin\Win32-VisualStudio\17.SplitScreen.exe" OutputFile="..\..\bin\Win32-VisualStudio\18.SplitScreen.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
GenerateDebugInformation="false" GenerateDebugInformation="false"
......
examples/17.SplitScreen/Quake3MapShader_vc9.vcproj → examples/18.SplitScreen/SplitScreen_vc9.vcproj
View file @ 24c7dd09
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9,00" Version="9,00"
Name="17.SplitScreen_vc9" Name="18.SplitScreen_vc9"
ProjectGUID="{EB3B38EA-5CE7-4983-845B-880661E69D09}" ProjectGUID="{1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}"
RootNamespace="17.SplitScreen_vc9" RootNamespace="18.SplitScreen_vc9"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="131072" TargetFrameworkVersion="131072"
> >
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="..\..\bin\Win32-VisualStudio\17.SplitScreen.exe" OutputFile="..\..\bin\Win32-VisualStudio\18.SplitScreen.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
GenerateDebugInformation="true" GenerateDebugInformation="true"
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="..\..\bin\Win32-VisualStudio\17.SplitScreen.exe" OutputFile="..\..\bin\Win32-VisualStudio\18.SplitScreen.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
GenerateDebugInformation="false" GenerateDebugInformation="false"
......
examples/17.SplitScreen/example.dev → examples/18.SplitScreen/example.dev
View file @ 24c7dd09
[Project] [Project]
FileName=example.dev FileName=example.dev
Name=Irrlicht Example 17 SplitScreen Name=Irrlicht Example 18 SplitScreen
UnitCount=1 UnitCount=1
Type=1 Type=1
Ver=1 Ver=1
...@@ -18,7 +18,7 @@ Icon= ...@@ -18,7 +18,7 @@ Icon=
ExeOutput=../../bin/Win32-gcc ExeOutput=../../bin/Win32-gcc
ObjectOutput=obj ObjectOutput=obj
OverrideOutput=1 OverrideOutput=1
OverrideOutputName=17.SplitScreen.exe OverrideOutputName=18.SplitScreen.exe
HostApplication= HostApplication=
Folders= Folders=
CommandLine= CommandLine=
......
examples/17.SplitScreen/main.cpp → examples/18.SplitScreen/main.cpp
View file @ 24c7dd09
/** Example 017 Splitscreen /** Example 018 Splitscreen
A tutorial by Max Winkel. A tutorial by Max Winkel.
......
examples/BuildAllExamples.sln → examples/BuildAllExamples_v8.sln
View file @ 24c7dd09
...@@ -38,10 +38,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_vc8", "Demo\Demo_vc8.v ...@@ -38,10 +38,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_vc8", "Demo\Demo_vc8.v
{E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F} {E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "16.Quake3MapShader_vc8", "16.Quake3MapShader\Quake3MapShader_vc8.vcproj", "{EB3B38EA-5CE7-4983-845B-880661E69D09}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Quake3MapShader_vc8", "16.Quake3MapShader\Quake3MapShader_vc8.vcproj", "{EB3B38EA-5CE7-4983-845B-880661E69D09}"
ProjectSection(ProjectDependencies) = postProject
{E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F}
EndProjectSection
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
examples/BuildAllExamples_v9.sln
View file @ 24c7dd09
...@@ -88,6 +88,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "16.Quake3MapShader_vc9", "1 ...@@ -88,6 +88,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "16.Quake3MapShader_vc9", "1
{E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F} {E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "18.SplitScreen_vc9", "18.SplitScreen\SplitScreen_vc9.vcproj", "{1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
...@@ -166,6 +168,10 @@ Global ...@@ -166,6 +168,10 @@ Global
{EB3B38EA-5CE7-4983-845B-880661E69D09}.Debug|Win32.Build.0 = Debug|Win32 {EB3B38EA-5CE7-4983-845B-880661E69D09}.Debug|Win32.Build.0 = Debug|Win32
{EB3B38EA-5CE7-4983-845B-880661E69D09}.Release|Win32.ActiveCfg = Release|Win32 {EB3B38EA-5CE7-4983-845B-880661E69D09}.Release|Win32.ActiveCfg = Release|Win32
{EB3B38EA-5CE7-4983-845B-880661E69D09}.Release|Win32.Build.0 = Release|Win32 {EB3B38EA-5CE7-4983-845B-880661E69D09}.Release|Win32.Build.0 = Release|Win32
{1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}.Debug|Win32.ActiveCfg = Debug|Win32
{1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}.Debug|Win32.Build.0 = Debug|Win32
{1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}.Release|Win32.ActiveCfg = Release|Win32
{1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment