Fixed: texturev build failed requiring examples-common; moved BGFX_EXAMPLES check to examples instead of globally.

Updated: bgfx, bx, bimg to latest
Fixed: bx now requires including 3rdparty for build
This commit is contained in:
Walter Pearce
2017-11-27 10:15:13 -08:00
committed by Joshua Brookover
parent 0f283a8120
commit 9972c1001b
6 changed files with 52 additions and 51 deletions

View File

@@ -51,9 +51,7 @@ if( BGFX_BUILD_TOOLS )
include( cmake/tools.cmake )
endif()
if( BGFX_BUILD_EXAMPLES )
include( cmake/examples.cmake )
endif()
include( cmake/examples.cmake )
if( BGFX_INSTALL )
# install bx

2
bgfx

Submodule bgfx updated: cdd658b44c...b3fcc8350b

2
bimg

Submodule bimg updated: 224aa80d10...886ba55a25

2
bx

Submodule bx updated: 4b4b3e74db...6a1b91cbbf

View File

@@ -35,7 +35,7 @@ if( WIN32 )
endif()
# Add include directory of bx
target_include_directories( bx PUBLIC ${BX_DIR}/include )
target_include_directories( bx PUBLIC ${BX_DIR}/include ${BX_DIR}/3rdparty )
# Build system specific configurations
if( MSVC )

View File

@@ -156,48 +156,51 @@ add_example(
${BGFX_DIR}/examples/common/ps
)
# Add examples
set(
BGFX_EXAMPLES
00-helloworld
01-cubes
02-metaballs
03-raymarch
04-mesh
05-instancing
06-bump
07-callback
08-update
09-hdr
10-font
11-fontsdf
12-lod
13-stencil
14-shadowvolumes
15-shadowmaps-simple
16-shadowmaps
17-drawstress
18-ibl
19-oit
20-nanovg
21-deferred
22-windows
23-vectordisplay
24-nbody
25-c99
26-occlusion
27-terrain
28-wireframe
29-debugdraw
30-picking
31-rsm
32-particles
33-pom
34-mvs
35-dynamic
36-sky
)
# Only add examples if set, otherwise we still need exmaples common for tools
if( BGFX_BUILD_EXAMPLES )
# Add examples
set(
BGFX_EXAMPLES
00-helloworld
01-cubes
02-metaballs
03-raymarch
04-mesh
05-instancing
06-bump
07-callback
08-update
09-hdr
10-font
11-fontsdf
12-lod
13-stencil
14-shadowvolumes
15-shadowmaps-simple
16-shadowmaps
17-drawstress
18-ibl
19-oit
20-nanovg
21-deferred
22-windows
23-vectordisplay
24-nbody
25-c99
26-occlusion
27-terrain
28-wireframe
29-debugdraw
30-picking
31-rsm
32-particles
33-pom
34-mvs
35-dynamic
36-sky
)
foreach( EXAMPLE ${BGFX_EXAMPLES} )
add_example( ${EXAMPLE} )
endforeach()
foreach( EXAMPLE ${BGFX_EXAMPLES} )
add_example( ${EXAMPLE} )
endforeach()
endif()