Pantyhose-X/freeminer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,906 Commits 1 Branch 0 Tags
Commit Graph

125 Commits

Author SHA1 Message Date
est31
5704fb36d2 Better version detection for shallow clones 2015-05-03 16:47:22 +02:00
proller
7cad479837 find iconv by cmake, dont use and build iconv for android 2015-04-04 22:45:33 +03:00
proller
072d3b2b5b Simpler msgpack finder. with not-found error now! 2015-04-04 20:25:40 +03:00
proller
2b9801c680 fix merge ogles 2015-03-29 05:55:06 +03:00
proller
f879fff59b merge fixes 2015-03-29 00:36:44 +03:00
proller
1efac8340e Merge commit '3d53c90' 2015-03-28 17:44:31 +03:00
proller
c2a0c32b3e Merge commit '93fcab9' 
Conflicts:
	.travis.yml
	CMakeLists.txt
	README.txt
	build/android/Makefile
	cmake/Modules/FindCURL.cmake
	cmake/Modules/FindGettextLib.cmake
	cmake/Modules/FindOpenGLES2.cmake
	cmake/Modules/GenerateVersion.cmake
	misc/winresource.rc
	src/CMakeLists.txt
	src/client/clientlauncher.cpp
	src/cmake_config.h.in
	src/config.h
	src/debug.cpp
	src/emerge.cpp
	src/game.cpp
	src/guiEngine.cpp
	src/httpfetch.cpp
	src/jthread/CMakeLists.txt
	src/lua/CMakeLists.txt
	src/main.cpp
	src/server.cpp
 2015-03-28 17:44:09 +03:00
ShadowNinja
393722a9e3 Fix typo in OpenGL ES 2 CMake file 2015-03-27 15:10:27 -04:00
ShadowNinja
93fcab952b 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.
 2015-03-27 15:00:48 -04:00
proller
13f2b357f8 Merge remote-tracking branch 'minetest/master' 2015-03-23 07:57:18 +03:00
est31
c31c87adb5 Fix cmake po detection bug 
Previously, cmake po detection would treat the "timestamp" file created by building for android as own language directory.
 2015-03-23 13:43:18 +10:00
Markus Koschany
47d9b4d9aa Improve FindIrrlicht.cmake module 
Linux distributions prefer to link against a shared version of the Irrlicht
engine instead of using embedded code copies of the same. Search for this
shared version first and use that but fall back to the static version if it
does not exist.

This also fixes https://github.com/minetest/minetest/issues/2163
 2015-02-21 18:21:10 +01:00
proller
6b654d1718 Merge remote-tracking branch 'minetest/master' 
Conflicts:
	builtin/mainmenu/init.lua
	src/CMakeLists.txt
	src/client.cpp
	src/client.h
	src/defaultsettings.cpp
	src/game.cpp
	src/particles.cpp
 2015-01-10 00:16:57 +03:00
ShadowNinja
a3db918f78 Remove included SQLite3 2015-01-08 16:34:42 -05:00
proller
61504bbd5a Merge remote-tracking branch 'upstream/master' into next 
Conflicts:
	src/client.cpp
 2014-08-12 21:39:47 +04:00
proller
d2fb8084dc Add /opt/vc/lib to FindOpenGLES2.cmake . and convert some tabs 2014-08-12 19:08:13 +04:00
proller
498886f4ad Merge remote-tracking branch 'upstream/master' into next 
Conflicts:
	src/CMakeLists.txt
 2014-08-10 16:39:54 +04:00
proller
6c7583426b Fix ogles linking order 2014-08-09 20:02:33 +04:00
proller
a3f373a0bb Merge remote-tracking branch 'upstream/master' into next 2014-08-09 16:17:27 +04:00
proller
470a6af59c Try link with opengles1 lib 2014-08-09 16:07:59 +04:00
proller
20933c8c8e Merge remote-tracking branch 'upstream/master' into next 2014-07-13 21:40:43 +04:00
proller
36d0e7b962 Revert "remove not used sqlite sources" 
This reverts commit 4e26df37b89cd3f2ee809f451b86521ce31de534.
 2014-07-13 19:48:33 +04:00
