diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2012-07-26 18:28:34 +0100 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2012-07-26 18:28:34 +0100 |
| commit | 59ba5dd43cceeeef02732ef1d9f4200120017630 (patch) | |
| tree | 5fcd47b499db24a1de4729c5e120470bbd68e273 | |
| parent | 4bd23e73abf8174b4108bceb0bdb3879a2241969 (diff) | |
| parent | d3b88090204682944e5148ee008e8df08c587f97 (diff) | |
| download | netsurf-59ba5dd43cceeeef02732ef1d9f4200120017630.tar.gz netsurf-59ba5dd43cceeeef02732ef1d9f4200120017630.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
| -rw-r--r-- | cocoa/Makefile.target | 4 | ||||
| -rw-r--r-- | cocoa/selection.m | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target index 0fea50151..b3ababd91 100644 --- a/cocoa/Makefile.target +++ b/cocoa/Makefile.target @@ -5,7 +5,7 @@ POSTEXES += NetSurf.app LDFLAGS += -L/usr/lib - LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libhubbub libcss) + LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libhubbub libcss libdom) LDFLAGS += -L/usr/X11/lib LDFLAGS += -lm -lxml2 -lcurl -liconv LDFLAGS += -lssl -lcrypto @@ -16,7 +16,7 @@ CFLAGS += -g -Os -Wno-uninitialized - CFLAGS += $(shell $(PKG_CONFIG) --cflags libxml-2.0 libhubbub libcss) + CFLAGS += $(shell $(PKG_CONFIG) --cflags libxml-2.0 libhubbub libcss libdom) # shut up zconf.h and zlib.h #CFLAGS += -D_LARGEFILE64_SOURCE=1 diff --git a/cocoa/selection.m b/cocoa/selection.m index d894ed40b..cb6a936d6 100644 --- a/cocoa/selection.m +++ b/cocoa/selection.m @@ -21,6 +21,7 @@ #import "cocoa/BrowserViewController.h" #import "desktop/selection.h" +#import "render/box.h" static NSMutableString *cocoa_clipboard_string; |