mirror of
https://github.com/WerWolv/ImHex.git
synced 2026-03-30 21:05:56 -05:00
sys: Implement more functionality into splash screen (#223)
* build: Add libcurl * build: Stop the whole static linking on Windows mess. There's no use anymore * sys: Added update detector and moved some startup tasks to splash screen * sys: Updated ImHex icon * fix: Settings button on welcome page once again works * build: Fix build on Linux * sys: Fixed splash window not searching all paths for resources
This commit is contained in:
4
external/ImGui/CMakeLists.txt
vendored
4
external/ImGui/CMakeLists.txt
vendored
@@ -10,7 +10,7 @@ pkg_search_module(GLFW REQUIRED glfw3)
|
||||
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
|
||||
|
||||
add_library(imgui
|
||||
add_library(imgui STATIC
|
||||
source/imgui.cpp
|
||||
source/imgui_demo.cpp
|
||||
source/imgui_draw.cpp
|
||||
@@ -42,7 +42,7 @@ target_include_directories(imgui PUBLIC include fonts ${FREETYPE_INCLUDE_DIRS} $
|
||||
target_link_directories(imgui PUBLIC ${GLM_INCLUDE_DIRS} ${GLFW_LIBRARY_DIRS})
|
||||
|
||||
if (WIN32)
|
||||
target_link_libraries(imgui libstdc++.a libgcc.a libharfbuzz.a libfreetype.a libharfbuzz.a libgraphite2.a libpng.a libbrotlidec-static.a libbrotlicommon-static.a libz.a libbz2.a librpcrt4.a glad libglfw3.a)
|
||||
target_link_libraries(imgui Freetype::Freetype glad glfw3)
|
||||
elseif (UNIX)
|
||||
target_link_libraries(imgui Freetype::Freetype glad glfw)
|
||||
endif()
|
||||
|
||||
1
external/curl
vendored
Submodule
1
external/curl
vendored
Submodule
Submodule external/curl added at 566b74a0e1
12
external/glad/CMakeLists.txt
vendored
12
external/glad/CMakeLists.txt
vendored
@@ -3,20 +3,12 @@ project(glad)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
|
||||
if (WIN32)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++ -static-libgcc")
|
||||
endif()
|
||||
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
|
||||
|
||||
add_library(glad
|
||||
add_library(glad STATIC
|
||||
source/glad.c
|
||||
)
|
||||
|
||||
target_include_directories(glad PUBLIC include)
|
||||
|
||||
if (WIN32)
|
||||
target_link_libraries(glad PRIVATE libdl.a)
|
||||
else()
|
||||
target_link_libraries(glad PRIVATE dl)
|
||||
endif()
|
||||
target_link_libraries(glad PRIVATE dl)
|
||||
6
external/llvm/CMakeLists.txt
vendored
6
external/llvm/CMakeLists.txt
vendored
@@ -3,13 +3,9 @@ project(LLVMDemangle)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
|
||||
if (WIN32)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++ -static-libgcc")
|
||||
endif()
|
||||
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
|
||||
|
||||
add_library(LLVMDemangle
|
||||
add_library(LLVMDemangle STATIC
|
||||
Demangle/Demangle.cpp
|
||||
Demangle/ItaniumDemangle.cpp
|
||||
Demangle/MicrosoftDemangle.cpp
|
||||
|
||||
4
external/yara/CMakeLists.txt
vendored
4
external/yara/CMakeLists.txt
vendored
@@ -117,7 +117,9 @@ target_include_directories(
|
||||
)
|
||||
|
||||
if (UNIX)
|
||||
target_link_libraries(libyara pthread)
|
||||
target_link_libraries(libyara magic pthread)
|
||||
else ()
|
||||
target_link_libraries(libyara magic)
|
||||
endif ()
|
||||
|
||||
include(GNUInstallDirs)
|
||||
|
||||
Reference in New Issue
Block a user