Nocte-
/
hexahedra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small build fixes

master
Nocte- 2014-06-09 21:28:03 +02:00
parent 8293bd1d91
commit 1a927004dc
5 changed files with 62 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
CMakeLists.txt
View File

@ -129,7 +129,7 @@ endif()
if (BUILD_CLIENT)
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/data/." DESTINATION "${DATADIR}")
if (UNIX)
install(FILES "install/hexahedra.png" DESTINATION "${SHAREDIR}/pixmaps")
install(FILES "install/hexahedra.png" "install/hexahedra.xpm" DESTINATION "${SHAREDIR}/pixmaps")
install(FILES "install/hexahedra.desktop" DESTINATION "${SHAREDIR}/applications")
endif()
if (WIN32)
@ -141,6 +141,7 @@ if (BUILD_CLIENT)
endif()
endif()
if (BUILD_SERVER)
#install(FILES "install/opencl.cl" DESTINATION "${DBDIR}")
if (WIN32)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/install/hexahedra-server.rc.in ${CMAKE_CURRENT_SOURCE_DIR}/install/hexahedra-server.rc)
endif()
@ -178,15 +179,6 @@ if(BUILD_DOCUMENTATION)
endif()
endif()
#set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Collection of voxel games")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/doc/project_description.txt")
file(READ ${CPACK_PACKAGE_DESCRIPTION_FILE} CPACK_PACKAGE_DESCRIPTION_SUMMARY)
set(CPACK_PACKAGE_VENDOR "Nocte")
set(CPACK_PACKAGE_CONTACT "Nocte <hexahedra.maintainer@gmail.com>")
set(CPACK_SOURCE_IGNORE_FILES "CMakefiles;Makefile;CMakeCache.txt;_CPack_Packages;/.git/;")
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}_${VERSION}")
set(CPACK_STRIP_FILES TRUE)
if(UNIX)
macro(GZIP_FILE INFILE)
add_custom_command(OUTPUT ${INFILE}.gz
@ -203,17 +195,19 @@ if(UNIX)
install(FILES "doc/man/hexahedra.6.gz" "doc/man/hexahedra-server.6.gz" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man6/")
install(FILES "changelog.gz" "debian/copyright" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}/")
set(CPACK_GENERATOR "DEB")
add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
endif()
set(CPACK_DEBIAN_PACKAGE_SECTION "games")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.0), libenet1a, libjpeg62, libgcc1 (>= 1:4.1.1), libglew1.8, libglu1-mesa | libglu1, libluajit-5.1-2, libstdc++6 (>= 4.0), zlib1g (>= 1:1.1.4), libleveldb1, libluabind0.9.1")
add_custom_target(deb dpkg-buildpackage)
add_dependencies(deb dist)
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/doc/project_description.txt")
file(READ ${CPACK_PACKAGE_DESCRIPTION_FILE} CPACK_PACKAGE_DESCRIPTION_SUMMARY)
set(CPACK_PACKAGE_VENDOR "Nocte")
set(CPACK_PACKAGE_CONTACT "Nocte <hexahedra.maintainer@gmail.com>")
set(CPACK_SOURCE_IGNORE_FILES "CMakefiles;Makefile;CMakeCache.txt;_CPack_Packages;/.git/;")
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}_${VERSION}")
set(CPACK_STRIP_FILES TRUE)
set(CPACK_RPM_PACKAGE_GROUP "Amusements/Games")
add_custom_target(rpm rpmbuild -ta ${CPACK_PACKAGE_FILE_NAME}.tar.gz)
add_dependencies(rpm dist)
if(UNIX)
set(CPACK_GENERATOR "TGZ")
set(CPACK_SOURCE_GENERATOR "TGZ")
elseif(WIN32)
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Hexahedra")

43
debian/control vendored
View File

