Update imgui
This commit is contained in:
		
							parent
							
								
									10d81944b7
								
							
						
					
					
						commit
						30e9a4df7d
					
				| 
						 | 
				
			
			@ -26,7 +26,7 @@ list(APPEND SOURCES main.cpp event_loop.cpp logcat_thread.cpp logcat_entry.cpp l
 | 
			
		|||
    group_panel.cpp fragments/filters.cpp windows/logs.cpp windows/settings.cpp windows/filters.cpp windows/exclusions.cpp windows/main.cpp)
 | 
			
		||||
list(APPEND IMGUI_SOURCES imgui/imgui.cpp imgui/imgui_draw.cpp imgui/imgui_widgets.cpp imgui/imgui_tables.cpp
 | 
			
		||||
    imgui/misc/cpp/imgui_stdlib.cpp imgui/misc/freetype/imgui_freetype.cpp
 | 
			
		||||
    imgui/backends/imgui_impl_sdl.cpp imgui/backends/imgui_impl_opengl3.cpp)
 | 
			
		||||
    imgui/backends/imgui_impl_sdl2.cpp imgui/backends/imgui_impl_opengl3.cpp)
 | 
			
		||||
list(APPEND DEFINITIONS -DIMGUI_USER_CONFIG="../myimconfig.h")
 | 
			
		||||
 | 
			
		||||
if (CMAKE_BUILD_TYPE MATCHES "Debug")
 | 
			
		||||
| 
						 | 
				
			
			@ -88,7 +88,8 @@ target_include_directories(imgui PRIVATE ${INCLUDES})
 | 
			
		|||
target_link_libraries(imgui PRIVATE ${IMGUI_LIBS})
 | 
			
		||||
target_compile_definitions(imgui PRIVATE ${DEFINITIONS})
 | 
			
		||||
# dear imgui has some fucky wucky with -Wconversion, hence -Wno-conversion
 | 
			
		||||
target_compile_options(imgui PRIVATE ${FLAGS} -Wno-conversion)
 | 
			
		||||
# it seems like compilers may issue a warning for unknown warnings to ignore
 | 
			
		||||
target_compile_options(imgui PRIVATE ${FLAGS} -Wno-unknown-warning-option -Wno-conversion)
 | 
			
		||||
 | 
			
		||||
add_executable(${PROJECT_NAME} ${SOURCES})
 | 
			
		||||
set_target_properties(${PROJECT_NAME}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,5 @@
 | 
			
		|||
#define IMGUI_DEFINE_MATH_OPERATORS
 | 
			
		||||
#include <imgui.h>
 | 
			
		||||
#include <imgui_internal.h>
 | 
			
		||||
#include "group_panel.h"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								imgui
								
								
								
								
							
							
								
								
								
								
								
								
							
						
						
									
										2
									
								
								imgui
								
								
								
								
							| 
						 | 
				
			
			@ -1 +1 @@
 | 
			
		|||
Subproject commit d7c8516a4b848c0291e3d75b627c0843f515f591
 | 
			
		||||
Subproject commit 752603bc70bc0fc24846f27b816f04c9fc356453
 | 
			
		||||
							
								
								
									
										6
									
								
								main.cpp
								
								
								
								
							
							
						
						
									
										6
									
								
								main.cpp
								
								
								
								
							| 
						 | 
				
			
			@ -4,13 +4,13 @@
 | 
			
		|||
#include <sys/stat.h>
 | 
			
		||||
 | 
			
		||||
#include <imgui.h>
 | 
			
		||||
#include <imgui_impl_sdl.h>
 | 
			
		||||
#include <imgui_impl_sdl2.h>
 | 
			
		||||
#include <imgui_impl_opengl3.h>
 | 
			
		||||
#include <SDL.h>
 | 
			
		||||
#if defined(IMGUI_IMPL_OPENGL_ES2)
 | 
			
		||||
#include <SDL_opengles2.h>
 | 
			
		||||
    #include <SDL_opengles2.h>
 | 
			
		||||
#else
 | 
			
		||||
#include <SDL_opengl.h>
 | 
			
		||||
    #include <SDL_opengl.h>
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#include "log.h"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue