mirror of
https://github.com/subsurface/subsurface.git
synced 2025-01-31 22:53:23 +00:00
Add XSLT support for the macosx install and bundle targets
Works like it should for the install-macosx target. I haven't tested the create-macosx-bundle target, but it shouldn't be any different. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
fe87ed182e
commit
eb7acc1d96
2 changed files with 14 additions and 0 deletions
9
Makefile
9
Makefile
|
@ -190,6 +190,11 @@ install-macosx: $(NAME)
|
||||||
$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources/$$LOC; \
|
$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources/$$LOC; \
|
||||||
$(INSTALL) $$LOC/subsurface.mo $(MACOSXINSTALL)/Contents/Resources/$$LOC/subsurface.mo; \
|
$(INSTALL) $$LOC/subsurface.mo $(MACOSXINSTALL)/Contents/Resources/$$LOC/subsurface.mo; \
|
||||||
done
|
done
|
||||||
|
@-if test ! -z "$(XSLT)"; then \
|
||||||
|
$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources/xslt; \
|
||||||
|
$(INSTALL) -m 644 $(XSLTFILES) $(MACOSXINSTALL)/Contents/Resources/xslt/; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
create-macosx-bundle: $(NAME)
|
create-macosx-bundle: $(NAME)
|
||||||
$(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources
|
$(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources
|
||||||
|
@ -203,6 +208,10 @@ create-macosx-bundle: $(NAME)
|
||||||
$(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources/$$LOC; \
|
$(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources/$$LOC; \
|
||||||
$(INSTALL) $$LOC/subsurface.mo $(MACOSXSTAGING)/Contents/Resources/$$LOC/subsurface.mo; \
|
$(INSTALL) $$LOC/subsurface.mo $(MACOSXSTAGING)/Contents/Resources/$$LOC/subsurface.mo; \
|
||||||
done
|
done
|
||||||
|
@-if test ! -z "$(XSLT)"; then \
|
||||||
|
$(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources/xslt; \
|
||||||
|
$(INSTALL) -m 644 $(XSLTFILES) $(MACOSXSTAGING)/Contents/Resources/xslt/; \
|
||||||
|
fi
|
||||||
$(GTK_MAC_BUNDLER) packaging/macosx/subsurface.bundle
|
$(GTK_MAC_BUNDLER) packaging/macosx/subsurface.bundle
|
||||||
|
|
||||||
install-cross-windows: $(NAME)
|
install-cross-windows: $(NAME)
|
||||||
|
|
5
macos.c
5
macos.c
|
@ -1,5 +1,6 @@
|
||||||
/* macos.c */
|
/* macos.c */
|
||||||
/* implements Mac OS X specific functions */
|
/* implements Mac OS X specific functions */
|
||||||
|
#include <stdlib.h>
|
||||||
#include "dive.h"
|
#include "dive.h"
|
||||||
#include "display-gtk.h"
|
#include "display-gtk.h"
|
||||||
#include <CoreFoundation/CoreFoundation.h>
|
#include <CoreFoundation/CoreFoundation.h>
|
||||||
|
@ -172,6 +173,10 @@ void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar,
|
||||||
GtkWidget *vbox, GtkUIManager *ui_manager)
|
GtkWidget *vbox, GtkUIManager *ui_manager)
|
||||||
{
|
{
|
||||||
GtkWidget *menu_item, *sep;
|
GtkWidget *menu_item, *sep;
|
||||||
|
static char path[1024];
|
||||||
|
|
||||||
|
snprintf(path, 1024, "%s/xslt", gtkosx_application_get_resource_path());
|
||||||
|
setenv("SUBSURFACE_XSLT_PATH", path, TRUE);
|
||||||
|
|
||||||
g_object_set(G_OBJECT(settings), "gtk-font-name", UI_FONT, NULL);
|
g_object_set(G_OBJECT(settings), "gtk-font-name", UI_FONT, NULL);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue