minenux/minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

packaging files for distros: debian/feladora/suse/alpine

Browse Source 
* try to fix again cmake for moder distros on postgres and gettex
This commit is contained in:
mckaygerhard 2023-09-17 23:03:13 -04:00
parent dda082c29b
commit cb6875826c
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Modules/FindLuaJIT.cmake
View File

@ -9,7 +9,7 @@
FIND_PATH(LUA_INCLUDE_DIR luajit.h FIND_PATH(LUA_INCLUDE_DIR luajit.h
HINTS HINTS
$ENV{LUA_DIR} $ENV{LUA_DIR}
PATH_SUFFIXES include/luajit-2.1 include/luajit-2.0 include/luajit-5_1-2.1 include/luajit-5_1-2.0 include luajit PATH_SUFFIXES include/luajit-2.1 include/luajit-2.0 include/luajit-5_1-2.1 include/luajit-5_1-2.0 include/moonjit-2.2 include luajit
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks

14
doc/minetest.6
View File

@ -1,21 +1,21 @@
.TH minetest 6 "2 February 2019" "" "" .TH multicraft 6 "2 February 2019" "" ""
.SH NAME .SH NAME
minetest, minetestserver \- Multiplayer infinite-world block sandbox multicraft, multicraftserver \- Multiplayer infinite-world block sandbox
.SH SYNOPSIS .SH SYNOPSIS
.B minetest .B multicraft
[\fB--server SERVER OPTIONS\fR | \fBCLIENT OPTIONS\fR] [\fB--server SERVER OPTIONS\fR | \fBCLIENT OPTIONS\fR]
[\fBCOMMON OPTIONS\fR] [\fBCOMMON OPTIONS\fR]
[\fBWORLD PATH\fR] [\fBWORLD PATH\fR]
.B minetestserver .B multicraftserver
[\fBSERVER OPTIONS\fR] [\fBSERVER OPTIONS\fR]
[\fBCOMMON OPTIONS\fR] [\fBCOMMON OPTIONS\fR]
[\fBWORLD PATH\fR] [\fBWORLD PATH\fR]
.SH DESCRIPTION .SH DESCRIPTION
.B Minetest is one of the first InfiniMiner/Minecraft(/whatever) inspired games .B Multicraft is forked from minetest, a InfiniMiner/Minecraft(/whatever) inspired game
(started October 2010), with a goal of taking the survival multiplayer gameplay (started October 2010), with a goal of taking the survival multiplayer gameplay
in a slightly different direction. in a slightly different direction.
.PP .PP
@ -121,7 +121,7 @@ Display an interactive terminal over ncurses during execution.
Colon delimited list of directories to search for games. Colon delimited list of directories to search for games.
.SH BUGS .SH BUGS
Please report all bugs at https://github.com/minetest/minetest/issues. Please report all bugs at https://github.com/multicraft/multicraft/issues.
.SH AUTHOR .SH AUTHOR
.PP .PP
@ -131,4 +131,4 @@ This man page was originally written by
Juhani Numminen <juhaninumminen0@gmail.com>. Juhani Numminen <juhaninumminen0@gmail.com>.
.SH WWW .SH WWW
http://www.minetest.net/ http://www.multicraft.world/

16
src/CMakeLists.txt
View File

@ -179,7 +179,7 @@ if(ENABLE_POSTGRESQL)
set(PostgreSQL_LIBRARIES ${PostgreSQL_LIBRARY}) set(PostgreSQL_LIBRARIES ${PostgreSQL_LIBRARY})
endif() endif()
else() else()
find_package(PostgreSQL) find_package("PostgreSQL")
endif() endif()
if(PostgreSQL_FOUND) if(PostgreSQL_FOUND)
@ -189,7 +189,8 @@ if(ENABLE_POSTGRESQL)
message(STATUS "PostgreSQL includes: ${PostgreSQL_INCLUDE_DIRS}") message(STATUS "PostgreSQL includes: ${PostgreSQL_INCLUDE_DIRS}")
include_directories(${PostgreSQL_INCLUDE_DIRS}) include_directories(${PostgreSQL_INCLUDE_DIRS})
else() else()
message(STATUS "PostgreSQL not found!") message(STATUS "PostgreSQL not found (maybe older or no cmake module)! disable, path is to /usr/include/postgresql/")
set(PostgreSQL_TYPE_INCLUDE_DIR /usr/include/postgresql/)
endif() endif()
endif(ENABLE_POSTGRESQL) endif(ENABLE_POSTGRESQL)
@ -878,7 +879,7 @@ else()
endif() endif()
endif() endif()
set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops") set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${CMAKE_C_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS} $ENV{CFLAGS} -Wall -pipe -funroll-loops")
if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)") if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os")
else() else()
@ -891,13 +892,12 @@ else()
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MATH_FLAGS}") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MATH_FLAGS}")
endif() endif()
endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)") endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS} $ENV{CPPFLAGS}")
set(CMAKE_CXX_FLAGS_SEMIDEBUG "-g -O1 -Wall ${WARNING_FLAGS} ${OTHER_FLAGS} $ENV{CPPFLAGS}") set(CMAKE_CXX_FLAGS_SEMIDEBUG "-g -O1 -Wall ${WARNING_FLAGS} ${CMAKE_CXX_FLAGS} ${OTHER_FLAGS} $ENV{CPPFLAGS}")
set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall ${WARNING_FLAGS} ${OTHER_FLAGS}") set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall ${WARNING_FLAGS} ${CMAKE_CXX_FLAGS} ${OTHER_FLAGS} $ENV{CPPFLAGS}")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${CMAKE_C_FLAGS} $ENV{CFLAGS} ")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${CMAKE_C_FLAGS} -g") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${CMAKE_C_FLAGS} -g")
set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_PROFILE} ${CMAKE_C_FLAGS} -O1 -g") set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_PROFILE} ${CMAKE_C_FLAGS} -O1 -g")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_WITHDEBINFO} ${CMAKE_C_FLAGS} $ENV{CFLAGS} -g") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_WITHDEBINFO} ${CMAKE_C_FLAGS} $ENV{CFLAGS} -g")
if(USE_GPROF) if(USE_GPROF)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg")