浏览代码

Add imgui

Panagiotis Christopoulos Charitos 6 年之前
父节点
当前提交
aeb5afd544
共有 2 个文件被更改,包括 4 次插入3 次删除
  1. 3 2
      CMakeLists.txt
  2. 1 1
      thirdparty

+ 3 - 2
CMakeLists.txt

@@ -228,7 +228,7 @@ endif()
 ################################################################################
 ################################################################################
 # Thirdparty                                                                   #
 # Thirdparty                                                                   #
 ################################################################################
 ################################################################################
-set(ANKI_EXTERN_SUB_DIRS tinyxml2 lua z bullet)
+set(ANKI_EXTERN_SUB_DIRS tinyxml2 lua z bullet imgui)
 
 
 # Bullet config
 # Bullet config
 option(BUILD_BULLET2_DEMOS OFF)
 option(BUILD_BULLET2_DEMOS OFF)
@@ -351,6 +351,7 @@ configure_file("src/anki/Config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/anki/Confi
 include_directories("src"
 include_directories("src"
 	"thirdparty/tinyxml2/include"
 	"thirdparty/tinyxml2/include"
 	"thirdparty/lua"
 	"thirdparty/lua"
+	"thirdparty/imgui"
 	"thirdparty/z"
 	"thirdparty/z"
 	"${SDL2_INCLUDE_DIRS}"
 	"${SDL2_INCLUDE_DIRS}"
 	"thirdparty/freetype/include"
 	"thirdparty/freetype/include"
@@ -423,7 +424,7 @@ if(SDL)
 endif()
 endif()
 
 
 set(THIRD_PARTY_LIBS ${THIRD_PARTY_LIBS} BulletSoftBody BulletDynamics BulletCollision LinearMath
 set(THIRD_PARTY_LIBS ${THIRD_PARTY_LIBS} BulletSoftBody BulletDynamics BulletCollision LinearMath
-	ankispirvcross ankitinyxml2 ankilua ankiz glslang SPIRV OGLCompiler OSDependent ankitinyexpr)
+	ankispirvcross ankitinyxml2 ankilua ankiz glslang SPIRV OGLCompiler OSDependent ankitinyexpr ankiimgui)
 
 
 # Add anki sub libraries
 # Add anki sub libraries
 set(ANKI_SUB_DIRS core script renderer scene ui input physics resource misc gr collision math util)
 set(ANKI_SUB_DIRS core script renderer scene ui input physics resource misc gr collision math util)

+ 1 - 1
thirdparty

@@ -1 +1 @@
-Subproject commit c261670cac745ad64d27a409d030f192439db273
+Subproject commit e35e8927cc62333f23c7f99a33168bd5bbe6294f