From 6d1169e92d421855284dd27e8695e6bdf1e216f3 Mon Sep 17 00:00:00 2001 From: François Revel Date: Wed, 19 Jan 2011 01:36:21 +0000 Subject: Add the required makefile stuff to build NetSurf for OSX using 'make cocoa' in trunk/. Crashes for now though. Requires some libs installed with macports to /opt/local. svn path=/trunk/netsurf/; revision=11380 --- Makefile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f35333af0..c919dde4d 100644 --- a/Makefile +++ b/Makefile @@ -76,6 +76,9 @@ else else ifeq ($(HOST),Darwin) HOST := macosx + ifeq ($(TARGET),) + TARGET := cocoa + endif endif ifeq ($(HOST),FreeMiNT) HOST := mint @@ -103,7 +106,9 @@ ifneq ($(TARGET),riscos) ifneq ($(TARGET),framebuffer) ifneq ($(TARGET),windows) ifneq ($(TARGET),atari) - $(error Unknown TARGET "$(TARGET)", should either be "riscos", "gtk", "beos", "amiga", "framebuffer", "windows" or "atari") + ifneq ($(TARGET),cocoa) + $(error Unknown TARGET "$(TARGET)", should either be "riscos", "gtk", "beos", "amiga", "framebuffer", "windows", "atari" or "cocoa") + endif endif endif endif @@ -355,7 +360,7 @@ ifeq ($(SOURCES),) $(error Unable to build NetSurf, could not determine set of sources to build) endif -OBJECTS := $(sort $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(patsubst %.s,%.o,$(SOURCES))))))) +OBJECTS := $(sort $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(patsubst %.m,%.o,$(patsubst %.s,%.o,$(SOURCES)))))))) $(EXETARGET): $(OBJECTS) $(RESOURCES) $(VQ)echo " LINK: $(EXETARGET)" @@ -528,6 +533,9 @@ $(eval $(foreach SOURCE,$(filter %.c,$(SOURCES)), \ $(eval $(foreach SOURCE,$(filter %.cpp,$(SOURCES)), \ $(call dependency_generate_c,$(SOURCE),$(subst /,_,$(SOURCE:.cpp=.d)),$(subst /,_,$(SOURCE:.cpp=.o))))) +$(eval $(foreach SOURCE,$(filter %.m,$(SOURCES)), \ + $(call dependency_generate_c,$(SOURCE),$(subst /,_,$(SOURCE:.m=.d)),$(subst /,_,$(SOURCE:.m=.o))))) + # Cannot currently generate dep files for S files because they're objasm # when we move to gas format, we will be able to. @@ -546,6 +554,9 @@ $(eval $(foreach SOURCE,$(filter %.c,$(SOURCES)), \ $(eval $(foreach SOURCE,$(filter %.cpp,$(SOURCES)), \ $(call compile_target_cpp,$(SOURCE),$(subst /,_,$(SOURCE:.cpp=.o)),$(subst /,_,$(SOURCE:.cpp=.d))))) +$(eval $(foreach SOURCE,$(filter %.m,$(SOURCES)), \ + $(call compile_target_c,$(SOURCE),$(subst /,_,$(SOURCE:.m=.o)),$(subst /,_,$(SOURCE:.m=.d))))) + $(eval $(foreach SOURCE,$(filter %.s,$(SOURCES)), \ $(call compile_target_s,$(SOURCE),$(subst /,_,$(SOURCE:.s=.o)),$(subst /,_,$(SOURCE:.s=.d))))) -- cgit v1.2.3