diff --git a/CMakeLists.txt b/CMakeLists.txt
index 044c67a..7ffc00a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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()
 
diff --git a/cmake/3rdparty/astc-codec.cmake b/cmake/3rdparty/astc-codec.cmake
index b168e90..0c5b9c9 100644
--- a/cmake/3rdparty/astc-codec.cmake
+++ b/cmake/3rdparty/astc-codec.cmake
@@ -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" )