Merge branch 'master' of git://git.netsurf-browser.org/netsurf

This commit is contained in:
Michael Drake 2012-07-26 18:28:34 +01:00
commit 59ba5dd43c
2 changed files with 3 additions and 2 deletions

View File

@ -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

View File

@ -21,6 +21,7 @@
#import "cocoa/BrowserViewController.h"
#import "desktop/selection.h"
#import "render/box.h"
static NSMutableString *cocoa_clipboard_string;