Compare commits
No commits in common. "66a3b3e259e8d46a046b3b4b9a9253dd3e2a394e" and "de291ffddb3c92252199dc424d68c2adc84c53f8" have entirely different histories.
66a3b3e259
...
de291ffddb
@ -68,11 +68,9 @@ endif ()
|
||||
# Dependencies
|
||||
find_package (PkgConfig REQUIRED)
|
||||
pkg_check_modules (GTK3 REQUIRED gtk+-3.0 json-glib-1.0)
|
||||
link_directories (${GTK3_LIBRARY_DIRS})
|
||||
|
||||
if (NOT WIN32)
|
||||
pkg_search_module (Lua REQUIRED lua>=5.2 lua5.3 lua-5.3 lua5.2 lua-5.2)
|
||||
link_directories (${Lua_LIBRARY_DIRS})
|
||||
else ()
|
||||
# For whatever reason this now seems to be required
|
||||
set (LUA_INCLUDE_DIR "${WIN32_DEPENDS_PATH}/include")
|
||||
@ -85,6 +83,9 @@ else ()
|
||||
set (Lua_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
|
||||
endif ()
|
||||
|
||||
# This actually fucks up MinGW cross-compilation if omitted
|
||||
link_directories (${GTK3_LIBRARY_DIRS})
|
||||
|
||||
# Localization
|
||||
find_package (Gettext REQUIRED)
|
||||
file (GLOB project_PO_FILES ${PROJECT_SOURCE_DIR}/po/*.po)
|
||||
|
@ -3002,9 +3002,6 @@ ld_diagram_view_get_export_bounds (LdDiagramView *self, LdRectangle *rect)
|
||||
{
|
||||
LdRectangle intermediate;
|
||||
|
||||
/* Presumably, cairo_recording_surface_ink_extents() could also be used,
|
||||
* though DrawData::exposed_rect currently stands in the way.
|
||||
*/
|
||||
get_diagram_bounds (self, &intermediate);
|
||||
ld_diagram_view_diagram_to_widget_coords_rect (self, &intermediate, rect);
|
||||
return ld_diagram_view_get_scale_in_px (self);
|
||||
|
Loading…
x
Reference in New Issue
Block a user