mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-21 00:44:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update compilation to cope with modern SDK locations

Browse Source
This commit is contained in:
Vincent Sanders 2016-02-08 21:19:15 +00:00
parent 405965d871
commit a29969888a
3 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocoa/Makefile.defaults
View File

@ -24,9 +24,7 @@ NETSURF_USE_PNG := NO
NETSURF_USE_JPEG := NO
NETSURF_USE_IMAGEIO := YES
DEVELOPER_PATH := /Developer
MACOSX_VERSION := 10.6
SDK_VERSION := $(MACOSX_VERSION)
MACOSX_VERSION := $(shell sw_vers -productVersion | awk -F '.' '{print $$1 "." $$2}')
# Optimisation levels
CFLAGS += -O2

46
cocoa/Makefile.target
View File

@ -4,6 +4,32 @@
POSTEXES += NetSurf.app
# shut up zconf.h and zlib.h
#CFLAGS += -D_LARGEFILE64_SOURCE=1
# add Mac Ports include and library paths for openssl
ifneq ($(shell test -d /opt/local && echo 'yes'),)
LDFLAGS += -L/opt/local/lib
CFLAGS += -I/opt/local/include
endif
ifeq ($(SDK_VERSION),)
# if no SDK_VERSION has been specified select one from those available
SDK_PARAM := $(shell xcodebuild -showsdks | awk '/^$$/{p=0};p; /OS X SDKs:/{p=1}' | tail -1 | cut -f3)
SDK_VERSION := $(MACOSX_VERSION)
else
SDK_PARAM := -sdk macosx$(SDK_VERSION)
endif
SDK_PATH ?= $(shell xcodebuild -version $(SDK_PARAM) Path)
SDK_FLAGS := -isysroot $(SDK_PATH) -mmacosx-version-min=$(SDK_VERSION)
CFLAGS := $(SDK_FLAGS) $(CFLAGS)
LDFLAGS := $(SDK_FLAGS) -Wl,-syslibroot,$(SDK_PATH) $(LDFLAGS)
CXXFLAGS := $(SDK_FLAGS) $(CXXFLAGS)
# for timerisset()
CFLAGS += -D_DARWIN_C_SOURCE
LDFLAGS += -L/usr/lib
LDFLAGS += -L/usr/X11/lib
LDFLAGS += -lm -lcurl
@ -11,24 +37,6 @@ LDFLAGS += -lssl -lcrypto
CFLAGS += -Dnscocoa -D_BSD_SOURCE -D_POSIX_C_SOURCE -std=c99 -g -Os
# shut up zconf.h and zlib.h
#CFLAGS += -D_LARGEFILE64_SOURCE=1
ifneq ($(WITH_MACPORTS),)
LDFLAGS += -L/opt/local/lib
CFLAGS += -I/opt/local/include
endif
# for timerisset()
CFLAGS += -D_DARWIN_C_SOURCE
SDK_PARAM := $(shell xcodebuild -showsdks | awk '/^$$/{p=0};p; /OS X SDKs:/{p=1}' | tail -1 | cut -f3)
SDK_PATH ?= $(shell xcodebuild -version $(SDK_PARAM) Path)
SDK_FLAGS := -isysroot $(SDK_PATH) -mmacosx-version-min=$(MACOSX_VERSION)
CFLAGS := $(SDK_FLAGS) $(CFLAGS)
LDFLAGS := $(SDK_FLAGS) -Wl,-syslibroot,$(SDK_PATH) $(LDFLAGS)
CXXFLAGS := $(SDK_FLAGS) $(CXXFLAGS)
CFLAGS += -I/usr/X11/include
CFLAGS += -include cocoa/Prefix.pch
@ -168,7 +176,7 @@ $$(OBJROOT)/$(2).lproj: $$(OBJROOT)/$(2).lproj/$(1:.xib=.nib)
$$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): cocoa/res/$(1) $$(OBJROOT)/created
$(VQ)echo Compiling XIB $(1) for language $(2)
$(Q)mkdir -p $$(OBJROOT)/$(2).lproj
$(Q)cocoa/compile-xib.sh $(DEVELOPER_PATH) cocoa/res/$(1) $(2) $$@
$(Q)cocoa/compile-xib.sh cocoa/res/$(1) $(2) $$@
ifeq ($(wildcard cocoa/res/$(2).lproj/$(1).strings),cocoa/res/$(2).lproj/$(1).strings)
$$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): cocoa/res/$(2).lproj/$(1).strings

14
cocoa/compile-xib.sh
View File

@ -1,20 +1,20 @@
#!/bin/sh
# call: compile-xib.sh [xib file] [language] [(optional output nib file)]
DIR=`dirname "$2"`
XIB=`basename -s .xib "$2"`
DIR=`dirname "$1"`
XIB=`basename -s .xib "$1"`
STRINGS_FILE="$DIR/$3.lproj/$XIB.xib.strings"
STRINGS_FILE="$DIR/$2.lproj/$XIB.xib.strings"
TRANSLATE=""
if [ -f $STRINGS_FILE ]
then
TRANSLATE="--strings-file $STRINGS_FILE"
fi
OUTPUT="$3.$XIB.nib"
OUTPUT="$2.$XIB.nib"
if [ "x$4" != "x" ]
if [ "x$3" != "x" ]
then
OUTPUT="$4"
OUTPUT="$3"
fi
exec $1/usr/bin/ibtool $TRANSLATE --compile $OUTPUT $2
exec /usr/bin/ibtool $TRANSLATE --compile $OUTPUT $1