Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
cmake: compile bx and bimg as the same type as bgfx
Browse files Browse the repository at this point in the history
  • Loading branch information
bwrsandman committed Jan 31, 2021
1 parent db7e9cb commit 751f90e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions cmake/bimg.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ endif()
file( GLOB BIMG_SOURCES ${BIMG_DIR}/src/*.cpp )

# Create the bimg target
add_library( bimg STATIC ${BIMG_SOURCES} )
add_library( bimg ${BGFX_LIBRARY_TYPE} ${BIMG_SOURCES} )

# Add include directory of bimg
target_include_directories( bimg
Expand All @@ -41,4 +41,4 @@ target_include_directories( bimg
target_link_libraries( bimg bx astc-codec astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc )

# Put in a "bgfx" folder in Visual Studio
set_target_properties( bimg PROPERTIES FOLDER "bgfx" )
set_target_properties( bimg PROPERTIES FOLDER "bgfx" )
4 changes: 2 additions & 2 deletions cmake/bx.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ else()
endif()

# Create the bx target
add_library( bx STATIC ${BX_SOURCES} )
add_library( bx ${BGFX_LIBRARY_TYPE} ${BX_SOURCES} )

# Link against psapi on Windows
if( WIN32 )
Expand Down Expand Up @@ -87,4 +87,4 @@ elseif(APPLE)
endif()

# Put in a "bgfx" folder in Visual Studio
set_target_properties( bx PROPERTIES FOLDER "bgfx" )
set_target_properties( bx PROPERTIES FOLDER "bgfx" )

0 comments on commit 751f90e

Please sign in to comment.