proller
c71082cdf8 Merge remote-tracking branch 'upstream/master' into next 2014-07-11 20:37:44 +04:00
proller
4e26df37b8 remove not used sqlite sources 2014-07-11 20:36:50 +04:00
proller
b8d95b2d5e Merge remote-tracking branch 'upstream/master' into next 
Conflicts:
	src/game.cpp
	src/guiFormSpecMenu.cpp
	src/guiFormSpecMenu.h
	src/main.cpp
	src/server.cpp
	src/util/string.cpp
	src/util/string.h
 2014-06-30 23:07:01 +04:00
proller
65436ad81a Merge commit 'ff36071' 
Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
	src/environment.cpp
	src/game.cpp
	src/guiFormSpecMenu.cpp
	src/player.cpp
	src/profiler.h
	src/server.cpp
	src/util/string.h
 2014-06-30 21:42:30 +04:00
Martin Doege
c410e9182d OS X compatibility fixes 2014-06-29 17:27:33 +02:00
proller
18f4e55edf Merge remote-tracking branch 'upstream/master' into next 
Conflicts:
	src/client.cpp
	src/client.h
	src/cmake_config.h.in
	src/content_sao.cpp
	src/content_sao.h
	src/guiFormSpecMenu.cpp
	src/guiFormSpecMenu.h
	src/server.cpp
	src/server.h
 2014-04-04 19:43:59 +04:00
proller
5af011586b Place Mandelbulber fractal generator to tree 2014-03-09 15:27:09 +04:00
proller
1cf9d60e22 fix mandelbulber build. todo: update 2014-03-03 01:46:57 +04:00
proller
01a800cc55 Fix freebsd build 2014-03-02 23:38:08 +04:00
proller
1de3f178ae fix mandelbulber build. todo: update 2014-02-19 19:07:01 +04:00
Ilya Zhuravlev
9c8f28ae32 Merge branch 'master' into next 
Conflicts:
	src/clientserver.h
 2014-01-22 15:15:10 +04:00
proller
c71642d756 reverse patch 2014-01-21 17:45:53 +04:00
proller
3cd48fd139 better mandelbulber 2014-01-21 17:32:04 +04:00
Ilya Zhuravlev
ecca4cc785 Add build script for MSVC, add STATIC_BUILD flag for Windows, move Windows binaries up one level. 2014-01-21 12:23:13 +04:00
proller
2ca5bcda98 Merge remote-tracking branch 'upstream/master' into enet_msgpack 
Conflicts:
	src/client.cpp
	src/clientserver.h
	src/connection.cpp
	src/environment.h
	src/server.cpp
 2014-01-16 21:42:01 +04:00
Ilya Zhuravlev
efacd4c90d Initial MsgPack support. 2014-01-13 04:17:23 +04:00
proller
b580ea1576 External mandelbulber 2013-12-29 04:43:33 +04:00
proller
7cea67bc5b debian fix 2013-12-04 16:25:10 +04:00
proller
339cc37e2d Return git-generated version 2013-11-28 23:44:34 +04:00
proller
a268f381b0 Very long version like 0.4.8.0-free-e4eae79 2013-11-27 20:29:50 +04:00
proller
7040d8303c Merge remote-tracking branch 'upstream/master' into dynamic 
Conflicts:
	src/environment.cpp
	src/map.cpp
 2013-11-19 17:38:59 +04:00
sapier
533785ec9a Add CURL_DLL search to show up CURL_DLL in cmake gui and don't silently ignore missing CURL_DLL 2013-11-17 02:28:39 -05:00
proller
8427d78c5a Fix intl lib on freebsd 2013-11-14 17:00:51 +04:00
Kahrl
8bc7ea61b9 Show git hash in version string at top left corner of window 2013-09-28 21:30:17 +02:00
kwolekr
d308352dbd Always use builtin JThread library 2013-09-15 23:00:01 -04:00
proller
10c03e1a9d build with ogles2 driver 2013-03-16 22:37:50 -04:00
proller
dd8593f2d6 fix link if system json lib exists 2013-03-05 23:54:07 -05:00
proller
ee07c3f7cf new auto masterserver 2013-02-22 02:04:53 +04:00