new engine
This commit is contained in:
roman.larionov committed
1 parent
59f74b3826
commit
450e80b278
20 files changed
+586865
-661
No files matched your search
Binary file not shown.
@@ -1,121 +1,81 @@
|
||||
Log started␍
|
||||
OpenGL Window created␍
|
||||
Sound thread finally over. Let's go!
|
||||
Render::OpenGL glVersion = 4.0.10318 Compatibility Profile Context␍
|
||||
Render::OpenGL glVersion above 2.0 ok␍
|
||||
Render::OpenGL GL_ARB_framebuffer_object supported ok␍
|
||||
Render::OpenGL GL_ARB_uniform_buffer_object supported ok␍
|
||||
APP INIT
|
||||
Prepare to add shader TestShader␍
|
||||
ResourceManager::ShaderManager::Shader deleting␍
|
||||
ResourceManager::ShaderManager::Shader deleting␍
|
||||
Buffer thread go!
|
||||
Sound thread go!
|
||||
No more music and no sounds. Lock sound thread!
|
||||
ResourceManager::ShaderManager::Shader Vertex shader was successfully compiled to run on hardware.
|
||||
␍
|
||||
ResourceManager::ShaderManager::Shader Fragment shader was successfully compiled to run on hardware.
|
||||
WARNING: 0:1: warning(#260) Keyword 'precision' is supported in GLSL 1.3
|
||||
␍
|
||||
ResourceManager::ShaderManager::Shader Fragment shader(s) linked, vertex shader(s) linked.
|
||||
WARNING: 0:1: warning(#260) Keyword 'precision' is supported in GLSL 1.3
|
||||
WARNING: warning(#276) Symbol 'texCoord' usage doesn't match between two stages
|
||||
WARNING: warning(#276) Symbol 'texCoord' usage do␍
|
||||
ResourceManager::ShaderManager shader loaded: TestShader␍
|
||||
Prepare to add shader FrameShader␍
|
||||
ResourceManager::ShaderManager::Shader deleting␍
|
||||
ResourceManager::ShaderManager::Shader deleting␍
|
||||
ResourceManager::ShaderManager::Shader Vertex shader was successfully compiled to run on hardware.
|
||||
␍
|
||||
ResourceManager::ShaderManager::Shader Fragment shader was successfully compiled to run on hardware.
|
||||
WARNING: 0:1: warning(#260) Keyword 'precision' is supported in GLSL 1.3
|
||||
␍
|
||||
ResourceManager::ShaderManager::Shader Fragment shader(s) linked, vertex shader(s) linked.
|
||||
WARNING: 0:1: warning(#260) Keyword 'precision' is supported in GLSL 1.3
|
||||
WARNING: warning(#276) Symbol 'texCoord' usage doesn't match between two stages
|
||||
WARNING: warning(#276) Symbol 'texCoord' usage do␍
|
||||
ResourceManager::ShaderManager shader loaded: FrameShader␍
|
||||
Prepare to add shader BrickShader␍
|
||||
ResourceManager::ShaderManager::Shader deleting␍
|
||||
ResourceManager::ShaderManager::Shader deleting␍
|
||||
ResourceManager::ShaderManager::Shader Vertex shader was successfully compiled to run on hardware.
|
||||
␍
|
||||
ResourceManager::ShaderManager::Shader Fragment shader was successfully compiled to run on hardware.
|
||||
WARNING: 0:1: warning(#260) Keyword 'precision' is supported in GLSL 1.3
|
||||
␍
|
||||
ResourceManager::ShaderManager::Shader Fragment shader(s) linked, vertex shader(s) linked.
|
||||
WARNING: 0:1: warning(#260) Keyword 'precision' is supported in GLSL 1.3
|
||||
WARNING: warning(#276) Symbol 'texCoord' usage doesn't match between two stages
|
||||
WARNING: warning(#276) Symbol 'texCoord' usage do␍
|
||||
ResourceManager::ShaderManager shader loaded: BrickShader␍
|
||||
ResourceManager::TexList Texture added: loading.bmp with id = 1␍
|
||||
ResourceManager::TexList Texture added: logo_small.bmp32 with id = 2␍
|
||||
FrameManager:: frame buffer added: LevelBuffer␍
|
||||
OggStream created successfully
|
||||
ResourceManager::TexList Texture added: main_menu_bkg_left.bmp with id = 4␍
|
||||
ResourceManager::TexList Texture added: main_menu_bkg_right.bmp with id = 5␍
|
||||
ResourceManager::TexList Texture added: select_level.bmp32 with id = 6␍
|
||||
ResourceManager::TexList Texture added: shutterstock1.bmp with id = 7␍
|
||||
ResourceManager::TexList Texture added: shutterstock2.bmp with id = 8␍
|
||||
ResourceManager::TexList Texture added: shutterstock3.bmp with id = 9␍
|
||||
ResourceManager::TexList Texture added: shutterstock4.bmp with id = 10␍
|
||||
ResourceManager::TexList Texture added: shutterstock5.bmp with id = 11␍
|
||||
ResourceManager::TexList Texture added: shutterstock6.bmp with id = 12␍
|
||||
ResourceManager::TexList Texture added: shutterstock7.bmp with id = 13␍
|
||||
ResourceManager::TexList Texture added: shutterstock8.bmp with id = 14␍
|
||||
ResourceManager::TexList Texture added: shutterstock9.bmp with id = 15␍
|
||||
ResourceManager::TexList Texture added: shutterstock10.bmp with id = 16␍
|
||||
ResourceManager::TexList Texture added: shutterstock11.bmp with id = 17␍
|
||||
ResourceManager::TexList Texture added: shutterstock12.bmp with id = 18␍
|
||||
ResourceManager::TexList Texture added: levelshot1.bmp with id = 19␍
|
||||
ResourceManager::TexList Texture added: levelshot2.bmp with id = 20␍
|
||||
ResourceManager::TexList Texture added: levelshot3.bmp with id = 21␍
|
||||
ResourceManager::TexList Texture added: levelshot4.bmp with id = 22␍
|
||||
ResourceManager::TexList Texture added: levelshot5.bmp with id = 23␍
|
||||
ResourceManager::TexList Texture added: levelshot6.bmp with id = 24␍
|
||||
ResourceManager::TexList Texture added: levelshot7.bmp with id = 25␍
|
||||
ResourceManager::TexList Texture added: levelshot8.bmp with id = 26␍
|
||||
ResourceManager::TexList Texture added: levelshot9.bmp with id = 27␍
|
||||
ResourceManager::TexList Texture added: levelshot10.bmp with id = 28␍
|
||||
ResourceManager::TexList Texture added: levelshot11.bmp with id = 29␍
|
||||
ResourceManager::TexList Texture added: levelshot12.bmp with id = 30␍
|
||||
ResourceManager::TexList Texture added: game_end.bmp32 with id = 31␍
|
||||
ResourceManager::TexList Texture added: block1.bmp32 with id = 32␍
|
||||
ResourceManager::TexList Texture added: block2.bmp32 with id = 33␍
|
||||
ResourceManager::TexList Texture added: block3.bmp32 with id = 34␍
|
||||
ResourceManager::TexList Texture added: bonus_gothrough.bmp32 with id = 35␍
|
||||
ResourceManager::TexList Texture added: bonus_multiplier.bmp32 with id = 36␍
|
||||
ResourceManager::TexList Texture added: bonus_floor.bmp32 with id = 37␍
|
||||
ResourceManager::TexList Texture added: ball.bmp32 with id = 38␍
|
||||
ResourceManager::TexList Texture added: ball_glow.bmp32 with id = 39␍
|
||||
ResourceManager::TexList Texture added: wall_left.bmp32 with id = 40␍
|
||||
ResourceManager::TexList Texture added: wall_right.bmp32 with id = 41␍
|
||||
ResourceManager::TexList Texture added: wall_up.bmp32 with id = 42␍
|
||||
ResourceManager::TexList Texture added: wall_bonus.bmp32 with id = 43␍
|
||||
ResourceManager::TexList Texture added: reflector.bmp32 with id = 44␍
|
||||
ResourceManager::TexList Texture added: back_btn.bmp32 with id = 45␍
|
||||
ResourceManager::TexList Texture added: slide_up_btn.bmp32 with id = 46␍
|
||||
ResourceManager::TexList Texture added: tap_to_continue_btn.bmp32 with id = 47␍
|
||||
ResourceManager::TexList Texture added: credits.bmp32 with id = 48␍
|
||||
Projection:
|
||||
0.00416667 0 0 0 0 0.00625 0 0 0 0 -1 0 -1 -1 0 1 ␍
|
||||
Modelview:
|
||||
1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 ␍
|
||||
ProjectonModelview:
|
||||
0.00416667 0 0 0 0 0.00625 0 0 0 0 -1 0 -1 -1 0 1 ␍
|
||||
Program prepares to quit␍
|
||||
APP DEINIT
|
||||
Deinit Sound Manager!
|
||||
Buffer thread over!
|
||||
Unlock processSoundListMutex to destroy buffering thread!
|
||||
No more music and no sounds. Lock sound thread!
|
||||
Sound thread over!
|
||||
Unlock SoundThreadMutex to destroy sound thread!
|
||||
ResourceManager::FrameManager deleting␍
|
||||
ResourceManager::ShaderManager::Shader deleting␍
|
||||
ResourceManager::ShaderManager::Shader deleting␍
|
||||
ResourceManager::ShaderManager::Shader deleting␍
|
||||
ResourceManager::ShaderManager deleting␍
|
||||
ResourceManager::TexList cleared␍
|
||||
ResourceManager::TexList deleting␍
|
||||
HalibutRender::deleting␍
|
||||
2017-Nov-13 16:11:17: Log started
|
||||
2017-Nov-13 16:11:17: Script manager ready
|
||||
2017-Nov-13 16:11:17: Render::OpenGL glVersion = 4.4.0 - Build 20.19.15.4483
|
||||
2017-Nov-13 16:11:17: Render::OpenGL glVersion above 2.0 ok
|
||||
2017-Nov-13 16:11:17: Render::OpenGL GL_ARB_framebuffer_object supported ok
|
||||
2017-Nov-13 16:11:17: Render::OpenGL GL_ARB_uniform_buffer_object supported ok
|
||||
2017-Nov-13 16:11:17: Bind basic functions
|
||||
2017-Nov-13 16:11:17: APP INIT
|
||||
|
||||
2017-Nov-13 16:11:17: Prepare to add shader DefaultShader
|
||||
2017-Nov-13 16:11:17: ResourceManager::ShaderManager::Shader WARNING: 0:2: '' : #version directive missing
|
||||
|
||||
|
||||
2017-Nov-13 16:11:17: ResourceManager::ShaderManager::Shader WARNING: 0:1: 'precision' : symbol not available in current GLSL version
|
||||
WARNING: 0:1: 'mediump' : symbol not available in current GLSL version
|
||||
WARNING: 0:2: '' : #version directive missing
|
||||
|
||||
|
||||
2017-Nov-13 16:11:17: Shader program is - 3
|
||||
2017-Nov-13 16:11:17: ResourceManager::ShaderManager::Shader
|
||||
2017-Nov-13 16:11:17: ResourceManager::ShaderManager shader loaded: DefaultShader
|
||||
2017-Nov-13 16:11:17: Prepare to add shader FrameShader
|
||||
2017-Nov-13 16:11:17: ResourceManager::ShaderManager::Shader WARNING: 0:2: '' : #version directive missing
|
||||
|
||||
|
||||
2017-Nov-13 16:11:17: ResourceManager::ShaderManager::Shader WARNING: 0:1: 'precision' : symbol not available in current GLSL version
|
||||
WARNING: 0:1: 'mediump' : symbol not available in current GLSL version
|
||||
WARNING: 0:2: '' : #version directive missing
|
||||
|
||||
|
||||
2017-Nov-13 16:11:17: Shader program is - 6
|
||||
2017-Nov-13 16:11:17: ResourceManager::ShaderManager::Shader
|
||||
2017-Nov-13 16:11:17: ResourceManager::ShaderManager shader loaded: FrameShader
|
||||
2017-Nov-13 16:11:17: Prepare to add shader BrickShader
|
||||
2017-Nov-13 16:11:17: ResourceManager::ShaderManager::Shader WARNING: 0:2: '' : #version directive missing
|
||||
|
||||
|
||||
2017-Nov-13 16:11:17: ResourceManager::ShaderManager::Shader WARNING: 0:1: 'precision' : symbol not available in current GLSL version
|
||||
WARNING: 0:1: 'mediump' : symbol not available in current GLSL version
|
||||
WARNING: 0:2: '' : #version directive missing
|
||||
|
||||
|
||||
2017-Nov-13 16:11:17: Shader program is - 9
|
||||
2017-Nov-13 16:11:17: ResourceManager::ShaderManager::Shader
|
||||
2017-Nov-13 16:11:17: ResourceManager::ShaderManager shader loaded: BrickShader
|
||||
2017-Nov-13 16:11:17: ResourceManager::TexList Texture added: loading with id = 1
|
||||
2017-Nov-13 16:11:17: ResourceManager::TexList Texture added: logo_small with id = 2
|
||||
2017-Nov-13 16:11:17: ResourceManager::TexList Texture added: console_bkg.bmp with id = 3
|
||||
2017-Nov-13 16:11:17: FrameManager:: frame buffer added: LevelBuffer
|
||||
2017-Nov-13 16:11:18: ResourceManager::TexList Texture added: droid_sans14_font_bitmap.png with id = 5
|
||||
2017-Nov-13 16:11:18: ResourceManager::TexList Texture added: main_menu_bkg_left with id = 6
|
||||
2017-Nov-13 16:11:18: ResourceManager::TexList Texture added: main_menu_bkg_right with id = 7
|
||||
2017-Nov-13 16:11:18: ResourceManager::TexList Texture added: select_level with id = 8
|
||||
2017-Nov-13 16:11:18: ResourceManager::TexList Texture added: shutterstock1 with id = 9
|
||||
2017-Nov-13 16:11:18: ResourceManager::TexList Texture added: shutterstock2 with id = 10
|
||||
2017-Nov-13 16:11:18: ResourceManager::TexList Texture added: shutterstock3 with id = 11
|
||||
2017-Nov-13 16:11:18: ResourceManager::TexList Texture added: shutterstock4 with id = 12
|
||||
2017-Nov-13 16:11:18: ResourceManager::TexList Texture added: shutterstock5 with id = 13
|
||||
2017-Nov-13 16:11:18: ResourceManager::TexList Texture added: shutterstock6 with id = 14
|
||||
2017-Nov-13 16:11:18: ResourceManager::TexList Texture added: shutterstock7 with id = 15
|
||||
2017-Nov-13 16:11:19: ResourceManager::TexList Texture added: shutterstock8 with id = 16
|
||||
2017-Nov-13 16:11:19: ResourceManager::TexList Texture added: shutterstock9 with id = 17
|
||||
2017-Nov-13 16:11:19: ResourceManager::TexList Texture added: shutterstock10 with id = 18
|
||||
2017-Nov-13 16:11:19: ResourceManager::TexList Texture added: shutterstock11 with id = 19
|
||||
2017-Nov-13 16:11:19: Outer Deinit
|
||||
2017-Nov-13 16:11:19: APP DEINIT
|
||||
|
||||
2017-Nov-13 16:11:19: Program prepares to quit
|
||||
2017-Nov-13 16:11:19: HalibutAnimationManager deleting...
|
||||
2017-Nov-13 16:11:19: GUI Manager deleting...
|
||||
2017-Nov-13 16:11:19: TFontManager deleting...
|
||||
2017-Nov-13 16:11:19: Script manager shutdown
|
||||
2017-Nov-13 16:11:19: ResourceManager::FrameManager deleting
|
||||
2017-Nov-13 16:11:19: ResourceManager::ShaderManager::Shader deleting
|
||||
2017-Nov-13 16:11:19: ResourceManager::ShaderManager::Shader deleting
|
||||
2017-Nov-13 16:11:19: ResourceManager::ShaderManager::Shader deleting
|
||||
2017-Nov-13 16:11:19: ResourceManager::ShaderManager cleared
|
||||
2017-Nov-13 16:11:19: ResourceManager::ShaderManager deleting
|
||||
2017-Nov-13 16:11:19: ResourceManager::ModelManager deleting
|
||||
2017-Nov-13 16:11:19: ResourceManager::TexList cleared
|
||||
2017-Nov-13 16:11:19: ResourceManager::TexList deleting
|
||||
@@ -1,32 +1,105 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 11.00
|
||||
# Visual C++ Express 2010
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.25420.1
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DoubleHitBalls-win", "DoubleHitBalls-win\DoubleHitBalls-win.vcxproj", "{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20} = {48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703} = {534F100C-E611-43BF-B6F3-AD9F9925F703}
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B} = {03736B28-58F6-4AEA-9D37-B6AC4F5F853B}
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195} = {A05BADE1-D792-4620-9928-13A7AFD0F195}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Salmon Engine", "..\..\..\..\Engine\Salmon Engine\Salmon Engine.vcxproj", "{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Engine", "..\..\..\tes-engine\windows\Engine\Engine.vcxproj", "{534F100C-E611-43BF-B6F3-AD9F9925F703}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "..\..\..\tes-engine\windows\libjpeg\libjpeg.vcxproj", "{A05BADE1-D792-4620-9928-13A7AFD0F195}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\..\tes-engine\windows\libpng\libpng.vcxproj", "{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug_nosound|Win32 = Debug_nosound|Win32
|
||||
Debug_nosound|x64 = Debug_nosound|x64
|
||||
Debug_nosound|x644 = Debug_nosound|x644
|
||||
Debug|Win32 = Debug|Win32
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x644 = Debug|x644
|
||||
Release|Win32 = Release|Win32
|
||||
Release|x64 = Release|x64
|
||||
Release|x644 = Release|x644
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Debug_nosound|Win32.ActiveCfg = Debug|Win32
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Debug_nosound|Win32.Build.0 = Debug|Win32
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Debug_nosound|x64.ActiveCfg = Debug|x64
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Debug_nosound|x64.Build.0 = Debug|x64
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Debug_nosound|x644.ActiveCfg = Release|Win32
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Debug_nosound|x644.Build.0 = Release|Win32
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Debug|x64.Build.0 = Debug|x64
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Debug|x644.ActiveCfg = Debug|Win32
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Debug|x644.Build.0 = Debug|Win32
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Release|Win32.Build.0 = Release|Win32
|
||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Debug_nosound|Win32.ActiveCfg = Debug_nosound|Win32
|
||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Debug_nosound|Win32.Build.0 = Debug_nosound|Win32
|
||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Release|Win32.Build.0 = Release|Win32
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Release|x64.ActiveCfg = Release|x64
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Release|x64.Build.0 = Release|x64
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Release|x644.ActiveCfg = Release|Win32
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug_nosound|Win32.ActiveCfg = Debug|Win32
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug_nosound|Win32.Build.0 = Debug|Win32
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug_nosound|x64.ActiveCfg = Debug|x64
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug_nosound|x64.Build.0 = Debug|x64
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug_nosound|x644.ActiveCfg = Debug|x64
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug_nosound|x644.Build.0 = Debug|x64
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug|x64.Build.0 = Debug|x64
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug|x644.ActiveCfg = Debug|x64
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug|x644.Build.0 = Debug|x64
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Release|Win32.Build.0 = Release|Win32
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Release|x64.ActiveCfg = Release|x64
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Release|x64.Build.0 = Release|x64
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Release|x644.ActiveCfg = Release|x64
|
||||
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Release|x644.Build.0 = Release|x64
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug_nosound|Win32.ActiveCfg = Debug|Win32
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug_nosound|Win32.Build.0 = Debug|Win32
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug_nosound|x64.ActiveCfg = Debug|x64
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug_nosound|x64.Build.0 = Debug|x64
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug_nosound|x644.ActiveCfg = Debug|x64
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug_nosound|x644.Build.0 = Debug|x64
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug|x64.Build.0 = Debug|x64
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug|x644.ActiveCfg = Debug|x64
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug|x644.Build.0 = Debug|x64
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Release|Win32.Build.0 = Release|Win32
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Release|x64.ActiveCfg = Release|x64
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Release|x64.Build.0 = Release|x64
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Release|x644.ActiveCfg = Release|x64
|
||||
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Release|x644.Build.0 = Release|x64
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug_nosound|Win32.ActiveCfg = Debug|Win32
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug_nosound|Win32.Build.0 = Debug|Win32
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug_nosound|x64.ActiveCfg = Debug|x64
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug_nosound|x64.Build.0 = Debug|x64
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug_nosound|x644.ActiveCfg = Debug|x64
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug_nosound|x644.Build.0 = Debug|x64
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug|x64.Build.0 = Debug|x64
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug|x644.ActiveCfg = Debug|x64
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug|x644.Build.0 = Debug|x64
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Release|Win32.Build.0 = Release|Win32
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Release|x64.ActiveCfg = Release|x64
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Release|x64.Build.0 = Release|x64
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Release|x644.ActiveCfg = Release|x64
|
||||
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Release|x644.Build.0 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
@@ -1,14 +1,22 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project DefaultTargets="Build" ToolsVersion="14.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="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}</ProjectGuid>
|
||||
@@ -20,12 +28,27 @@
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<CharacterSet>NotSet</CharacterSet>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<CharacterSet>NotSet</CharacterSet>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>NotSet</CharacterSet>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>NotSet</CharacterSet>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
@@ -33,20 +56,36 @@
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(SalmonEnginePath)include</IncludePath>
|
||||
<LibraryPath>$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(SalmonEnginePath)$(Configuration)</LibraryPath>
|
||||
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
|
||||
<LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
|
||||
<LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(SalmonEnginePath)include</IncludePath>
|
||||
<LibraryPath>$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(SalmonEnginePath)$(Configuration)</LibraryPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
|
||||
<LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>
|
||||
@@ -54,14 +93,31 @@
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;TARGET_WIN32;_WIN32_WINNT=0x0501;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>$(SalmonEnginePath);$(LibsPath)\boost_1_52_0;$(LibsPath)\libogg-1.3.0\include;$(LibsPath)\libvorbis-1.3.2\include;$(LibsPath)\sqplus\sqplus;$(LibsPath)\sqplus\include;$(LibsPath)\DirectXsdk\Include;$(LibsPath)\lpng1510;$(SolutionDir)\..\..\jni;</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>../../../game;../../../../tes-engine;../../../../eigen;../../../../boost_1_63_0/;../../../../boost_1_63_0/bin.v2/libs/system/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/date_time/build/msvc-14.0/debug/address-model-64/link-static/threading-multi/;../../../../boost_1_63_0/bin.v2/libs/regex/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/thread/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/chrono/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/signals/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../libs/boost-gil-extension;../../../../libs/jpeg-9;../../../../libs/jpeg-9/vc10;../../../../libs/lpng1510</AdditionalIncludeDirectories>
|
||||
<DisableSpecificWarnings>4503</DisableSpecificWarnings>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalLibraryDirectories>$(LibsPath)\boost_1_52_0\boost_windows\libs_engine\$(Configuration);$(LibsPath)\libogg-1.3.0\win32\VS2010\Win32\$(Configuration);$(LibsPath)\libvorbis-1.3.2\win32\VS2010\Win32\$(Configuration);$(LibsPath)\sqplus\lib;$(LibsPath)\DirectXsdk\Lib\x86;$(LibsPath)\lpng1510\projects\vstudio\Debug Library</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;glu32.lib;Salmon Engine.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;zlib.lib;libpng15.lib;dsound.lib;dxguid.lib;sqplusD.lib;squirrelD.lib;sqdbglibD.lib;sqstdlibD.lib</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>../../../game;../../../../tes-engine;../../../../eigen;../../../../boost_1_63_0/;../../../../boost_1_63_0/bin.v2/libs/system/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/date_time/build/msvc-14.0/debug/address-model-64/link-static/threading-multi/;../../../../boost_1_63_0/bin.v2/libs/regex/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/thread/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/chrono/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/signals/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../libs/boost-gil-extension;../../../../libs/jpeg-9;../../../../libs/jpeg-9/vc10;../../../../libs/lpng1510</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>libjpeg.lib;libpng.lib;Engine.lib;opengl32.lib;glu32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>TARGET_WIN32;DEBUG;_WIN32_WINNT=0x0501;EIGEN_DONT_ALIGN_STATICALLY;_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>../../../game;../../../../tes-engine;../../../../eigen;../../../../boost_1_63_0/;../../../../boost_1_63_0/bin.v2/libs/system/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/date_time/build/msvc-14.0/debug/address-model-64/link-static/threading-multi/;../../../../boost_1_63_0/bin.v2/libs/regex/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/thread/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/chrono/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/signals/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../libs/boost-gil-extension;../../../../libs/jpeg-9;../../../../libs/jpeg-9/vc10;../../../../libs/lpng1510</AdditionalIncludeDirectories>
|
||||
<DisableSpecificWarnings>4503</DisableSpecificWarnings>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalLibraryDirectories>../../../game;../../../../tes-engine;../../../../eigen;../../../../boost_1_63_0/;../../../../boost_1_63_0/bin.v2/libs/system/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/date_time/build/msvc-14.0/debug/address-model-64/link-static/threading-multi/;../../../../boost_1_63_0/bin.v2/libs/regex/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/thread/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/chrono/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/signals/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../libs/boost-gil-extension;../../../../libs/jpeg-9;../../../../libs/jpeg-9/vc10;../../../../libs/lpng1510</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>libjpeg.lib;libpng.lib;Engine.lib;opengl32.lib;glu32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
@@ -85,21 +141,42 @@
|
||||
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;glu32.lib;Salmon Engine.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;zlib.lib;libpng15.lib;dsound.lib;dxguid.lib;sqplus.lib;squirrel.lib;sqdbglib.lib;sqstdlib.lib</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;TARGET_WIN32;_WIN32_WINNT=0x0501;WIN32_LEAN_AND_MEAN;EIGEN_DONT_ALIGN_STATICALLY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>../../../game;../../../../tes-engine;../../../../eigen;../../../../boost_1_63_0/;../../../../boost_1_63_0/bin.v2/libs/system/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/date_time/build/msvc-14.0/release/address-model-64/link-static/threading-multi/;../../../../boost_1_63_0/bin.v2/libs/regex/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/thread/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/chrono/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/signals/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../libs/boost-gil-extension;../../../../libs/jpeg-9;../../../../libs/jpeg-9/vc10;../../../../libs/lpng1510</AdditionalIncludeDirectories>
|
||||
<DisableSpecificWarnings>4503</DisableSpecificWarnings>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<AdditionalLibraryDirectories>../../../game;../../../../tes-engine;../../../../eigen;../../../../boost_1_63_0/;../../../../boost_1_63_0/bin.v2/libs/system/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/date_time/build/msvc-14.0/release/address-model-64/link-static/threading-multi/;../../../../boost_1_63_0/bin.v2/libs/regex/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/thread/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/chrono/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/signals/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../libs/boost-gil-extension;../../../../libs/jpeg-9;../../../../libs/jpeg-9/vc10;../../../../libs/lpng1510</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>libjpeg.lib;libpng.lib;Engine.lib;opengl32.lib;glu32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\..\jni\creditscode.cpp" />
|
||||
<ClCompile Include="..\..\..\jni\gamecode.cpp" />
|
||||
<ClCompile Include="..\..\..\jni\loadingcode.cpp" />
|
||||
<ClCompile Include="..\..\..\jni\main_code.cpp" />
|
||||
<ClCompile Include="..\..\..\jni\menucode.cpp" />
|
||||
<ClCompile Include="..\..\..\game\creditscode.cpp" />
|
||||
<ClCompile Include="..\..\..\game\gamecode.cpp" />
|
||||
<ClCompile Include="..\..\..\game\loadingcode.cpp" />
|
||||
<ClCompile Include="..\..\..\game\main_code.cpp" />
|
||||
<ClCompile Include="..\..\..\game\menucode.cpp" />
|
||||
<ClCompile Include="main.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\..\jni\creditscode.h" />
|
||||
<ClInclude Include="..\..\..\jni\gamecode.h" />
|
||||
<ClInclude Include="..\..\..\jni\game_area_interface.h" />
|
||||
<ClInclude Include="..\..\..\jni\loadingcode.h" />
|
||||
<ClInclude Include="..\..\..\jni\main_code.h" />
|
||||
<ClInclude Include="..\..\..\jni\menucode.h" />
|
||||
<ClInclude Include="..\..\..\game\creditscode.h" />
|
||||
<ClInclude Include="..\..\..\game\gamecode.h" />
|
||||
<ClInclude Include="..\..\..\game\game_area_interface.h" />
|
||||
<ClInclude Include="..\..\..\game\loadingcode.h" />
|
||||
<ClInclude Include="..\..\..\game\main_code.h" />
|
||||
<ClInclude Include="..\..\..\game\menucode.h" />
|
||||
<ClInclude Include="main.h" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
|
||||
@@ -18,19 +18,19 @@
|
||||
<ClCompile Include="main.cpp">
|
||||
<Filter>Файлы исходного кода</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\jni\creditscode.cpp">
|
||||
<ClCompile Include="..\..\..\game\main_code.cpp">
|
||||
<Filter>Файлы исходного кода</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\jni\gamecode.cpp">
|
||||
<ClCompile Include="..\..\..\game\menucode.cpp">
|
||||
<Filter>Файлы исходного кода</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\jni\loadingcode.cpp">
|
||||
<ClCompile Include="..\..\..\game\creditscode.cpp">
|
||||
<Filter>Файлы исходного кода</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\jni\main_code.cpp">
|
||||
<ClCompile Include="..\..\..\game\gamecode.cpp">
|
||||
<Filter>Файлы исходного кода</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\jni\menucode.cpp">
|
||||
<ClCompile Include="..\..\..\game\loadingcode.cpp">
|
||||
<Filter>Файлы исходного кода</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
@@ -38,22 +38,22 @@
|
||||
<ClInclude Include="main.h">
|
||||
<Filter>Заголовочные файлы</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\jni\loadingcode.h">
|
||||
<ClInclude Include="..\..\..\game\main_code.h">
|
||||
<Filter>Заголовочные файлы</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\jni\main_code.h">
|
||||
<ClInclude Include="..\..\..\game\menucode.h">
|
||||
<Filter>Заголовочные файлы</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\jni\menucode.h">
|
||||
<ClInclude Include="..\..\..\game\creditscode.h">
|
||||
<Filter>Заголовочные файлы</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\jni\creditscode.h">
|
||||
<ClInclude Include="..\..\..\game\game_area_interface.h">
|
||||
<Filter>Заголовочные файлы</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\jni\game_area_interface.h">
|
||||
<ClInclude Include="..\..\..\game\gamecode.h">
|
||||
<Filter>Заголовочные файлы</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\jni\gamecode.h">
|
||||
<ClInclude Include="..\..\..\game\loadingcode.h">
|
||||
<Filter>Заголовочные файлы</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "main_code.h"
|
||||
|
||||
TAndroidApplication* App = NULL;
|
||||
TMyApplication* App = NULL;
|
||||
|
||||
int APIENTRY WinMain(HINSTANCE hCurrentInst, HINSTANCE hPreviousInst,
|
||||
LPSTR lpszCmdLine, int nCmdShow)
|
||||
@@ -11,18 +11,18 @@ int APIENTRY WinMain(HINSTANCE hCurrentInst, HINSTANCE hPreviousInst,
|
||||
int width = 480;
|
||||
int height = 320;
|
||||
|
||||
|
||||
if (CreateEngine(width, height))
|
||||
{
|
||||
|
||||
|
||||
App = new TAndroidApplication;
|
||||
App = new TMyApplication;
|
||||
|
||||
App->OuterInit(width, height, width, height);
|
||||
|
||||
MainLoop(App);
|
||||
|
||||
|
||||
App->OuterDeinit();
|
||||
|
||||
|
||||
delete App;
|
||||
|
||||
App = NULL;
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
#pragma once
|
||||
#include <iostream>
|
||||
|
||||
#include "include/Engine.h"
|
||||
|
||||
#define NOMINMAX 1
|
||||
#include <Windows.h>
|
||||
#undef NOMINMAX
|
||||
#undef NOMINMAX
|
||||
@@ -1 +1 @@
|
||||
9
|
||||
11
|
||||
Reference in new issue
Block a user