diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-01-11 18:20:48 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-01-11 20:20:17 +0100 |
| commit | 134803653fecd62f64bb063df6b48713626e94b7 (patch) | |
| tree | b7c5bf559ec5bf82bd2679280d7fec038ab183ce /extensions/Library_npsoplugin.mk | |
| parent | b99010d1eba38c14719e9b34fbaa57591e3aed42 (diff) | |
tweak makefiles after np_sdk is in tail_build
Also change <npsdk/npapi.h> to "npapi.h"
Diffstat (limited to 'extensions/Library_npsoplugin.mk')
| -rw-r--r-- | extensions/Library_npsoplugin.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 1a30d13532d1..94d9d237bb06 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Library_Library,npsoplugin)) $(eval $(call gb_Library_use_external,npsoplugin,mozilla_headers)) -ifeq ($(GUI),UNX) - -$(eval $(call gb_Library_add_ldflags,npsoplugin,\ - $(OUTDIR)/lib/npunix.o \ +$(eval $(call gb_Library_add_linked_static_libs,npsoplugin,\ + nputils \ )) +ifeq ($(GUI),UNX) + $(eval $(call gb_Library_add_libs,npsoplugin,\ -ldl \ )) @@ -58,10 +58,6 @@ endif # GUI=UNX ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_ldflags,npsoplugin,\ - $(OUTDIR)/lib/npwin.obj \ -)) - $(eval $(call gb_Library_add_linked_static_libs,npsoplugin,\ ooopathutils \ )) |