Merge pull request #156 from bkaradzic/temp

Update Submodules
bkaradzic · Oct 28, 2022 · 089b388 · 089b388
2 parents 74e4a3f + 9d3bc4f
commit 089b388
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 39 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -134,7 +134,7 @@ if( BGFX_INSTALL )
 			 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 tinyexr
+		install( TARGETS bimg bx astc-encoder edtaa3 etc1 etc2 iqa squish nvtt pvrtc tinyexr
 				 EXPORT "${TARGETS_EXPORT_NAME}"
 				 LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
 				 ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"

diff --git a/bgfx b/bgfx
diff --git a/bimg b/bimg
diff --git a/bx b/bx
diff --git a/cmake/3rdparty/astc-codec.cmake → cmake/3rdparty/astc-encoder.cmake b/cmake/3rdparty/astc-codec.cmake → cmake/3rdparty/astc-encoder.cmake
@@ -8,21 +8,21 @@
 # You should have received a copy of the CC0 Public Domain Dedication along with
 # this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
-if( TARGET astc-codec )
+if( TARGET astc-encoder )
 	return()
 endif()
 
 file(
 	GLOB
-	ASTC_CODEC_SOURCES
-	${BIMG_DIR}/3rdparty/astc-codec/src/decoder/*.cc
-	${BIMG_DIR}/3rdparty/astc-codec/src/decoder/*.h
+	ASTC_ENCODER_SOURCES
+	${BIMG_DIR}/3rdparty/astc-encoder/source/*.cpp
+	${BIMG_DIR}/3rdparty/astc-encoder/include/*.h
 )
 
-add_library( astc-codec STATIC ${ASTC_CODEC_SOURCES} )
-target_include_directories( astc-codec
+add_library( astc-encoder STATIC ${ASTC_ENCODER_SOURCES} )
+target_include_directories( astc-encoder
 	PUBLIC
 		$<BUILD_INTERFACE:${BIMG_DIR}/3rdparty>
-		$<BUILD_INTERFACE:${BIMG_DIR}/3rdparty/astc-codec>
-		$<BUILD_INTERFACE:${BIMG_DIR}/3rdparty/astc-codec/include> )
-set_target_properties( astc-codec PROPERTIES FOLDER "bgfx/3rdparty" )
+		$<BUILD_INTERFACE:${BIMG_DIR}/3rdparty/astc-encoder>
+		$<BUILD_INTERFACE:${BIMG_DIR}/3rdparty/astc-encoder/include> )
+set_target_properties( astc-encoder PROPERTIES FOLDER "bgfx/3rdparty" )
diff --git a/cmake/3rdparty/astc.cmake b/cmake/3rdparty/astc.cmake
diff --git a/cmake/bgfx.cmake b/cmake/bgfx.cmake
@@ -80,11 +80,24 @@ target_compile_definitions(bgfx
                "BGFX_CONFIG_MULTITHREADED=$<BOOL:${BGFX_CONFIG_MULTITHREADED}>"
 )
 
+# directx-headers
+set (DIRECTX_HEADERS)
+if (UNIX AND NOT APPLE AND NOT EMSCRIPTEN AND NOT ANDROID)  # Only Linux
+	set (DIRECTX_HEADERS 
+		${BGFX_DIR}/3rdparty/directx-headers/include/directx
+		${BGFX_DIR}/3rdparty/directx-headers/include
+		${BGFX_DIR}/3rdparty/directx-headers/include/wsl/stubs )
+elseif (WIN32)  # Only Windows
+	set (DIRECTX_HEADERS 
+		${BGFX_DIR}/3rdparty/directx-headers/include/directx
+		${BGFX_DIR}/3rdparty/directx-headers/include )
+endif()
+
 # Includes
 target_include_directories( bgfx
 	PRIVATE
+		${DIRECTX_HEADERS}
 		${BGFX_DIR}/3rdparty
-		${BGFX_DIR}/3rdparty/dxsdk/include
 		${BGFX_DIR}/3rdparty/khronos
 	PUBLIC
 		$<BUILD_INTERFACE:${BGFX_DIR}/include>

diff --git a/cmake/bimg.cmake b/cmake/bimg.cmake
@@ -9,8 +9,7 @@
 # this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 # Third party libs
-include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/astc-codec.cmake )
-include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/astc.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/astc-encoder.cmake )
 include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/edtaa3.cmake )
 include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/etc1.cmake )
 include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/etc2.cmake )
@@ -39,7 +38,7 @@ target_include_directories( bimg
 		$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 
 # bimg dependencies
-target_link_libraries( bimg PUBLIC bx PRIVATE astc-codec astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc tinyexr )
+target_link_libraries( bimg PUBLIC bx PRIVATE astc-encoder edtaa3 etc1 etc2 iqa squish nvtt pvrtc tinyexr )
 
 # Put in a "bgfx" folder in Visual Studio
 set_target_properties( bimg PROPERTIES FOLDER "bgfx" )
diff --git a/cmake/bx.cmake b/cmake/bx.cmake
@@ -59,11 +59,16 @@ elseif( WIN32 )
 		PUBLIC
 			$<BUILD_INTERFACE:${BX_DIR}/include/compat/msvc>
 			$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/compat/msvc> )
-elseif( APPLE )
+elseif( APPLE )  # APPLE is technically UNIX... ORDERING MATTERS!
+	target_include_directories( bx
+		PUBLIC
+			$<BUILD_INTERFACE:${BX_DIR}/include/compat/osx>
+			$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/compat/osx> )
+elseif ( UNIX )
 	target_include_directories( bx
 		PUBLIC
-		    $<BUILD_INTERFACE:${BX_DIR}/include/compat/osx>
-		    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/compat/osx> )
+			$<BUILD_INTERFACE:${BX_DIR}/include/compat/linux>
+			$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/compat/linux> )
 endif()
 
 # All configurations
+7 −5		include/bx/allocator.h
+26 −13		include/bx/bx.h
+1 −2		include/bx/error.h
+23 −35		include/bx/inline/bx.inl
+1 −0		include/bx/inline/error.inl
+9 −9		include/bx/inline/math.inl
+31 −11		include/bx/inline/sort.inl
+0 −43		include/bx/inline/string.inl
+462 −0		include/bx/inline/typetraits.inl
+44 −25		include/bx/inline/uint32_t.inl
+14 −6		include/bx/macros.h
+15 −15		include/bx/math.h
+2 −2		include/bx/mpscqueue.h
+0 −2		include/bx/mutex.h
+11 −3		include/bx/platform.h
+2 −4		include/bx/ringbuffer.h
+0 −1		include/bx/semaphore.h
+56 −10		include/bx/sort.h
+4 −4		include/bx/spscqueue.h
+0 −21		include/bx/string.h
+0 −1		include/bx/thread.h
+285 −0		include/bx/typetraits.h
+18 −18		include/bx/uint32_t.h
+1 −0		include/compat/linux/sal.h
+16 −0		include/compat/mingw/salieri.h
+63 −155		scripts/toolchain.lua
+8 −1		src/os.cpp
+27 −1		src/sort.cpp
+1 −1		src/thread.cpp
+22 −22		tests/math_test.cpp
+26 −5		tests/sort_test.cpp
+1 −1		tests/string_test.cpp
+688 −0		tests/typetraits_test.cpp
+ −		tools/bin/darwin/genie
+ −		tools/bin/linux/genie
+ −		tools/bin/windows/genie.exe