Compare commits
No commits in common. "21b3836dc0cdf02fe25b160d04da5f01cd18188d" and "a9b9232dd5d267d0159c7a43e042a7d082842812" have entirely different histories.
21b3836dc0
...
a9b9232dd5
@ -14,16 +14,6 @@ INCLUDE_DIRECTORIES (${GLIB2_INCLUDE_DIRS} ${GOBJECT2_INCLUDE_DIRS} ${GTK3_INCLU
|
||||
LINK_DIRECTORIES (${GLIB2_LIBRARY_DIRS} ${GOBJECT2_LIBRARY_DIRS} ${GTK3_LIBRARY_DIRS} ${WEBKIT_LIBRARY_DIRS})
|
||||
add_definitions(${GLIB2_CFLAGS_OTHER} ${GOBJECT2_CFLAGS_OTHER} ${GTK3_CFLAGS_OTHER} ${WEBKIT_CFLAGS_OTHER})
|
||||
|
||||
add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/resources.c"
|
||||
COMMAND glib-compile-resources "${CMAKE_CURRENT_SOURCE_DIR}/mdiary.gresource.xml" --target="${CMAKE_CURRENT_BINARY_DIR}/resources.c" --generate-source
|
||||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
|
||||
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/glade/mainWindow.glade" "${CMAKE_CURRENT_SOURCE_DIR}/mdiary.gresource.xml"
|
||||
COMMENT "Generating resources"
|
||||
)
|
||||
|
||||
aux_source_directory(./src SRC_LIST)
|
||||
add_executable(${PROJECT_NAME} ${SRC_LIST})
|
||||
target_sources(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/resources.c")
|
||||
target_link_libraries(${PROJECT_NAME} ${GTK3_LIBRARIES} ${WEBKIT_LIBRARIES})
|
||||
|
||||
install (TARGETS ${PROJECT_NAME} DESTINATION bin)
|
||||
|
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<gresources>
|
||||
<gresource prefix="/org/gtk/mdiary">
|
||||
<file preprocess="xml-stripblanks">glade/mainWindow.glade</file>
|
||||
</gresource>
|
||||
</gresources>
|
@ -620,7 +620,7 @@ struct mainWindow *mainWindow_new()
|
||||
GtkBuilder *builder;
|
||||
struct mainWindow *mainWindow;
|
||||
|
||||
builder = gtk_builder_new_from_resource("/org/gtk/mdiary/glade/mainWindow.glade");
|
||||
builder = gtk_builder_new_from_file("glade/mainWindow.glade");
|
||||
|
||||
mainWindow = malloc(sizeof(struct mainWindow));
|
||||
mainWindow->mainWindow = GTK_WIDGET(gtk_builder_get_object(builder, "mainWindow"));
|
||||
|
Loading…
Reference in New Issue
Block a user