More build fixes.

This commit is contained in:
Robert D. Blanchet Jr
2019-04-06 11:07:21 -07:00
committed by Joshua Brookover
parent c3f52fd76e
commit 834ec251e7
2 changed files with 3 additions and 3 deletions

View File

@@ -16,7 +16,7 @@ set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
if( APPLE and NOT IOS )
if( APPLE AND NOT IOS )
set( CMAKE_CXX_FLAGS "-ObjC++" )
endif()

View File

@@ -15,10 +15,10 @@ endif()
file(
GLOB
ASTC_CODEC_SOURCES
${BIMG_DIR}/3rdparty/astc-codec/src/decoder/*.cpp
${BIMG_DIR}/3rdparty/astc-codec/src/decoder/*.cc
${BIMG_DIR}/3rdparty/astc-codec/src/decoder/*.h
)
add_library( astc-codec STATIC ${ASTC_CODEC_SOURCES} )
target_include_directories( astc-codec PUBLIC ${BIMG_DIR}/3rdparty ${BIMG_DIR}/3rdparty/astc-codec/include )
target_include_directories( astc-codec PUBLIC ${BIMG_DIR}/3rdparty ${BIMG_DIR}/3rdparty/astc-codec ${BIMG_DIR}/3rdparty/astc-codec/include )
set_target_properties( astc-codec PROPERTIES FOLDER "bgfx/3rdparty" )