Skip to content

Commit a056627

Browse files
committedMar 30, 2013
Merge remote branch 'origin/master'
2 parents 0d83bdc + 1aa50b1 commit a056627

File tree

162 files changed

+16023
-12908
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+16023
-12908
lines changed
 

Diff for: ‎.gitignore

+7-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@
44
*bak*
55
tags
66
*.vim
7+
*.orig
8+
*.rej
79

810
## Non-static Minetest directories
911
/bin/
1012
/games/*
1113
!/games/minimal/
1214
/cache/
13-
/textures/
15+
/textures/*
16+
!/textures/base/
1417
/sounds/
1518
/mods/*
1619
!/mods/minetest/
@@ -41,7 +44,9 @@ src/cguittfont/libcguittfont.a
4144
src/cguittfont/cmake_install.cmake
4245
src/cguittfont/Makefile
4346
src/json/CMakeFiles/
44-
src/json/libjson.a
47+
src/json/libjsoncpp.a
48+
src/sqlite/CMakeFiles/*
49+
src/sqlite/libsqlite3.a
4550
CMakeCache.txt
4651
CPackConfig.cmake
4752
CPackSourceConfig.cmake

Diff for: ‎CMakeLists.txt

+6-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
1212
# Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
1313
set(VERSION_MAJOR 0)
1414
set(VERSION_MINOR 4)
15-
set(VERSION_PATCH 4-d1)
15+
set(VERSION_PATCH 5)
1616
if(VERSION_EXTRA)
1717
set(VERSION_PATCH ${VERSION_PATCH}-${VERSION_EXTRA})
1818
endif()
@@ -133,6 +133,11 @@ endif()
133133
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}")
134134
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/client" DESTINATION "${SHAREDIR}")
135135
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/minimal" DESTINATION "${SHAREDIR}/games")
136+
set(COMMON_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/common")
137+
if(EXISTS ${COMMON_SOURCE} AND IS_DIRECTORY ${COMMON_SOURCE})
138+
install(FILES ${COMMON_SOURCE}/README.txt DESTINATION "${SHAREDIR}/games/common/")
139+
install(DIRECTORY ${COMMON_SOURCE}/mods DESTINATION "${SHAREDIR}/games/common")
140+
endif()
136141
set(MINETEST_GAME_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/minetest_game")
137142
if(EXISTS ${MINETEST_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_GAME_SOURCE})
138143
install(FILES ${MINETEST_GAME_SOURCE}/game.conf DESTINATION "${SHAREDIR}/games/minetest_game/")

0 commit comments

Comments
 (0)
Please sign in to comment.