diff options
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | COMPILING | 1 | ||||
| -rw-r--r-- | README.md | 2 |
5 files changed, 22 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index b0ad11d53..c65e6b8f6 100644 --- a/.gitignore +++ b/.gitignore @@ -11,9 +11,11 @@ cloc.xsl *.user *.suo /EveryNight.cmd -*.sublime-* -# emacs stuff +# IDE Stuff +## Sublime Text +*.sublime-* +## emacs *.*~ # world inside source diff --git a/.gitmodules b/.gitmodules index 088271457..028471319 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "MCServer/Plugins/Core"] path = MCServer/Plugins/Core - url = git@github.com:mc-server/Core.git + url = git://github.com/mc-server/Core.git [submodule "MCServer/Plugins/ProtectionAreas"] path = MCServer/Plugins/ProtectionAreas - url = git@github.com:mc-server/ProtectionAreas.git + url = git://github.com/mc-server/ProtectionAreas.git [submodule "MCServer/Plugins/TransAPI"] path = MCServer/Plugins/TransAPI - url = git@github.com:bearbin/transapi.git + url = git://github.com/bearbin/transapi.git diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..229f55ebf --- /dev/null +++ b/.travis.yml @@ -0,0 +1,12 @@ +language: cpp +compiler: + - gcc + - clang +# Build MCServer +script: make release=1 -j 2 + +# Notification Settings +notifications: + email: + on_success: change + on_failure: always @@ -5,3 +5,4 @@ To compile MCServer on *nix, you need a GNUmake-compatible make that reads GNUma Run "make" to build a debug version (slow, but gives more info on crash) Run "make release=1" to build a release version (fast, less info on crash) Add addm32=1 to compile in 32-bit mode on 64-bit systems. +Add `-j 4` to use 4 threads and speed up compilation on multi-core devices. @@ -29,3 +29,5 @@ Other Stuff For other stuff, including plugins and discussion, check the [forums](http://forum.mc-server.org) and [wiki](http://mc-server.org/wiki/). Earn bitcoins for commits or donate to reward the MCServer developers: [](http://tip4commit.com/projects/74) + +Travis CI: [](https://travis-ci.org/mc-server/MCServer) |