summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandy Carter2021-02-07 18:31:27 -0500
committerSandy Carter2021-02-07 18:31:27 -0500
commit4cac1f422f8a4813727ca48d511160bdaa1dceba (patch)
tree6a8acf148cac9c1cb7e19f5996bdbb6b578d9507
parent2ace513d25bdfd26fa1d260c0f74f3f411ca6879 (diff)
downloadaur-4cac1f422f8a4813727ca48d511160bdaa1dceba.tar.gz
Recommit patch files with crlf
-rw-r--r--0003-install-if-generating-shared-only-install-bgfx.patch46
-rw-r--r--0004-bgfx-make-bx-and-bimg-private.patch32
2 files changed, 39 insertions, 39 deletions
diff --git a/0003-install-if-generating-shared-only-install-bgfx.patch b/0003-install-if-generating-shared-only-install-bgfx.patch
index ebe306ab5a9a..61d41c732715 100644
--- a/0003-install-if-generating-shared-only-install-bgfx.patch
+++ b/0003-install-if-generating-shared-only-install-bgfx.patch
@@ -12,29 +12,29 @@ index 4412be1..ca72939 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,13 +122,22 @@ if( BGFX_INSTALL )
- install(FILES ${BGFX_DIR}/LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
- install(FILES README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
-- install( TARGETS bgfx bimg bx astc-codec astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc
-+ install( TARGETS bgfx
- EXPORT "${TARGETS_EXPORT_NAME}"
- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
- INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
- )
-+ if( NOT BGFX_LIBRARY_TYPE MATCHES "SHARED" )
-+ install( TARGETS bimg bx astc-codec astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc
-+ EXPORT "${TARGETS_EXPORT_NAME}"
-+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-+ )
-+ endif()
- if (BGFX_CONFIG_RENDERER_WEBGPU)
- install( TARGETS webgpu
- EXPORT "${TARGETS_EXPORT_NAME}"
+ install(FILES ${BGFX_DIR}/LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ install(FILES README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
+
+- install( TARGETS bgfx bimg bx astc-codec astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc
++ install( TARGETS bgfx
+ EXPORT "${TARGETS_EXPORT_NAME}"
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
++ if( NOT BGFX_LIBRARY_TYPE MATCHES "SHARED" )
++ install( TARGETS bimg bx astc-codec astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc
++ EXPORT "${TARGETS_EXPORT_NAME}"
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
++ )
++ endif()
+ if (BGFX_CONFIG_RENDERER_WEBGPU)
+ install( TARGETS webgpu
+ EXPORT "${TARGETS_EXPORT_NAME}"
--
2.30.0
diff --git a/0004-bgfx-make-bx-and-bimg-private.patch b/0004-bgfx-make-bx-and-bimg-private.patch
index 2bf04cac4e6d..2a77f1303433 100644
--- a/0004-bgfx-make-bx-and-bimg-private.patch
+++ b/0004-bgfx-make-bx-and-bimg-private.patch
@@ -14,27 +14,27 @@ index c2757ad..a0a3d30 100755
--- a/cmake/bgfx.cmake
+++ b/cmake/bgfx.cmake
@@ -82,7 +82,7 @@ target_include_directories( bgfx
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-
- # bgfx depends on bx and bimg
--target_link_libraries( bgfx PUBLIC bx bimg )
-+target_link_libraries( bgfx PRIVATE bx bimg )
-
- # ovr support
- if( BGFX_USE_OVR )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
+ # bgfx depends on bx and bimg
+-target_link_libraries( bgfx PUBLIC bx bimg )
++target_link_libraries( bgfx PRIVATE bx bimg )
+
+ # ovr support
+ if( BGFX_USE_OVR )
diff --git a/cmake/examples.cmake b/cmake/examples.cmake
index 68093b4..9076932 100755
--- a/cmake/examples.cmake
+++ b/cmake/examples.cmake
@@ -134,7 +134,7 @@ function( add_example ARG_NAME )
- if( ARG_COMMON )
- add_library( example-${ARG_NAME} STATIC EXCLUDE_FROM_ALL ${SOURCES} )
- target_include_directories( example-${ARG_NAME} PUBLIC ${BGFX_DIR}/examples/common )
-- target_link_libraries( example-${ARG_NAME} PUBLIC bgfx dear-imgui meshoptimizer )
-+ target_link_libraries( example-${ARG_NAME} PUBLIC bgfx bx bimg dear-imgui meshoptimizer )
- if( BGFX_WITH_GLFW )
- find_package( glfw3 REQUIRED )
- target_link_libraries( example-${ARG_NAME} PUBLIC glfw )
+ if( ARG_COMMON )
+ add_library( example-${ARG_NAME} STATIC EXCLUDE_FROM_ALL ${SOURCES} )
+ target_include_directories( example-${ARG_NAME} PUBLIC ${BGFX_DIR}/examples/common )
+- target_link_libraries( example-${ARG_NAME} PUBLIC bgfx dear-imgui meshoptimizer )
++ target_link_libraries( example-${ARG_NAME} PUBLIC bgfx bx bimg dear-imgui meshoptimizer )
+ if( BGFX_WITH_GLFW )
+ find_package( glfw3 REQUIRED )
+ target_link_libraries( example-${ARG_NAME} PUBLIC glfw )
--
2.30.0