mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Similar build fix for Mac
Apparently only older Linux toolchains didn't bother to throw up with the remainders of Gtk related code. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
1a1b392c37
commit
aa3838308b
1 changed files with 8 additions and 1 deletions
9
macos.c
9
macos.c
|
@ -151,8 +151,11 @@ const char *subsurface_icon_name()
|
||||||
{
|
{
|
||||||
static char path[PATH_MAX];
|
static char path[PATH_MAX];
|
||||||
|
|
||||||
|
#if USE_GTK_UI
|
||||||
snprintf(path, sizeof(path), "%s/%s", gtkosx_application_get_resource_path(), ICON_NAME);
|
snprintf(path, sizeof(path), "%s/%s", gtkosx_application_get_resource_path(), ICON_NAME);
|
||||||
|
#else
|
||||||
|
/* need Qt path */
|
||||||
|
#endif
|
||||||
return path;
|
return path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -174,15 +177,18 @@ const char *subsurface_gettext_domainpath(char *argv0)
|
||||||
{
|
{
|
||||||
/* on a Mac we ignore the argv0 argument and instead use the resource_path
|
/* on a Mac we ignore the argv0 argument and instead use the resource_path
|
||||||
* to figure out where to find the translation files */
|
* to figure out where to find the translation files */
|
||||||
|
#if USE_GTK_UI
|
||||||
static char buffer[PATH_MAX];
|
static char buffer[PATH_MAX];
|
||||||
const char *resource_path = gtkosx_application_get_resource_path();
|
const char *resource_path = gtkosx_application_get_resource_path();
|
||||||
if (resource_path) {
|
if (resource_path) {
|
||||||
snprintf(buffer, sizeof(buffer), "%s/share/locale", resource_path);
|
snprintf(buffer, sizeof(buffer), "%s/share/locale", resource_path);
|
||||||
return buffer;
|
return buffer;
|
||||||
}
|
}
|
||||||
|
#endif /* USE_GTK_UI */
|
||||||
return "./share/locale";
|
return "./share/locale";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if USE_GTK_UI
|
||||||
static void show_main_window(GtkWidget *w, gpointer data)
|
static void show_main_window(GtkWidget *w, gpointer data)
|
||||||
{
|
{
|
||||||
gtk_widget_show(main_window);
|
gtk_widget_show(main_window);
|
||||||
|
@ -230,6 +236,7 @@ void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar,
|
||||||
|
|
||||||
gtkosx_application_ready(osx_app);
|
gtkosx_application_ready(osx_app);
|
||||||
}
|
}
|
||||||
|
#endif /* UES_GTK_UI */
|
||||||
|
|
||||||
void subsurface_command_line_init(gint *argc, gchar ***argv)
|
void subsurface_command_line_init(gint *argc, gchar ***argv)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue