From 4a9973b9e3dbbfa074d0bf8621221519775c2400 Mon Sep 17 00:00:00 2001 From: Jason Millard Date: Fri, 20 Mar 2026 21:38:12 -0400 Subject: [PATCH] misc: add support for compiling metal-cpp --- cmake/bgfx/bgfx.cmake | 16 +--------------- cmake/bimg/3rdparty/miniz.cmake | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/cmake/bgfx/bgfx.cmake b/cmake/bgfx/bgfx.cmake index 42dd05a..06ca401 100755 --- a/cmake/bgfx/bgfx.cmake +++ b/cmake/bgfx/bgfx.cmake @@ -29,14 +29,7 @@ file( ${BGFX_DIR}/include/bgfx/c99/*.h ) -if(APPLE) - file(GLOB BGFX_OBJC_SOURCES ${BGFX_DIR}/src/*.mm) - list(APPEND BGFX_SOURCES ${BGFX_OBJC_SOURCES}) - list(REMOVE_ITEM BGFX_SOURCES ${BGFX_DIR}/src/amalgamated.cpp) - set(BGFX_AMALGAMATED_SOURCE ${BGFX_DIR}/src/amalgamated.mm) -else() - set(BGFX_AMALGAMATED_SOURCE ${BGFX_DIR}/src/amalgamated.cpp) -endif() +set(BGFX_AMALGAMATED_SOURCE ${BGFX_DIR}/src/amalgamated.cpp) if(BGFX_AMALGAMATED) set(BGFX_NOBUILD ${BGFX_SOURCES}) @@ -191,13 +184,6 @@ if(UNIX target_link_libraries(bgfx PUBLIC ${X11_LIBRARIES} ${OPENGL_LIBRARIES}) endif() -# Exclude mm files if not on OS X -if(NOT APPLE) - set_source_files_properties(${BGFX_DIR}/src/glcontext_eagl.mm PROPERTIES HEADER_FILE_ONLY ON) - set_source_files_properties(${BGFX_DIR}/src/glcontext_nsgl.mm PROPERTIES HEADER_FILE_ONLY ON) - set_source_files_properties(${BGFX_DIR}/src/renderer_mtl.mm PROPERTIES HEADER_FILE_ONLY ON) -endif() - # Exclude glx context on non-unix if(NOT UNIX OR APPLE) set_source_files_properties(${BGFX_DIR}/src/glcontext_glx.cpp PROPERTIES HEADER_FILE_ONLY ON) diff --git a/cmake/bimg/3rdparty/miniz.cmake b/cmake/bimg/3rdparty/miniz.cmake index 65b0152..20d60f1 100644 --- a/cmake/bimg/3rdparty/miniz.cmake +++ b/cmake/bimg/3rdparty/miniz.cmake @@ -19,5 +19,5 @@ if(NOT MINIZ_LIBRARIES) MINIZ_SOURCES # ${BIMG_DIR}/3rdparty/tinyexr/deps/miniz/miniz.* # ) - set(MINIZ_INCLUDE_DIR ${BIMG_DIR}/3rdparty/tinyexr/deps/miniz) + set(MINIZ_INCLUDE_DIR ${BIMG_DIR}/3rdparty/tinyexr/deps) endif()