Skip to content

Commit 28174a0

Browse files
zoobazooba
committed
Update for new version of ogre3d
1 parent 063acd5 commit 28174a0

File tree

5 files changed

+36
-30
lines changed

5 files changed

+36
-30
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
/ogre
33
/sdl
44
/src/Debug
5+
/src/x64/Debug
56
/src/Release
7+
/src/x64/Release
68
/tmp
79

810
.vs

‎get_externals.ps1‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

2-
$pver = & py -3.6-32 -V
2+
$pver = & py -3.6 -V
33
if (-not $?) {
4-
Write-Host "Please install Python 3.6 32-bit (including the launcher)"
5-
Write-Host " ** https://www.python.org/ftp/python/3.6.5/python-3.6.5-webinstall.exe"
4+
Write-Host "Please install Python 3.6 64-bit (including the launcher)"
5+
Write-Host " ** https://www.python.org/ftp/python/3.6.6/python-3.6.6-amd64-webinstall.exe"
66
Write-Host ""
77
Write-Host "After installing, rerun this script."
88
exit 1
@@ -15,18 +15,20 @@ if (Test-Path "ogre") {
1515
del -r -fo ogre
1616
}
1717
if (-not (Test-Path "$tmp\ogre.zip")) {
18-
iwr "https://bintray.com/ogrecave/ogre/download_file?file_path=ogre-sdk-master-vc14-x64.zip" -OutFile "$tmp\ogre.zip"
18+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
19+
iwr "https://bintray.com/ogrecave/ogre/download_file?file_path=ogre-sdk-1.11.1-vc15-x64.zip" -OutFile "$tmp\ogre.zip"
1920
}
20-
py -3.6-32 -m zipfile -e "$tmp\ogre.zip" ogre
21+
py -3.6 -m zipfile -e "$tmp\ogre.zip" ogre
2122

2223
Write-Host "Getting SDL2 dev libraries - https://www.libsdl.org/download-2.0.php"
2324
if (Test-Path "sdl") {
2425
del -r -fo sdl
2526
}
2627
if (-not (Test-Path "$tmp\sdl2.zip")) {
27-
iwr "https://www.libsdl.org/release/SDL2-devel-2.0.8-VC.zip" -OutFile "$tmp\sdl2.zip"
28+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
29+
iwr "http://libsdl.org/release/SDL2-devel-2.0.8-VC.zip" -OutFile "$tmp\sdl2.zip"
2830
}
29-
py -3.6-32 -m zipfile -e "$tmp\sdl2.zip" sdl
31+
py -3.6 -m zipfile -e "$tmp\sdl2.zip" sdl
3032

3133
Write-Host ""
3234
if (Test-Path "$env:SystemRoot\SysWOW64\d3dx9_43.dll") {

‎src/PythonCharacter.sln‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythonCharacter", "PythonCh
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10-
Debug|x86 = Debug|x86
11-
Release|x86 = Release|x86
10+
Debug|x64 = Debug|x64
11+
Release|x64 = Release|x64
1212
EndGlobalSection
1313
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{430F9796-C070-4288-A009-2B99A1A051B8}.Debug|x86.ActiveCfg = Debug|Win32
15-
{430F9796-C070-4288-A009-2B99A1A051B8}.Debug|x86.Build.0 = Debug|Win32
16-
{430F9796-C070-4288-A009-2B99A1A051B8}.Release|x86.ActiveCfg = Release|Win32
17-
{430F9796-C070-4288-A009-2B99A1A051B8}.Release|x86.Build.0 = Release|Win32
14+
{430F9796-C070-4288-A009-2B99A1A051B8}.Debug|x64.ActiveCfg = Debug|x64
15+
{430F9796-C070-4288-A009-2B99A1A051B8}.Debug|x64.Build.0 = Debug|x64
16+
{430F9796-C070-4288-A009-2B99A1A051B8}.Release|x64.ActiveCfg = Release|x64
17+
{430F9796-C070-4288-A009-2B99A1A051B8}.Release|x64.Build.0 = Release|x64
1818
EndGlobalSection
1919
GlobalSection(SolutionProperties) = preSolution
2020
HideSolutionNode = FALSE

‎src/PythonCharacter.vcxproj‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|Win32">
4+
<ProjectConfiguration Include="Debug|x64">
55
<Configuration>Debug</Configuration>
6-
<Platform>Win32</Platform>
6+
<Platform>x64</Platform>
77
</ProjectConfiguration>
8-
<ProjectConfiguration Include="Release|Win32">
8+
<ProjectConfiguration Include="Release|x64">
99
<Configuration>Release</Configuration>
10-
<Platform>Win32</Platform>
10+
<Platform>x64</Platform>
1111
</ProjectConfiguration>
1212
</ItemGroup>
1313
<PropertyGroup Label="Globals">
1414
<VCProjectVersion>15.0</VCProjectVersion>
1515
<TargetName>Sample_PythonCharacter</TargetName>
1616
<ProjectGuid>{430F9796-C070-4288-A009-2B99A1A051B8}</ProjectGuid>
17-
<Keyword>Win32Proj</Keyword>
17+
<Keyword>x64Proj</Keyword>
1818
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
1919
</PropertyGroup>
2020
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
21-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
21+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
2222
<ConfigurationType>DynamicLibrary</ConfigurationType>
2323
<UseDebugLibraries>true</UseDebugLibraries>
2424
<PlatformToolset>v141</PlatformToolset>
2525
</PropertyGroup>
26-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
26+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
2727
<ConfigurationType>DynamicLibrary</ConfigurationType>
2828
<UseDebugLibraries>false</UseDebugLibraries>
2929
<PlatformToolset>v141</PlatformToolset>
@@ -33,32 +33,32 @@
3333
</ImportGroup>
3434
<ImportGroup Label="Shared">
3535
</ImportGroup>
36-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
36+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
3737
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3838
<Import Project="..\includes.props" />
3939
</ImportGroup>
40-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
40+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
4141
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4242
<Import Project="..\includes.props" />
4343
</ImportGroup>
4444
<PropertyGroup Label="UserMacros" />
45-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
4646
<LinkIncremental>true</LinkIncremental>
4747
<OutDir>$(ProjectDir)\..\ogre\bin\</OutDir>
4848
<LocalDebuggerCommand>$(OutDir)SampleBrowser.exe</LocalDebuggerCommand>
4949
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
5050
<LocalDebuggerEnvironment>PYTHONPATH=$(ProjectDir.TrimEnd(`\`))%0APATH=%PATH%;$(PythonHome.TrimEnd(`\`))</LocalDebuggerEnvironment>
5151
</PropertyGroup>
52-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
52+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
5353
<LinkIncremental>true</LinkIncremental>
5454
<OutDir>$(ProjectDir)\..\ogre\bin\</OutDir>
5555
<LocalDebuggerCommand>$(OutDir)SampleBrowser.exe</LocalDebuggerCommand>
5656
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
5757
<LocalDebuggerEnvironment>PYTHONPATH=$(ProjectDir.TrimEnd(`\`))%0APATH=%PATH%;$(PythonHome.TrimEnd(`\`))</LocalDebuggerEnvironment>
5858
</PropertyGroup>
59-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
59+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6060
<ClCompile>
61-
<PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;PYTHONCHARACTER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
61+
<PreprocessorDefinitions>WIN64;_WINDOWS;_USRDLL;PYTHONCHARACTER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6262
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
6363
<WarningLevel>Level3</WarningLevel>
6464
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -68,15 +68,15 @@
6868
<DisableSpecificWarnings>4251;4275;%(DisableSpecificWarnings)</DisableSpecificWarnings>
6969
</ClCompile>
7070
<Link>
71-
<TargetMachine>MachineX86</TargetMachine>
71+
<TargetMachine>MachineX64</TargetMachine>
7272
<GenerateDebugInformation>true</GenerateDebugInformation>
7373
<SubSystem>Windows</SubSystem>
7474
<AdditionalDependencies>OgreMain.lib;OgreBites.lib;%(AdditionalDependencies)</AdditionalDependencies>
7575
</Link>
7676
</ItemDefinitionGroup>
77-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
77+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
7878
<ClCompile>
79-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHONCHARACTER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
79+
<PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;PYTHONCHARACTER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8080
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
8181
<WarningLevel>Level3</WarningLevel>
8282
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -85,7 +85,7 @@
8585
<DisableSpecificWarnings>4251;4275;%(DisableSpecificWarnings)</DisableSpecificWarnings>
8686
</ClCompile>
8787
<Link>
88-
<TargetMachine>MachineX86</TargetMachine>
88+
<TargetMachine>MachineX64</TargetMachine>
8989
<GenerateDebugInformation>true</GenerateDebugInformation>
9090
<SubSystem>Windows</SubSystem>
9191
<EnableCOMDATFolding>true</EnableCOMDATFolding>

‎src/pch.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#pragma once
22

3+
#include <windows.h>
4+
35
#include "DefaultSamplesPlugin.h"
46
#include "SdkSample.h"
57
#include "SinbadCharacterController.h"

0 commit comments

Comments
 (0)