@ -1,14 +1,51 @@
Source: hexahedra
Maintainer: Nocte <hexahedra.maintainer@gmail.com>
Section: games
Priority: optional
Build-Depends: debhelper (>= 9), cmake (>= 2.8), cdbs, zlib1g-dev, libboost-dev (>= 1.50), libboost-chrono-dev (>= 1.50), libboost-filesystem-dev (>= 1.50), libboost-iostreams-dev (>= 1.50), libboost-program-options-dev (>= 1.50), libboost-signals-dev (>= 1.50), libboost-system-dev (>= 1.50), libboost-thread-dev (>= 1.50), libcrypto++-dev, libsfml-dev (>= 2.0.0), libenet-dev, libjpeg-dev, libglm-dev, libglew-dev, libglu1-mesa-dev | libglu1-dev, libluajit-5.1-dev, libleveldb-dev, librhea1-dev, libes1-dev, libhexanoise1-dev
Priority: extra
Build-Depends:
debhelper (>= 9),
cmake (>= 2.8),
cdbs,
zlib1g-dev,
libboost-dev (>= 1.50),
libboost-chrono-dev (>= 1.50),
libboost-filesystem-dev (>= 1.50),
libboost-iostreams-dev (>= 1.50),
libboost-program-options-dev (>= 1.50),
libboost-signals-dev (>= 1.50),
libboost-system-dev (>= 1.50),
libboost-thread-dev (>= 1.50),
libcrypto++-dev,
libsfml-dev (>= 2.0.0),
libenet-dev,
libjpeg-dev,
libglm-dev,
libglew-dev,
libglu1-mesa-dev | libglu1-dev,
libluajit-5.1-dev [i386 amd64 kfreebsd-i386 armel armhf powerpc powerpcspe mips] | liblua5.1-dev,
libleveldb-dev,
librhea1-dev,
libes1-dev,
libhexanoise1-dev
Standards-Version: 3.9.4
Homepage: http://hexahedra.net/
Package: hexahedra
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Depends:
${shlibs:Depends},
${misc:Depends},
hexahedra-server (=${binary:Version})
Description: Collection of blocky sandbox games
A collection of single- and multiplayer blocky sandbox games.
Package: hexahedra-server
Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends}
Suggests:
hexahedra
Description: Hexahedra server
Headless server for single- and multiplayer Hexahedra games.

8
debian/copyright vendored
View File

@ -30,6 +30,10 @@ Files: libs/lz4/*
Copyright: 2011, Yann Collet
License: BSD-2-clause
Files: libs/utf8/*
Copyright: 2006 Nemanja Trifunovic
License: Expat
License: AGPL-3.0
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@ -57,6 +61,10 @@ License: GPL-3.0
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU General Public License
version 3 can be found in the file
'/usr/share/common-licenses/GPL-3'.
License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy

3
doc/man/hexahedra.6
View File

@ -39,8 +39,7 @@ Override the OpenGL version autodetection, and force the use of OpenGL 2.0.
Use a different database file. The default is 'world.db'.
.TP
.BR \-\-uid=username
Run the client under the given user after initialisation. The default is
'nobody'.
Run the client under the given user after initialisation. The default is 'nobody'.
.TP
.BR \-\-datadir=path
Use a different path to load the game's assets from. The default path is

14
install/control
View File

@ -1,14 +0,0 @@
Source: hexahedra
Maintainer: Nocte <hexahedra.maintainer@gmail.com>
Section: games
Priority: optional
Build-Depends: debhelper (>= 9), cmake (>= 2.8), cdbs, zlib1g-dev, libboost-dev (>= 1.50), libboost-chrono-dev (>= 1.50), libboost-filesystem-dev (>= 1.50), libboost-iostreams-dev (>= 1.50), libboost-program-options-dev (>= 1.50), libboost-signals-dev (>= 1.50), libboost-system-dev (>= 1.50), libboost-thread-dev (>= 1.50), libcrypto++-dev, libsfml-dev (>= 2.0.0), libenet-dev, libjpeg-dev, libglew-dev, libglu1-mesa-dev | libglu1-dev, libluajit-5.1-dev, libsqlite3-dev, librhea1-dev, libes1-dev
Standards-Version: 3.9.4
Homepage: http://github.com/Nocte-/hexahedra
Package: hexahedra
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Collection of blocky sandbox games
A collection of single- and multiplayer blocky sandbox games.