Compare commits

...

9 Commits

7 changed files with 12 additions and 6 deletions

View File

@ -19,7 +19,10 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - name: Checkout Repository
uses: actions/checkout@v2
with:
submodules: recursive
- name: Install system dependencies - name: Install system dependencies
if: runner.os == 'Linux' if: runner.os == 'Linux'

2
3rdparty/libfort vendored

@ -1 +1 @@
Subproject commit 41237162a9bd34a30a88069ee4e230584ae8d674 Subproject commit 5a8f9312bdbe05be484d2c07dd8c94a39e0ae196

View File

@ -1,3 +1,4 @@
cmake_minimum_required(VERSION 3.6...3.18)
project(gds-render LANGUAGES C) project(gds-render LANGUAGES C)
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
@ -24,7 +25,7 @@ if(NOT WIN32)
set(BoldWhite "${Esc}[1;37m") set(BoldWhite "${Esc}[1;37m")
endif() endif()
cmake_minimum_required(VERSION 2.8)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_search_module(GLIB REQUIRED glib-2.0) pkg_search_module(GLIB REQUIRED glib-2.0)
pkg_check_modules(GTK3 REQUIRED gtk+-3.0) pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
@ -80,6 +81,7 @@ add_subdirectory(version)
set(FORT_ENABLE_TESTING OFF CACHE INTERNAL "") set(FORT_ENABLE_TESTING OFF CACHE INTERNAL "")
add_subdirectory(3rdparty/libfort) add_subdirectory(3rdparty/libfort)
install(TARGETS fort EXCLUDE_FROM_ALL)
link_directories(${GLIB_LINK_DIRS} ${GTK3_LINK_DIRS} ${CAIRO_LINK_DIRS}) link_directories(${GLIB_LINK_DIRS} ${GTK3_LINK_DIRS} ${CAIRO_LINK_DIRS})
add_definitions(${GLIB2_CFLAGS_OTHER}) add_definitions(${GLIB2_CFLAGS_OTHER})

View File

@ -364,6 +364,7 @@ static GList *append_cell(GList *curr_list, struct gds_cell **cell_ptr)
cell->checks.affected_by_reference_loop = GDS_CELL_CHECK_NOT_RUN; cell->checks.affected_by_reference_loop = GDS_CELL_CHECK_NOT_RUN;
cell->stats.reference_count = 0; cell->stats.reference_count = 0;
cell->stats.total_vertex_count = 0; cell->stats.total_vertex_count = 0;
cell->stats.total_gfx_count = 0;
cell->stats.gfx_count = 0; cell->stats.gfx_count = 0;
cell->stats.vertex_count = 0; cell->stats.vertex_count = 0;
} else } else

2
main.c
View File

@ -201,7 +201,7 @@ static int start_gui(int argc, char **argv)
application_domain = g_string_new(NULL); application_domain = g_string_new(NULL);
g_string_printf(application_domain, "de.shimatta.gds_render_%s", _app_git_commit); g_string_printf(application_domain, "de.shimatta.gds_render_%s", _app_git_commit);
gapp = gtk_application_new(application_domain->str, G_APPLICATION_FLAGS_NONE); gapp = gtk_application_new(application_domain->str, G_APPLICATION_DEFAULT_FLAGS);
g_string_free(application_domain, TRUE); g_string_free(application_domain, TRUE);
g_application_register(G_APPLICATION(gapp), NULL, NULL); g_application_register(G_APPLICATION(gapp), NULL, NULL);

View File

@ -1,5 +1,5 @@
project(pluginexample) project(pluginexample)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8...3.18)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_search_module(PYTHON REQUIRED python3) pkg_search_module(PYTHON REQUIRED python3)

View File

@ -22,7 +22,7 @@ if(NOT WIN32)
set(BoldWhite "${Esc}[1;37m") set(BoldWhite "${Esc}[1;37m")
endif() endif()
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8...3.18)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/catch-framework") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/catch-framework")