Fix Android build
This commit is contained in:
@ -1,5 +1,3 @@
|
||||
add_definitions("-DWITH_IMGUI=1")
|
||||
|
||||
add_subdirectory(common)
|
||||
add_subdirectory(core)
|
||||
add_subdirectory(scmversion)
|
||||
|
||||
@ -116,6 +116,7 @@ target_include_directories(core PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
|
||||
target_include_directories(core PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
|
||||
target_link_libraries(core PUBLIC Threads::Threads common zlib vulkan-loader)
|
||||
target_link_libraries(core PRIVATE glad stb xxhash imgui)
|
||||
target_compile_definitions(core PUBLIC "-DWITH_IMGUI=1")
|
||||
|
||||
if(WIN32)
|
||||
target_sources(core PRIVATE
|
||||
|
||||
@ -290,7 +290,7 @@ protected:
|
||||
virtual void UpdateControllerInterface();
|
||||
|
||||
virtual void OnSystemCreated() override;
|
||||
virtual void OnSystemPaused(bool paused);
|
||||
virtual void OnSystemPaused(bool paused) override;
|
||||
virtual void OnSystemDestroyed() override;
|
||||
virtual void OnRunningGameChanged() override;
|
||||
virtual void OnControllerTypeChanged(u32 slot) override;
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
#include "imgui.h"
|
||||
#include <functional>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
namespace ImGuiFullscreen {
|
||||
#define HEX_TO_IMVEC4(hex, alpha) \
|
||||
|
||||
Reference in New Issue
Block a user