Author: cazfi Date: Sun Apr 16 17:12:27 2017 New Revision: 35247 URL: http://svn.gna.org/viewcvs/freeciv?rev=35247&view=rev Log: Build freeciv-mp-gtk3x out of mpgui_gtk4.c
See hrm Feature #649606 Modified: trunk/tools/Makefile.am trunk/tools/mpgui_gtk3.c trunk/tools/mpgui_gtk4.c Modified: trunk/tools/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/Makefile.am?rev=35247&r1=35246&r2=35247&view=diff ============================================================================== --- trunk/tools/Makefile.am (original) +++ trunk/tools/Makefile.am Sun Apr 16 17:12:27 2017 @@ -140,15 +140,9 @@ endif if MODINST_GTK3X -freeciv_mp_gtk3x_CPPFLAGS = $(common_cppflags) $(mp_gtk3x_cflags) -DGTK3XMP +freeciv_mp_gtk3x_CPPFLAGS = $(common_cppflags) $(mp_gtk3x_cflags) -# For the time being gtk3 gui sources are ok in respect to gtk3x -# requirements - there's no deprecated functions used. -# The only difference is in the name the binary prints out - that's what -# -DGTK3XMP in the freeciv_mp_gtk3x_CPPFLAGS is for. -# Instead of maintaining two files, use the same one until there -# comes real reason to make them differ. -freeciv_mp_gtk3x_SOURCES = mpgui_gtk3.c +freeciv_mp_gtk3x_SOURCES = mpgui_gtk4.c freeciv_mp_gtk3x_LDFLAGS = $(mp_gtk3x_ldflags) Modified: trunk/tools/mpgui_gtk3.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/mpgui_gtk3.c?rev=35247&r1=35246&r2=35247&view=diff ============================================================================== --- trunk/tools/mpgui_gtk3.c (original) +++ trunk/tools/mpgui_gtk3.c Sun Apr 16 17:12:27 2017 @@ -603,13 +603,8 @@ gtk_widget_realize(toplevel); gtk_widget_set_name(toplevel, "Freeciv-modpack"); -#ifndef GTK3XMP gtk_window_set_title(GTK_WINDOW(toplevel), _("Freeciv modpack installer (gtk3)")); -#else /* GTK3XMP */ - gtk_window_set_title(GTK_WINDOW(toplevel), - _("Freeciv modpack installer (gtk3x)")); -#endif /* GTK3XMP */ /* Keep the icon of the executable on Windows */ #ifndef FREECIV_MSWINDOWS Modified: trunk/tools/mpgui_gtk4.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/mpgui_gtk4.c?rev=35247&r1=35246&r2=35247&view=diff ============================================================================== --- trunk/tools/mpgui_gtk4.c (original) +++ trunk/tools/mpgui_gtk4.c Sun Apr 16 17:12:27 2017 @@ -603,13 +603,8 @@ gtk_widget_realize(toplevel); gtk_widget_set_name(toplevel, "Freeciv-modpack"); -#ifndef GTK3XMP - gtk_window_set_title(GTK_WINDOW(toplevel), - _("Freeciv modpack installer (gtk3)")); -#else /* GTK3XMP */ gtk_window_set_title(GTK_WINDOW(toplevel), _("Freeciv modpack installer (gtk3x)")); -#endif /* GTK3XMP */ /* Keep the icon of the executable on Windows */ #ifndef FREECIV_MSWINDOWS _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits