diff options
| -rw-r--r-- | COMPILING | 20 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | clean.bat | 24 | ||||
| -rw-r--r-- | cloc-exclude.txt | 36 | ||||
| -rwxr-xr-x[-rw-r--r--] | stats.cmd | 2 | ||||
| -rw-r--r-- | tests/ConsoleColors/ConsoleColors.cpp (renamed from Tests/ConsoleColors/ConsoleColors.cpp) | 0 | ||||
| -rw-r--r-- | tests/NoiseTest/GNUmakefile (renamed from Tests/NoiseTest/GNUmakefile) | 0 | ||||
| -rw-r--r-- | tests/NoiseTest/NoiseTest.cpp (renamed from Tests/NoiseTest/NoiseTest.cpp) | 0 | ||||
| -rw-r--r-- | tests/NoiseTest/NoiseTest.sln (renamed from Tests/NoiseTest/NoiseTest.sln) | 0 | ||||
| -rw-r--r-- | tests/NoiseTest/NoiseTest.vcproj (renamed from Tests/NoiseTest/NoiseTest.vcproj) | 0 |
10 files changed, 28 insertions, 56 deletions
@@ -1,8 +1,18 @@ COMPILING ========= -To compile MCServer on *nix, you need a GNUmake-compatible make that reads GNUmakefile. -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. +To compile MCServer on *nix, you need CMake and make, as well as a C compiler, C++ compiler and linker. + +Release Mode +------------ + +Release mode is preferred for almost all cases, it has much better speed and less console spam. However, if you are developing MCServer actively, debug mode might be better. + + cmake . && make + +Debug Mode +---------- + +Debug mode is useful if you want more debugging information about MCServer as it's running or if you want to use a debugger like GDB to debug issues and crashes. + + cmake . -DCMAKE_BUILD_TYPE=DEBUG && make @@ -14,7 +14,7 @@ After you've cloned the repository, you probably want to pull down the submodule Compilation instructions are available in the COMPILING file. -Linux builds can be downloaded from [the Berboe CI server](http://ci.berboe.co.uk) and windows from xoft's [nightly build service](http://mc-server.xoft.cz). +Linux builds can be downloaded from [Bearbin's CI Service](http://ci.bearbin.net) and Windows builds from xoft's [nightly build service](http://mc-server.xoft.cz). After you've extracted the files, simply run the MCServer executable. diff --git a/clean.bat b/clean.bat deleted file mode 100644 index 08e4cc610..000000000 --- a/clean.bat +++ /dev/null @@ -1,24 +0,0 @@ -del *.ncb -del *.ilk -del *.lib -del *.exp -del *.map -del *.pdb -del log.txt -del *.bsc -del applog.txt -del *.suo /AH -del *.user -del debug\*.* /Q -del release\*.* /Q -rd release /Q -rd debug /Q - -cd MCServer -del MCServer.exe -del MCServer_debug.exe -cd .. - -cd VC2010 -call clean.bat -cd ..
\ No newline at end of file diff --git a/cloc-exclude.txt b/cloc-exclude.txt index 03c9531a8..c01f3e9c0 100644 --- a/cloc-exclude.txt +++ b/cloc-exclude.txt @@ -1,27 +1,13 @@ -CryptoPP -expat -jsoncpp-src-0.5.0 -lua-5.1.4 -MemDumpAnalysis/expat -source/LuaExpat -source/SQLite -squirrel_3_0_1_stable -VC2008/CryptoPP.vcproj -zlib-1.2.5 -zlib-1.2.7 -source/Bindings.cpp -source/Bindings.h -source/LeakFinder.cpp -source/LeakFinder.h -source/StackWalker.cpp -source/StackWalker.h -BiomeVisualiser/BiomeVisualiser.vcproj -MemDumpAnalysis/MemDumpAnalysis.vcproj -ProtoProxy/ProtoProxy.vcproj -Tests/NoiseTest/NoiseTest.vcproj -Tools/BlockZapper/BlockZapper.vcproj -Tools/ToLuaDoxy/ToLuaDoxy.vcproj +lib +Tools +Tests +src/Bindings.cpp +src/Bindings.h +src/LeakFinder.cpp +src/LeakFinder.h +src/StackWalker.cpp +src/StackWalker.h VC2008 +VC2013 Install -log.xml -build
\ No newline at end of file +build diff --git a/stats.cmd b/stats.cmd index ad49b15aa..967298aab 100644..100755 --- a/stats.cmd +++ b/stats.cmd @@ -1 +1 @@ -cloc --by-file-by-lang --exclude-dir=source/SQLite,source/LuaExpat,doxy,tolua..-1.0.93,jsoncpp.*,lua-5.1.4,squirrel_3.* --exclude-list-file=cloc-exclude.txt --xml --xsl=1 --report-file=cloc.xml --ignored=cloc-ignored.txt .
\ No newline at end of file +cloc --by-file-by-lang --exclude-dir=lib --exclude-list-file=cloc-exclude.txt --xml --xsl=1 --report-file=cloc.xml --ignored=cloc-ignored.txt . diff --git a/Tests/ConsoleColors/ConsoleColors.cpp b/tests/ConsoleColors/ConsoleColors.cpp index 7efc698b2..7efc698b2 100644 --- a/Tests/ConsoleColors/ConsoleColors.cpp +++ b/tests/ConsoleColors/ConsoleColors.cpp diff --git a/Tests/NoiseTest/GNUmakefile b/tests/NoiseTest/GNUmakefile index 436cfdcfe..436cfdcfe 100644 --- a/Tests/NoiseTest/GNUmakefile +++ b/tests/NoiseTest/GNUmakefile diff --git a/Tests/NoiseTest/NoiseTest.cpp b/tests/NoiseTest/NoiseTest.cpp index 5542f3ca6..5542f3ca6 100644 --- a/Tests/NoiseTest/NoiseTest.cpp +++ b/tests/NoiseTest/NoiseTest.cpp diff --git a/Tests/NoiseTest/NoiseTest.sln b/tests/NoiseTest/NoiseTest.sln index 240e97d01..240e97d01 100644 --- a/Tests/NoiseTest/NoiseTest.sln +++ b/tests/NoiseTest/NoiseTest.sln diff --git a/Tests/NoiseTest/NoiseTest.vcproj b/tests/NoiseTest/NoiseTest.vcproj index d8741f74c..d8741f74c 100644 --- a/Tests/NoiseTest/NoiseTest.vcproj +++ b/tests/NoiseTest/NoiseTest.vcproj |