diff options
author | Sven Weidauer <sven.weidauer@gmail.com> | 2011-01-19 20:19:43 +0000 |
---|---|---|
committer | Sven Weidauer <sven.weidauer@gmail.com> | 2011-01-19 20:19:43 +0000 |
commit | f85335a7f9fdbff012409bb2af8fecc81740eab0 (patch) | |
tree | f4f6678aa78b89b76fab7a10094f0cdd1b22be0f /cocoa/Makefile.target | |
parent | 5a259dadeb6b6b31f5cfe628cc62bfb7d86e25b4 (diff) | |
download | netsurf-f85335a7f9fdbff012409bb2af8fecc81740eab0.tar.gz netsurf-f85335a7f9fdbff012409bb2af8fecc81740eab0.tar.bz2 |
Implementing tabs and fixing scrolling.
svn path=/trunk/netsurf/; revision=11396
Diffstat (limited to 'cocoa/Makefile.target')
-rw-r--r-- | cocoa/Makefile.target | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target index d7dacfa36..f27c4c933 100644 --- a/cocoa/Makefile.target +++ b/cocoa/Makefile.target @@ -24,7 +24,9 @@ CFLAGS += -D_DARWIN_C_SOURCE CFLAGS += -I/opt/local/include - CFLAGS += -I/opt/local/include/libxml2 + CFLAGS += -I/usr/include/libxml2 + CFLAGS += -Icocoa/PSMTabBarControl + CFLAGS += -include cocoa/Prefix.pch VERSION_FULL := $(shell sed -n '/"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c) VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) @@ -33,7 +35,7 @@ CFLAGS += else endif - LDFLAGS += -Wl,-framework,Cocoa $(NETLDFLAGS) + LDFLAGS += -Wl,-framework,Cocoa -Wl,-framework,Carbon $(NETLDFLAGS) $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) ifeq ($(HOST),macosx) @@ -58,7 +60,8 @@ # S_COCOA are sources purely for the Mac OS X build S_COCOA := \ BrowserView.m \ - BrowserWindow.m \ + BrowserViewController.m \ + BrowserWindowController.m \ DownloadWindowController.m \ NetSurfAppDelegate.m \ NetsurfApp.m \ @@ -77,8 +80,24 @@ S_COCOA := \ utf8.m \ utils.m +S_TABBAR := \ + NSBezierPath_AMShading.m \ + NSString_AITruncation.m \ + PSMOverflowPopUpButton.m \ + PSMProgressIndicator.m \ + PSMRolloverButton.m \ + PSMTabBarCell.m \ + PSMTabBarControl.m \ + PSMTabBarController.m \ + PSMTabDragAssistant.m \ + PSMTabDragView.m \ + PSMTabDragWindow.m \ + PSMTabDragWindowController.m \ + PSMUnifiedTabStyle.m + S_COCOA := $(addprefix cocoa/,$(S_COCOA)) +S_TABBAR := $(addprefix cocoa/PSMTabBarControl/,$(S_TABBAR)) # complete source file list -SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_COCOA) +SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_COCOA) $(S_TABBAR) EXETARGET := NetSurf |