瀏覽代碼

Add tinyexpr

Panagiotis Christopoulos Charitos 7 年之前
父節點
當前提交
9535744401
共有 2 個文件被更改,包括 6 次插入4 次删除
  1. 5 3
      CMakeLists.txt
  2. 1 1
      thirdparty

+ 5 - 3
CMakeLists.txt

@@ -270,6 +270,9 @@ message("++ Configuring glslang")
 add_subdirectory(thirdparty/glslang)
 add_subdirectory(thirdparty/glslang)
 message("++ End configuring glslang")
 message("++ End configuring glslang")
 
 
+# tinyexpr
+add_subdirectory(thirdparty/tinyexpr)
+
 foreach(TMP ${ANKI_EXTERN_SUB_DIRS})
 foreach(TMP ${ANKI_EXTERN_SUB_DIRS})
 	add_subdirectory(thirdparty/${TMP})
 	add_subdirectory(thirdparty/${TMP})
 endforeach()
 endforeach()
@@ -360,6 +363,7 @@ include_directories("src"
 	"thirdparty/khronos"
 	"thirdparty/khronos"
 	"${CMAKE_CURRENT_BINARY_DIR}"
 	"${CMAKE_CURRENT_BINARY_DIR}"
 	"${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glslang"
 	"${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glslang"
+	"${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/tinyexpr"
 	"thirdparty"
 	"thirdparty"
 	${CMAKE_CURRENT_SOURCE_DIR})
 	${CMAKE_CURRENT_SOURCE_DIR})
 
 
@@ -422,9 +426,7 @@ if(SDL)
 	set(THIRD_PARTY_LIBS ${THIRD_PARTY_LIBS} SDL2-static)
 	set(THIRD_PARTY_LIBS ${THIRD_PARTY_LIBS} SDL2-static)
 endif()
 endif()
 
 
-set(THIRD_PARTY_LIBS ${THIRD_PARTY_LIBS} ankispirvcross)
-
-set(THIRD_PARTY_LIBS ${THIRD_PARTY_LIBS} glslang SPIRV OGLCompiler OSDependent)
+set(THIRD_PARTY_LIBS ${THIRD_PARTY_LIBS} ankispirvcross glslang SPIRV OGLCompiler OSDependent ankitinyexpr)
 
 
 # Add anki sub libraries
 # Add anki sub libraries
 set(ANKI_SUB_DIRS core script renderer scene ui event input physics resource misc gr collision math util)
 set(ANKI_SUB_DIRS core script renderer scene ui event input physics resource misc gr collision math util)

+ 1 - 1
thirdparty

@@ -1 +1 @@
-Subproject commit 48a405d9a92daa3407adefabd1bdf21dd0fe2fa1
+Subproject commit fedd48fb4909b4b4f67bc05cc7e7e54a4d6b4357