diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2015-02-27 18:05:29 -0500 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2015-03-27 15:00:48 -0400 |
| commit | 93fcab952b28f4db39d9326b83f14cbd86c0cf17 (patch) | |
| tree | 4a2f0fcf7341c596f50ec24ff0a5a81d43d17ccd /util/travis/toolchain_mingw.cmake.in | |
| parent | 284fefb0c32e8222fadd78eeec6e7e718fe25668 (diff) | |
| download | minetest-93fcab952b28f4db39d9326b83f14cbd86c0cf17.tar.gz minetest-93fcab952b28f4db39d9326b83f14cbd86c0cf17.tar.bz2 minetest-93fcab952b28f4db39d9326b83f14cbd86c0cf17.zip | |
Clean up and tweak build system
* Combine client and server man pages.
* Update unit test options and available databases in man page.
* Add `--worldname` to man page.
* Fix a bunch of places where `"Minetest"` was used directly instead of `PROJECT_NAME`.
* Disable server build by default on all operating systems.
* Make `ENABLE_FREETYPE` not fail if FreeType isn't found.
* Enable LevelDB, Redis, and FreeType detection by default.
* Remove the `VERSION_PATCH_ORIG` hack.
* Add option to search for and use system JSONCPP.
* Remove broken LuaJIT version detection.
* Rename `DISABLE_LUAJIT` to `ENABLE_LUAJIT`.
* Rename `minetest_*` variables in `version.{h,cpp}` to `g_*`.
* Clean up style of CMake files.
Diffstat (limited to 'util/travis/toolchain_mingw.cmake.in')
| -rw-r--r-- | util/travis/toolchain_mingw.cmake.in | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/util/travis/toolchain_mingw.cmake.in b/util/travis/toolchain_mingw.cmake.in index 44830eb60..65f67517e 100644 --- a/util/travis/toolchain_mingw.cmake.in +++ b/util/travis/toolchain_mingw.cmake.in @@ -1,17 +1,18 @@ -# name of the target operating system -SET(CMAKE_SYSTEM_NAME Windows) +# Target operating system name +set(CMAKE_SYSTEM_NAME Windows) -# which compilers to use for C and C++ -SET(CMAKE_C_COMPILER %PREFIX%-gcc) -SET(CMAKE_CXX_COMPILER %PREFIX%-g++) -SET(CMAKE_RC_COMPILER %PREFIX%-windres) +# Compilers to use +set(CMAKE_C_COMPILER %PREFIX%-gcc) +set(CMAKE_CXX_COMPILER %PREFIX%-g++) +set(CMAKE_RC_COMPILER %PREFIX%-windres) -# here is the target environment located -SET(CMAKE_FIND_ROOT_PATH %ROOTPATH%) +# Location of the target environment +set(CMAKE_FIND_ROOT_PATH %ROOTPATH%) -# adjust the default behaviour of the FIND_XXX() commands: -# search headers and libraries in the target environment, search -# programs in the host environment +# Adjust the default behaviour of the FIND_XXX() commands: +# search for headers and libraries in the target environment, +# search for programs in the host environment set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) + |