extensions: tweaks to the plugin makefiles

3 files changed, 20 insertions, 13 deletions

diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk
index 4877eddff2b9..b67d9e304a70 100644
--- a/extensions/Executable_pluginapp.bin.mk
+++ b/extensions/Executable_pluginapp.bin.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Executable_Executable,pluginapp.bin))
 
 $(eval $(call gb_Executable_set_include,pluginapp.bin,\
 	$$(INCLUDE) \
-	-I$(realpath $(SRCDIR)/extensions/source/plugin/inc) \
+	-I$(SRCDIR)/extensions/source/plugin/inc \
 ))
 
 $(eval $(call gb_Executable_add_api,pluginapp.bin,\
@@ -87,6 +87,7 @@ endif
 ifeq ($(ENABLE_GTK),TRUE)
 $(eval $(call gb_Executable_use_external,pluginapp.bin,gtk))
 
+# the orignal dmakefile said: don't ask, it's ugly
 ifeq ($(OS),SOLARIS)
 $(eval $(call gb_Executable_set_ldflags,pluginapp.bin,\
 	-z nodefs \
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index 2f6ec5822767..8329ac8a5a09 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_componentfile,pl,extensions/source/plugin/pl))
 
 $(eval $(call gb_Library_set_include,pl,\
 	$$(INCLUDE) \
-	-I$(realpath $(SRCDIR)/extensions/source/plugin/inc) \
+	-I$(SRCDIR)/extensions/source/plugin/inc \
 	-I$(OUTDIR)/inc/mozilla/plugin \
 ))
 
@@ -51,6 +51,10 @@ $(eval $(call gb_Library_set_include,pl,\
 	-I$(OUTDIR)/mozilla/nspr \
 ))
 
+$(eval $(call gb_Library_add_defs,pl,\
+	-DOJI \
+))
+
 ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Library_set_include,pl,\
 	$$(INCLUDE) \
@@ -91,13 +95,15 @@ ifeq ($(GUIBASE),aqua)
 
 $(eval $(call gb_Library_add_exception_objects,pl,\
 	extensions/source/plugin/aqua/macmgr \
-	extensions/source/plugin/sysplug \
+))
+$(eval $(call gb_Library_add_objcxxobjects,pl,\
+	extensions/source/plugin/aqua/sysplug \
 ))
 
 $(eval $(call gb_Library_set_include,pl,\
 	$$(INCLUDE) \
-	-I$(realpath $(FRAMEWORKSHOME)/ApplicationServices.framework/Version/Current/Frameworks/QD.framework/Headers) \
-	-I$(realpath $(FRAMEWORKSHOME)/Carbon.framework/Versions/Current/Frameworks/HIToolbox.framework/Versions/Current/Headers) \
+	-I$(FRAMEWORKSHOME)/ApplicationServices.framework/Version/Current/Frameworks/QD.framework/Headers \
+	-I$(FRAMEWORKSHOME)/Carbon.framework/Versions/Current/Frameworks/HIToolbox.framework/Versions/Current/Headers \
 ))
 
 endif # GUIBASE=aqua
@@ -111,10 +117,10 @@ $(eval $(call gb_Library_use_external,pl,gtk))
 endif # ENABLE_GTK=TRUE
 
 $(eval $(call gb_Library_add_exception_objects,pl,\
-	extensions/source/plugin/unx/nppapi \
-	extensions/source/plugin/unx/sysplug \
 	extensions/source/plugin/unx/mediator \
+	extensions/source/plugin/unx/nppapi \
 	extensions/source/plugin/unx/plugcon \
+	extensions/source/plugin/unx/sysplug \
 	extensions/source/plugin/unx/unxmgr \
 ))
 
@@ -139,16 +145,16 @@ $(eval $(call gb_Library_add_linked_libs,pl,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,pl,\
-	extensions/source/plugin/base/plctrl \
-	extensions/source/plugin/base/service \
-	extensions/source/plugin/base/xplugin \
-	extensions/source/plugin/base/nfuncs \
-	extensions/source/plugin/base/manager \
 	extensions/source/plugin/base/context \
 	extensions/source/plugin/base/evtlstnr \
-	extensions/source/plugin/base/plcom \
+	extensions/source/plugin/base/manager \
 	extensions/source/plugin/base/multiplx \
+	extensions/source/plugin/base/nfuncs \
+	extensions/source/plugin/base/plcom \
+	extensions/source/plugin/base/plctrl \
 	extensions/source/plugin/base/plmodel \
+	extensions/source/plugin/base/service \
+	extensions/source/plugin/base/xplugin \
 ))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/source/plugin/aqua/sysplug.cxx b/extensions/source/plugin/aqua/sysplug.mm
index 415ca936c46f..415ca936c46f 100644
--- a/extensions/source/plugin/aqua/sysplug.cxx
+++ b/extensions/source/plugin/aqua/sysplug.mm