Drop imgui-cmake

.gitmodules

@@ -2,11 +2,11 @@
 	path = vendor/minhook
 	url = https://github.com/TsudaKageyu/minhook.git
 	ignore = dirty
-[submodule "vendor/imgui"]
-	path = vendor/imgui
-	url = https://github.com/Pesc0/imgui-cmake.git
-	ignore = dirty
 [submodule "vendor/shv"]
 	path = vendor/shv
 	url = https://github.com/pongo1231/shv_no_msvc
 	ignore = dirty
+[submodule "vendor/imgui"]
+	path = vendor/imgui
+	url = https://github.com/ocornut/imgui
+	ignore = dirty

CMakeLists.txt

@@ -3,25 +3,35 @@ cmake_minimum_required(VERSION 3.12)
 project(ScriptViewer)
 
 add_subdirectory(vendor/shv)
-add_subdirectory(vendor/imgui)
+#add_subdirectory(vendor/imgui)
 add_subdirectory(vendor/minhook)
 
 file(GLOB_RECURSE src ScriptViewer/*.cpp)
 add_library(ScriptViewer MODULE ${src})
 
 set_property(TARGET ScriptViewer PROPERTY CXX_STANDARD 20)
 
+set(IMGUI_PATH "vendor/imgui")
+file(GLOB IMGUI_SOURCES ${IMGUI_PATH}/*.cpp ${IMGUI_PATH}/backends/imgui_impl_dx11.cpp ${IMGUI_PATH}/backends/imgui_impl_win32.cpp) 
+add_library(ImGui STATIC ${IMGUI_SOURCES})
+target_include_directories(ImGui PUBLIC ${IMGUI_PATH} ${IMGUI_PATH}/backends)
+
 if (RELOADABLE)
     target_compile_definitions(ScriptViewer PRIVATE RELOADABLE)
 endif ()
 
-target_compile_options(ScriptViewer PRIVATE -municode -fpermissive)
+if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+    target_compile_options(ScriptViewer PRIVATE -DUNICODE -D_UNICODE -DNOMINMAX /Zi)
+    target_link_options(ScriptViewer PRIVATE /DEBUG /OPT:REF /OPT:ICF)
+else()
+    target_compile_options(ScriptViewer PRIVATE -municode -fpermissive)
+    target_link_options(ScriptViewer PRIVATE -static)
+endif()
 
 target_precompile_headers(ScriptViewer PUBLIC ScriptViewer/stdafx.h)
 
 target_include_directories(ScriptViewer PUBLIC ScriptViewer)
 
-target_link_libraries(ScriptViewer PRIVATE shv IMGUI minhook d3dcompiler dwmapi)
-target_link_options(ScriptViewer PRIVATE -static)
+target_link_libraries(ScriptViewer PRIVATE shv minhook d3dcompiler dwmapi ImGui)
 
 set_target_properties(ScriptViewer PROPERTIES SUFFIX ".asi")

ScriptViewer/Components/GlobalView.cpp

@@ -13,7 +13,7 @@ void GlobalView::RunImGui()
 
 	if (ms_pGlobals && ms_pcwGlobals)
 	{
-		ImGui::ListBoxHeader("");
+		ImGui::BeginListBox("");
 
 		for (WORD wGlobalIdx = 0; wGlobalIdx < *ms_pcwGlobals; wGlobalIdx++)
 		{
@@ -26,7 +26,7 @@ void GlobalView::RunImGui()
 			}
 		}
 
-		ImGui::ListBoxFooter();
+		ImGui::EndListBox();
 	}
 
 	ImGui::End();

ScriptViewer/stdafx.h

@@ -29,11 +29,10 @@ typedef unsigned int DWORD_t;
 
 #include "../vendor/minhook/include/MinHook.h"
 
-#include "../vendor/imgui/libs/imgui/backends/imgui_impl_dx11.h"
-#include "../vendor/imgui/libs/imgui/backends/imgui_impl_win32.h"
-#include "../vendor/imgui/libs/imgui/imgui.h"
-#include "../vendor/imgui/libs/imgui/imgui_internal.h"
-#include <setjmp.h>
+#include "../vendor/imgui/backends/imgui_impl_dx11.h"
+#include "../vendor/imgui/backends/imgui_impl_win32.h"
+#include "../vendor/imgui/imgui.h"
+#include "../vendor/imgui/imgui_internal.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <excpt.h>