diff --git a/Meta/Lagom/Contrib/MacPDF/AppDelegate.h b/Meta/Lagom/Contrib/MacPDF/AppDelegate.h index 1063b120ca..e69d4425b4 100644 --- a/Meta/Lagom/Contrib/MacPDF/AppDelegate.h +++ b/Meta/Lagom/Contrib/MacPDF/AppDelegate.h @@ -5,7 +5,10 @@ // Created by Nico Weber on 7/22/23. // +// Several AK types conflict with MacOS types. +#define FixedPoint FixedPointMacOS #import +#undef FixedPoint @interface AppDelegate : NSObject diff --git a/Meta/Lagom/Contrib/MacPDF/AppDelegate.m b/Meta/Lagom/Contrib/MacPDF/AppDelegate.mm similarity index 66% rename from Meta/Lagom/Contrib/MacPDF/AppDelegate.m rename to Meta/Lagom/Contrib/MacPDF/AppDelegate.mm index 4531875f62..c23e6ce808 100644 --- a/Meta/Lagom/Contrib/MacPDF/AppDelegate.m +++ b/Meta/Lagom/Contrib/MacPDF/AppDelegate.mm @@ -7,6 +7,8 @@ #import "AppDelegate.h" +#include + @interface AppDelegate () @property (strong) IBOutlet NSWindow* window; @@ -17,6 +19,9 @@ - (void)applicationDidFinishLaunching:(NSNotification*)aNotification { // Insert code here to initialize your application + // FIXME: copy the fonts to the bundle or something + auto source_root = DeprecatedString("/Users/thakis/src/serenity"); + Gfx::FontDatabase::set_default_fonts_lookup_path(DeprecatedString::formatted("{}/Base/res/fonts", source_root)); } - (void)applicationWillTerminate:(NSNotification*)aNotification