Skip to content

Commit

Permalink
Add our mono runtimes to the build.
Browse files Browse the repository at this point in the history
  • Loading branch information
rolfbjarne committed Apr 24, 2016
1 parent 39ef301 commit 9ea0738
Show file tree
Hide file tree
Showing 18 changed files with 2,356 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Make.config.local
Make.config.inc
_ios-build
_mac-build

8 changes: 8 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[submodule "external/llvm"]
path = external/llvm
url = git://github.com/mono/llvm.git
branch = master
[submodule "external/mono"]
path = external/mono
url = git://github.com/mono/mono.git
branch = mono-4.5.0-branch
5 changes: 5 additions & 0 deletions Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,11 @@ DEVICETV_SDK = $(XCODE_DEVELOPER_ROOT)/Platforms/AppleTVOS.platfor
DEVICETV_CFLAGS = -arch arm64 -mtvos-version-min=$(MIN_TVOS_SDK_VERSION) -isysroot $(DEVICETV_SDK) $(CFLAGS) -fembed-bitcode $(IOS_COMMON_DEFINES)
DEVICETV_OBJC_CFLAGS = $(DEVICETV_CFLAGS) $(DEVICE_OBJC_CFLAGS)

# paths to the modules we depend on, as variables, so people can put
# things in other places if they absolutely must.
MONO_PATH=$(TOP)/external/mono
LLVM_PATH=$(TOP)/external/llvm

MONO_PREFIX ?= /Library/Frameworks/Mono.framework/Versions/Current
SYSTEM_MCS=$(MONO_PREFIX)/bin/mcs
SYSTEM_SN=$(MONO_PREFIX)/bin/sn
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TOP=.
SUBDIRS=
SUBDIRS=builds
include $(TOP)/Make.config
include $(TOP)/mk/versions.mk
21 changes: 21 additions & 0 deletions builds/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.stamp*
*.config.cache
install
mac32
mac64
llvm
llvm64
simulator86
simulator64
watchsimulator
tvsimulator
tools64
cross
cross64
crosstv
cross-watch
target7
target7s
target64
targettv
targetwatch
Loading

0 comments on commit 9ea0738

Please sign in to comment.