Fixed launching for x64
This commit is contained in:
parent
450e80b278
commit
66b9d8ed47
10
.gitignore
vendored
10
.gitignore
vendored
@ -63,3 +63,13 @@ fastlane/screenshots
|
|||||||
|
|
||||||
iOSInjectionProject/
|
iOSInjectionProject/
|
||||||
/proj.ios_mac/.idea
|
/proj.ios_mac/.idea
|
||||||
|
/windows/DoubleHitBalls-win/x64
|
||||||
|
/windows/DoubleHitBalls-win/Debug
|
||||||
|
/windows/DoubleHitBalls-win/Release
|
||||||
|
/windows/DoubleHitBalls-win/DoubleHitBalls-win/x64
|
||||||
|
/windows/DoubleHitBalls-win/DoubleHitBalls-win/Debug
|
||||||
|
/windows/DoubleHitBalls-win/DoubleHitBalls-win/Release
|
||||||
|
/windows/DoubleHitBalls-win/.vs/
|
||||||
|
/windows/DoubleHitBalls-win/DoubleHitBalls-win/log.txt
|
||||||
|
*.db
|
||||||
|
*.opendb
|
BIN
assets/loading_background_black.png
Executable file
BIN
assets/loading_background_black.png
Executable file
Binary file not shown.
After Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
Binary file not shown.
@ -1,81 +0,0 @@
|
|||||||
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
|
|
@ -116,7 +116,7 @@
|
|||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<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>
|
<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;../x64/Debug</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>
|
<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>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
@ -158,7 +158,7 @@
|
|||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<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>
|
<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;../x64/Release</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>
|
<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>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1 +0,0 @@
|
|||||||
11
|
|
Loading…
Reference in New Issue
Block a user