Skip to content

Commit 789906b

Browse files
stergiotisstergiotis
committed
fix: backporting, fixes compilation
1 parent f531487 commit 789906b

File tree

4 files changed

+69
-68
lines changed

4 files changed

+69
-68
lines changed

‎dhall/sourceTreeParts.dhall‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,7 @@ let mainSkiaSdl3Minimal =
539539
let mainSkiaSdl3 =
540540
let dir = "./main/sdl3"
541541
in sourceTreePart::{
542+
, executable = True
542543
, name = "mainSkiaSdl3"
543544
, dir = dir
544545
, sources = [

‎skia/CMakeLists.txt‎

Lines changed: 64 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ SK_SHAPER_UNICODE_AVAILABLE
3434
SK_ENABLE_SVG
3535
SK_BUILD_FOR_UNIX
3636
)
37-
include_directories("${CMAKE_CURRENT_LIST_DIR}/./contrib/flatbuffers"
38-
"${CMAKE_CURRENT_LIST_DIR}/./imgui"
39-
"${CMAKE_CURRENT_LIST_DIR}/./src/arena/simple"
40-
"${CMAKE_CURRENT_LIST_DIR}/./contrib/skia"
41-
"${CMAKE_CURRENT_LIST_DIR}/./contrib/tracy/public"
37+
include_directories(./contrib/flatbuffers
38+
./imgui
39+
./src/arena/simple
40+
./contrib/skia
41+
./contrib/tracy/public
4242
)
4343
add_compile_options(-std=c++20
4444
-Wall
@@ -100,74 +100,74 @@ link_libraries(-Wl,-rpath,'$ORIGIN/../lib' -Wl,-z,origin
100100
# empty target flatbuffers
101101

102102
# begin imguiWithSkia
103-
add_library(imguiWithSkia OBJECT "${CMAKE_CURRENT_LIST_DIR}/./imgui/imzero_hooks.cpp"
104-
"${CMAKE_CURRENT_LIST_DIR}/./imgui/imzero_extensions.cpp"
105-
"${CMAKE_CURRENT_LIST_DIR}/./imgui/imgui.cpp"
106-
"${CMAKE_CURRENT_LIST_DIR}/./imgui/imgui_demo.cpp"
107-
"${CMAKE_CURRENT_LIST_DIR}/./imgui/imgui_draw.cpp"
108-
"${CMAKE_CURRENT_LIST_DIR}/./imgui/imgui_tables.cpp"
109-
"${CMAKE_CURRENT_LIST_DIR}/./imgui/imgui_widgets.cpp")
103+
add_library(imguiWithSkia STATIC ./imgui/imzero_hooks.cpp
104+
./imgui/imzero_extensions.cpp
105+
./imgui/imgui.cpp
106+
./imgui/imgui_demo.cpp
107+
./imgui/imgui_draw.cpp
108+
./imgui/imgui_tables.cpp
109+
./imgui/imgui_widgets.cpp)
110110
# end imguiWithSkia
111111

112112
# begin render
113-
add_library(render OBJECT "${CMAKE_CURRENT_LIST_DIR}/./src/render.cpp")
114-
target_include_directories(render PUBLIC "${CMAKE_CURRENT_LIST_DIR}/./src"
115-
"${CMAKE_CURRENT_LIST_DIR}/./src/widgets/imgui_implot"
116-
"${CMAKE_CURRENT_LIST_DIR}/./imcolortextedit")
113+
add_library(render STATIC ./src/render.cpp)
114+
target_include_directories(render PUBLIC ./src
115+
./src/widgets/imgui_implot
116+
./imcolortextedit)
117117
# end render
118118

119119
# begin marshalling
120-
add_library(marshalling OBJECT "${CMAKE_CURRENT_LIST_DIR}/./src/marshalling/receive.cpp"
121-
"${CMAKE_CURRENT_LIST_DIR}/./src/marshalling/send.cpp"
122-
"${CMAKE_CURRENT_LIST_DIR}/./src/marshalling/helper.cpp")
123-
target_include_directories(marshalling PUBLIC "${CMAKE_CURRENT_LIST_DIR}/./src/marshalling"
124-
"${CMAKE_CURRENT_LIST_DIR}/./src/widgets/imgui_implot")
120+
add_library(marshalling STATIC ./src/marshalling/receive.cpp
121+
./src/marshalling/send.cpp
122+
./src/marshalling/helper.cpp)
123+
target_include_directories(marshalling PUBLIC ./src/marshalling
124+
./src/widgets/imgui_implot)
125125
# end marshalling
126126

127127
# begin arena
128-
add_library(arena OBJECT "${CMAKE_CURRENT_LIST_DIR}/./src/arena/simple/simple.cpp")
128+
add_library(arena STATIC ./src/arena/simple/simple.cpp)
129129
# end arena
130130

131131
# begin widgets
132-
add_library(widgets OBJECT "${CMAKE_CURRENT_LIST_DIR}/./src/widgets/common.cpp"
133-
"${CMAKE_CURRENT_LIST_DIR}/./src/widgets/piemenu.cpp"
134-
"${CMAKE_CURRENT_LIST_DIR}/./src/widgets/splitter.cpp")
132+
add_library(widgets STATIC ./src/widgets/common.cpp
133+
./src/widgets/piemenu.cpp
134+
./src/widgets/splitter.cpp)
135135
target_compile_options(widgets PUBLIC -Wno-unused-parameter
136136
-Wno-unused-variable)
137137
# end widgets
138138

139139
# begin imguiToggle
140-
add_library(imguiToggle OBJECT "${CMAKE_CURRENT_LIST_DIR}/./src/widgets/imgui_toggle/imgui_toggle.cpp"
141-
"${CMAKE_CURRENT_LIST_DIR}/./src/widgets/imgui_toggle/imgui_toggle_palette.cpp"
142-
"${CMAKE_CURRENT_LIST_DIR}/./src/widgets/imgui_toggle/imgui_toggle_presets.cpp"
143-
"${CMAKE_CURRENT_LIST_DIR}/./src/widgets/imgui_toggle/imgui_toggle_renderer.cpp")
140+
add_library(imguiToggle STATIC ./src/widgets/imgui_toggle/imgui_toggle.cpp
141+
./src/widgets/imgui_toggle/imgui_toggle_palette.cpp
142+
./src/widgets/imgui_toggle/imgui_toggle_presets.cpp
143+
./src/widgets/imgui_toggle/imgui_toggle_renderer.cpp)
144144
target_compile_options(imguiToggle PUBLIC -Wno-unused-parameter
145145
-Wno-unused-variable)
146146
# end imguiToggle
147147

148148
# begin imguiImplot
149-
add_library(imguiImplot OBJECT "${CMAKE_CURRENT_LIST_DIR}/./src/widgets/imgui_implot/implot.cpp"
150-
"${CMAKE_CURRENT_LIST_DIR}/./src/widgets/imgui_implot/implot_demo.cpp"
151-
"${CMAKE_CURRENT_LIST_DIR}/./src/widgets/imgui_implot/implot_items.cpp")
149+
add_library(imguiImplot STATIC ./src/widgets/imgui_implot/implot.cpp
150+
./src/widgets/imgui_implot/implot_demo.cpp
151+
./src/widgets/imgui_implot/implot_items.cpp)
152152
# end imguiImplot
153153

154154
# begin imguiKnobs
155-
add_library(imguiKnobs OBJECT "${CMAKE_CURRENT_LIST_DIR}/./src/widgets/imgui_knobs/imgui-knobs.cpp")
155+
add_library(imguiKnobs STATIC ./src/widgets/imgui_knobs/imgui-knobs.cpp)
156156
# end imguiKnobs
157157

158158
# begin imguiCoolbar
159-
add_library(imguiCoolbar OBJECT "${CMAKE_CURRENT_LIST_DIR}/./src/widgets/imgui_coolbar/ImCoolbar.cpp")
159+
add_library(imguiCoolbar STATIC ./src/widgets/imgui_coolbar/ImCoolbar.cpp)
160160
# end imguiCoolbar
161161

162162
# begin imguiFlamegraph
163-
add_library(imguiFlamegraph OBJECT "${CMAKE_CURRENT_LIST_DIR}/./src/widgets/imgui_flamegraph/imgui_widget_flamegraph.cpp")
164-
target_include_directories(imguiFlamegraph PUBLIC "${CMAKE_CURRENT_LIST_DIR}/./src/widgets/imgui_flamegraph"
165-
"${CMAKE_CURRENT_LIST_DIR}/./src/widgets/imgui_flamegraph")
163+
add_library(imguiFlamegraph STATIC ./src/widgets/imgui_flamegraph/imgui_widget_flamegraph.cpp)
164+
target_include_directories(imguiFlamegraph PUBLIC ./src/widgets/imgui_flamegraph
165+
./src/widgets/imgui_flamegraph)
166166
# end imguiFlamegraph
167167

168168
# begin imguiTextedit
169-
add_library(imguiTextedit OBJECT "${CMAKE_CURRENT_LIST_DIR}/./imcolortextedit/TextEditor.cpp"
170-
"${CMAKE_CURRENT_LIST_DIR}/./imcolortextedit/LanguageDefinitions.cpp")
169+
add_library(imguiTextedit STATIC ./imcolortextedit/TextEditor.cpp
170+
./imcolortextedit/LanguageDefinitions.cpp)
171171
target_compile_options(imguiTextedit PUBLIC -Wno-unused-variable)
172172
# end imguiTextedit
173173

@@ -178,34 +178,33 @@ target_compile_options(imguiTextedit PUBLIC -Wno-unused-variable)
178178
# empty target skiaShared
179179

180180
# begin mainSkiaSdl3
181-
add_library(mainSkiaSdl3 OBJECT "${CMAKE_CURRENT_LIST_DIR}/./main/sdl3/../../imgui/imgui_impl_sdl3.cpp"
182-
"${CMAKE_CURRENT_LIST_DIR}/./main/sdl3/main.cpp"
183-
"${CMAKE_CURRENT_LIST_DIR}/./main/sdl3/app.cpp"
184-
"${CMAKE_CURRENT_LIST_DIR}/./main/sdl3/../paragraph.cpp"
185-
"${CMAKE_CURRENT_LIST_DIR}/./main/sdl3/../cliOptions.cpp"
186-
"${CMAKE_CURRENT_LIST_DIR}/./main/sdl3/../setupUI.cpp"
187-
"${CMAKE_CURRENT_LIST_DIR}/./main/sdl3/../vectorCmdSkiaRenderer.cpp")
181+
add_executable(mainSkiaSdl3 ./main/sdl3/../../imgui/imgui_impl_sdl3.cpp
182+
./main/sdl3/main.cpp
183+
./main/sdl3/app.cpp
184+
./main/sdl3/../paragraph.cpp
185+
./main/sdl3/../cliOptions.cpp
186+
./main/sdl3/../setupUI.cpp
187+
./main/sdl3/../vectorCmdSkiaRenderer.cpp)
188188
target_compile_options(mainSkiaSdl3 PUBLIC -Wno-unused-parameter)
189-
target_include_directories(mainSkiaSdl3 PUBLIC "${CMAKE_CURRENT_LIST_DIR}/./main/sdl3"
190-
"${CMAKE_CURRENT_LIST_DIR}/./imgui"
191-
"${CMAKE_CURRENT_LIST_DIR}/./src/widgets/imgui_implot"
192-
"${CMAKE_CURRENT_LIST_DIR}/./src"
193-
"${CMAKE_CURRENT_LIST_DIR}/./main/sdl3/..")
189+
target_include_directories(mainSkiaSdl3 PUBLIC ./main/sdl3
190+
./imgui
191+
./src/widgets/imgui_implot
192+
./src
193+
./main/sdl3/..)
194+
target_link_libraries(mainSkiaSdl3 imguiWithSkia)
195+
target_link_libraries(mainSkiaSdl3 render)
196+
target_link_libraries(mainSkiaSdl3 marshalling)
197+
target_link_libraries(mainSkiaSdl3 arena)
198+
target_link_libraries(mainSkiaSdl3 widgets)
199+
target_link_libraries(mainSkiaSdl3 imguiToggle)
200+
target_link_libraries(mainSkiaSdl3 imguiImplot)
201+
target_link_libraries(mainSkiaSdl3 imguiKnobs)
202+
target_link_libraries(mainSkiaSdl3 imguiCoolbar)
203+
target_link_libraries(mainSkiaSdl3 imguiFlamegraph)
204+
target_link_libraries(mainSkiaSdl3 imguiTextedit)
205+
target_link_libraries(mainSkiaSdl3 tracyDisabled)
194206
# end mainSkiaSdl3
195207

196208
# begin tracyDisabled
197-
add_library(tracyDisabled OBJECT "${CMAKE_CURRENT_LIST_DIR}/./contrib/tracy/public/TracyClient.cpp")
209+
add_library(tracyDisabled STATIC ./contrib/tracy/public/TracyClient.cpp)
198210
# end tracyDisabled
199-
add_executable(imgui_skia_exe $<TARGET_OBJECTS:imguiWithSkia>
200-
$<TARGET_OBJECTS:render>
201-
$<TARGET_OBJECTS:marshalling>
202-
$<TARGET_OBJECTS:arena>
203-
$<TARGET_OBJECTS:widgets>
204-
$<TARGET_OBJECTS:imguiToggle>
205-
$<TARGET_OBJECTS:imguiImplot>
206-
$<TARGET_OBJECTS:imguiKnobs>
207-
$<TARGET_OBJECTS:imguiCoolbar>
208-
$<TARGET_OBJECTS:imguiFlamegraph>
209-
$<TARGET_OBJECTS:imguiTextedit>
210-
$<TARGET_OBJECTS:mainSkiaSdl3>
211-
$<TARGET_OBJECTS:tracyDisabled>)

‎skia/build_cpp.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ mkdir -p build
2525
cd build
2626
cmake ../CMakeLists.txt
2727
cmake --build . -j
28-
mv *_exe ..
28+
mv mainSkiaSdl3 ../imgui_skia_exe

‎skia/imgui/imzero_hooks.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "imgui.h"
22
#include "tracy/Tracy.hpp"
33
#include "imgui_internal.h"
4+
#include "include/core/SkFont.h"
45

56
#define IMZERO_DRAWLIST_BEGIN if(ImGui::useVectorCmd) {
67
#define IMZERO_DRAWLIST_END return false; }
@@ -200,7 +201,7 @@ namespace ImGui {
200201
bool Hooks::Global::Pre::RenderDimmedBackdgroundBehindWindow(::ImGuiWindow *window, ImU32 col) {
201202
return false;
202203
}
203-
bool Hooks::Global::Pre::InputTextCalcTextSize(::ImVec2 &out, ::ImGuiContext* ctx, const char* text_begin, const char* text_end, const char** remaining, ImVec2* out_offset, bool stop_on_new_line) {
204+
bool Hooks::Global::Pre::InputTextCalcTextSize(::ImVec2 &out, const ::ImGuiContext* ctx, const char* text_begin, const char* text_end, const char** remaining, ImVec2* out_offset, bool stop_on_new_line) {
204205
if (!ImGui::useVectorCmd) {
205206
return true;
206207
}
@@ -324,7 +325,7 @@ namespace ImGui {
324325
int Hooks::ImDrawListSplitter::MergeUpdate(::ImDrawListSplitter &splitter,int i,int prev) {
325326
return prev + static_cast<int>(splitter._ChannelsFbCmds[i]->size());
326327
}
327-
void Hooks::ImDrawListSplitter::MergeReserve(::ImDrawList *drawList,int n) {
328+
void Hooks::ImDrawListSplitter::MergeReserve(const ::ImDrawList *drawList,int n) {
328329
drawList->_FbCmds->reserve(drawList->_FbCmds->size() + n);
329330
}
330331
void Hooks::ImDrawListSplitter::MergeOp(::ImDrawListSplitter &splitter,::ImDrawList *drawList,int i) { ZoneScopedN("serialize and add split draw list");

0 commit comments

Comments
 (0)