Commit 8eb32755848ccf02468c58fca77a6f40b86ab62b
1 parent
b897e3a3
Exists in
master
and in
4 other branches
Fixing release build.
Showing
3 changed files
with
19 additions
and
4 deletions
Show diff stats
Makefile.in
@@ -196,8 +196,7 @@ all: \ | @@ -196,8 +196,7 @@ all: \ | ||
196 | $(POTDIR)/$(PACKAGE_NAME).pot | 196 | $(POTDIR)/$(PACKAGE_NAME).pot |
197 | 197 | ||
198 | Release: \ | 198 | Release: \ |
199 | - $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@ \ | ||
200 | - $(BINRLS)/static/$(PACKAGE_NAME).a | 199 | + $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@ |
201 | 200 | ||
202 | $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@: \ | 201 | $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@: \ |
203 | $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) | 202 | $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) |
src/objects/application/application.c
@@ -263,7 +263,15 @@ | @@ -263,7 +263,15 @@ | ||
263 | // | 263 | // |
264 | // Setup application menus | 264 | // Setup application menus |
265 | // | 265 | // |
266 | - GtkBuilder * builder = gtk_builder_new_from_file("ui/application.xml"); | 266 | + GtkBuilder * builder; |
267 | +#ifdef DEBUG | ||
268 | + builder = gtk_builder_new_from_file("ui/application.xml"); | ||
269 | +#else | ||
270 | + { | ||
271 | + lib3270_autoptr(char) build_file = lib3270_build_data_filename("ui","application.xml",NULL); | ||
272 | + builder = gtk_builder_new_from_file(build_file); | ||
273 | + } | ||
274 | +#endif // DEBUG | ||
267 | 275 | ||
268 | if(gtk_application_prefers_app_menu(GTK_APPLICATION(application))) | 276 | if(gtk_application_prefers_app_menu(GTK_APPLICATION(application))) |
269 | gtk_application_set_app_menu(GTK_APPLICATION (application), G_MENU_MODEL(gtk_builder_get_object (builder, "app-menu"))); | 277 | gtk_application_set_app_menu(GTK_APPLICATION (application), G_MENU_MODEL(gtk_builder_get_object (builder, "app-menu"))); |
src/objects/window/window.c
@@ -192,7 +192,15 @@ | @@ -192,7 +192,15 @@ | ||
192 | 192 | ||
193 | if(PW3270_IS_APPLICATION(gtk_window_get_application(GTK_WINDOW(window)))) { | 193 | if(PW3270_IS_APPLICATION(gtk_window_get_application(GTK_WINDOW(window)))) { |
194 | 194 | ||
195 | - GtkBuilder * builder = gtk_builder_new_from_file("ui/window.xml"); | 195 | + GtkBuilder * builder; |
196 | +#ifdef DEBUG | ||
197 | + builder = gtk_builder_new_from_file("ui/window.xml"); | ||
198 | +#else | ||
199 | + { | ||
200 | + lib3270_autoptr(char) build_file = lib3270_build_data_filename("ui","window.xml",NULL); | ||
201 | + builder = gtk_builder_new_from_file(build_file); | ||
202 | + } | ||
203 | +#endif // DEBUG | ||
196 | 204 | ||
197 | switch(pw3270_application_get_ui_style(G_APPLICATION(application))) { | 205 | switch(pw3270_application_get_ui_style(G_APPLICATION(application))) { |
198 | case PW3270_UI_STYLE_CLASSICAL: | 206 | case PW3270_UI_STYLE_CLASSICAL: |