pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Add OpenHexagon-2.0-preview from Romeo Vittorio



Module Name:	pkgsrc-wip
Committed By:	Iain Hibbert <plunky%netbsd.org@localhost>
Pushed By:	plunky
Date:		Thu Apr 30 09:09:57 2020 +0100
Changeset:	192e0d961a32f362eb3e648ee2ed9da6ae7feae9

Modified Files:
	openhexagon/DESCR
	openhexagon/Makefile
	openhexagon/PLIST
	openhexagon/distinfo
Added Files:
	openhexagon/TODO
	openhexagon/files/openhexagon.sh
	openhexagon/patches/patch-CMakeLists.txt

Log Message:
Add OpenHexagon-2.0-preview from Romeo Vittorio

             "You are a triangle."

Fast paced, challenging, free to play, open source game.

You control a little triangle, which can be rotated clockwise or
counterclockwise. Your goal is to suvive as long as possible by
dodging polygons that move towards the center. Things get more
difficult as time passes!

Features a lot of variety and full customization: users can
create/modify/share levels, patterns, music, sounds, scripts,
and more.

Play in Official Mode and submit your highscores to the
server. Be the first in the leaderboards!

Clone of the game "Super Hexagon" by Terry Cavanagh.
Please check it out and consider buying it if you like Open Hexagon!

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=192e0d961a32f362eb3e648ee2ed9da6ae7feae9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 openhexagon/DESCR                        |  21 +++--
 openhexagon/Makefile                     |  68 +++++++++-----
 openhexagon/PLIST                        | 150 +++++++++++++++++++++++++++++++
 openhexagon/TODO                         |  31 +++++++
 openhexagon/distinfo                     |   9 +-
 openhexagon/files/openhexagon.sh         |  34 +++++++
 openhexagon/patches/patch-CMakeLists.txt |  35 ++++++++
 7 files changed, 313 insertions(+), 35 deletions(-)

diffs:
diff --git a/openhexagon/DESCR b/openhexagon/DESCR
index 0ea20d68b4..0f8387d5c7 100644
--- a/openhexagon/DESCR
+++ b/openhexagon/DESCR
@@ -1,13 +1,18 @@
-"You are a triangle."
+             "You are a triangle."
+
 Fast paced, challenging, free to play, open source game.
 
 You control a little triangle, which can be rotated clockwise or
-counterclockwise. Your goal is to suvive as long as possible by dodging
-polygons that move towards the center. Things get more difficult as time
-passes!
+counterclockwise. Your goal is to suvive as long as possible by
+dodging polygons that move towards the center. Things get more
+difficult as time passes!
+
+Features a lot of variety and full customization: users can
+create/modify/share levels, patterns, music, sounds, scripts,
+and more.
 
-Features a lot of variety and full customization: users can create/modify/share
-levels, patterns, music, sounds, scripts, and more.
+Play in Official Mode and submit your highscores to the
+server. Be the first in the leaderboards!
 
-Play in Official Mode and submit your highscores to the server. Be the first in
-the leaderboards!
+Clone of the game "Super Hexagon" by Terry Cavanagh.
+Please check it out and consider buying it if you like Open Hexagon!
diff --git a/openhexagon/Makefile b/openhexagon/Makefile
index c4b277a5b4..4511425894 100644
--- a/openhexagon/Makefile
+++ b/openhexagon/Makefile
@@ -1,37 +1,59 @@
 # $NetBSD$
+#
 
-DISTNAME=	SSVOpenHexagon
-PKGNAME=	openhexagon-${GITHUB_TAG}
+DISTNAME=	openhexagon-2.0
 CATEGORIES=	games
-
+MASTER_SITES=	${MASTER_SITE_GITHUB:=SuperV1234/}
 GITHUB_PROJECT=	SSVOpenHexagon
 GITHUB_TAG=	2.0-preview
-MASTER_SITES=	${MASTER_SITE_GITHUB:=SuperV1234/}
-
-DIST_SUBDIR=	${DISTNAME}
 
-MAINTAINER=	tm%NetBSD.org@localhost
-HOMEPAGE=	https://github.com/SuperV1234/SSVOpenHexagon
-COMMENT=	C++14 FOSS clone of Super Hexagon
-LICENSE=	afl
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://vittorioromeo.info/projects.html
+COMMENT=	Open-source clone of the game "Super Hexagon by Terry Cavanagh"
+LICENSE=	afl-3.0
 
-DEPENDS+=	mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts
-
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	cmake
+USE_LANGUAGES=	c c++14
 USE_CMAKE=	yes
 
+SUBST_CLASSES+=		wrap
+SUBST_STAGE.wrap=	pre-configure
+SUBST_MESSAGE.wrap=	Adjusting wrapper
+SUBST_FILES.wrap=	${PKGBASE}
+SUBST_VARS.wrap=	PREFIX PKGBASE GITHUB_PROJECT
+
+MODULES+=	${SSVJSONCPP_MODULE}
+MODULES+=	${SSVUTILS_MODULE}
+MODULES+=	${SSVSTART_MODULE}
+MODULES+=	${SSVENTITYSYSTEM_MODULE}
+MODULES+=	${SSVLUAWRAPPER_MODULE}
+MODULES+=	${SSVMENUSYSTEM_MODULE}
+MODULES+=	${SSVUTILSJSON_MODULE}
+
+CMAKE_ARGS+=	-DLUA_LIBRARY=${PREFIX}/lib/liblua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.so
 CMAKE_ARGS+=	-DLUA_INCLUDE_DIR=${PREFIX}/${LUA_INCDIR}
+CMAKE_ARGS+=	-DMODULES=${MODULES:ts;:Q}
+CMAKE_ARGS+=	-DPKGBASE=${PKGBASE}
+
+INSTALLATION_DIRS+=	games lib/${PKGBASE}
+
+post-extract:
+	${CP} ${FILESDIR}/${PKGBASE}.sh ${WRKSRC}/${PKGBASE}
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/${PKGBASE} ${DESTDIR}${PREFIX}/games
 
-# Workaround required because a full recursive clone fails with git-package.mk
-# and all dependencies are only handled via git submodules.
-pre-configure:
-	cd ${WRKSRC} && \
-		git config --file .gitmodules --get-regexp url |\
-			sed 's/submodule.\(.*\).url/\1/g' |\
-			awk '{ system("GIT_SSL_NO_VERIFY=true git clone --recursive "$$2" "$$1) }'
+# Dependencies
+#
+# perhaps also some assets, see wget-assets.sh
+# seems to be a couple of packs with large music files are they important?
 
-.include "../../devel/sparsehash/buildlink3.mk"
 .include "../../wip/sfml+/buildlink3.mk"
-.include "../../lang/lua51/buildlink3.mk"
+.include "../../wip/SSVJsonCpp/buildlink3.mk"
+.include "../../wip/SSVUtils/buildlink3.mk"
+.include "../../wip/SSVStart/buildlink3.mk"
+.include "../../wip/SSVEntitySystem/buildlink3.mk"
+.include "../../wip/SSVLuaWrapper/buildlink3.mk"
+.include "../../wip/SSVMenuSystem/buildlink3.mk"
+.include "../../wip/SSVUtilsJson/buildlink3.mk"
+.include "../../lang/lua/luaversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/openhexagon/PLIST b/openhexagon/PLIST
index e69de29bb2..c9462c5350 100644
--- a/openhexagon/PLIST
+++ b/openhexagon/PLIST
@@ -0,0 +1,150 @@
+@comment $NetBSD$
+games/openhexagon
+lib/openhexagon/Assets/assets.json
+lib/openhexagon/Assets/beep.ogg
+lib/openhexagon/Assets/bottomBar.png
+lib/openhexagon/Assets/creditsBar1.png
+lib/openhexagon/Assets/creditsBar2.png
+lib/openhexagon/Assets/creditsBar2b.png
+lib/openhexagon/Assets/creditsBar2c.png
+lib/openhexagon/Assets/creditsBar2d.png
+lib/openhexagon/Assets/death.ogg
+lib/openhexagon/Assets/gameOver.ogg
+lib/openhexagon/Assets/go.ogg
+lib/openhexagon/Assets/imagine.ttf
+lib/openhexagon/Assets/levelUp.ogg
+lib/openhexagon/Assets/openHexagon.ogg
+lib/openhexagon/Assets/swap.ogg
+lib/openhexagon/Assets/titleBar.png
+lib/openhexagon/ConfigOverrides/debug.json
+lib/openhexagon/ConfigOverrides/fraps.json
+lib/openhexagon/ConfigOverrides/fullscreen.json
+lib/openhexagon/ConfigOverrides/highfps.json
+lib/openhexagon/ConfigOverrides/no3D.json
+lib/openhexagon/ConfigOverrides/noaudio.json
+lib/openhexagon/ConfigOverrides/nocosmeticscript.json
+lib/openhexagon/ConfigOverrides/windowed.json
+lib/openhexagon/Packs/VeeDefault/Levels/easy.json
+lib/openhexagon/Packs/VeeDefault/Levels/extra.json
+lib/openhexagon/Packs/VeeDefault/Levels/goldenratio.json
+lib/openhexagon/Packs/VeeDefault/Levels/hard.json
+lib/openhexagon/Packs/VeeDefault/Levels/lunatic.json
+lib/openhexagon/Packs/VeeDefault/Levels/normal.json
+lib/openhexagon/Packs/VeeDefault/Levels/pi.json
+lib/openhexagon/Packs/VeeDefault/Levels/tutorial.json
+lib/openhexagon/Packs/VeeDefault/Levels/tutorial2.json
+lib/openhexagon/Packs/VeeDefault/Music/callMeKatla.json
+lib/openhexagon/Packs/VeeDefault/Music/captainCool.json
+lib/openhexagon/Packs/VeeDefault/Music/drFinkelfracken.json
+lib/openhexagon/Packs/VeeDefault/Music/jackRussel.json
+lib/openhexagon/Packs/VeeDefault/Music/mazeOfMayonnaise.json
+lib/openhexagon/Packs/VeeDefault/Music/milkyWays.json
+lib/openhexagon/Packs/VeeDefault/Music/starshipShowdown.json
+lib/openhexagon/Packs/VeeDefault/Music/steampunkWarlord.json
+lib/openhexagon/Packs/VeeDefault/Scripts/alternativepatterns.lua
+lib/openhexagon/Packs/VeeDefault/Scripts/common.lua
+lib/openhexagon/Packs/VeeDefault/Scripts/commonpatterns.lua
+lib/openhexagon/Packs/VeeDefault/Scripts/defaultLevels/easypatterns.lua
+lib/openhexagon/Packs/VeeDefault/Scripts/defaultLevels/hardpatterns.lua
+lib/openhexagon/Packs/VeeDefault/Scripts/defaultLevels/lunaticpatterns.lua
+lib/openhexagon/Packs/VeeDefault/Scripts/defaultLevels/normalpatterns.lua
+lib/openhexagon/Packs/VeeDefault/Scripts/defaultLevels/pipatterns.lua
+lib/openhexagon/Packs/VeeDefault/Scripts/defaultLevels/tutorial.lua
+lib/openhexagon/Packs/VeeDefault/Scripts/defaultLevels/zen.lua
+lib/openhexagon/Packs/VeeDefault/Scripts/patternizerpatterns.lua
+lib/openhexagon/Packs/VeeDefault/Scripts/utils.lua
+lib/openhexagon/Packs/VeeDefault/Styles/danger.json
+lib/openhexagon/Packs/VeeDefault/Styles/dangertest.json
+lib/openhexagon/Packs/VeeDefault/Styles/dark.json
+lib/openhexagon/Packs/VeeDefault/Styles/goldenratio.json
+lib/openhexagon/Packs/VeeDefault/Styles/gray.json
+lib/openhexagon/Packs/VeeDefault/Styles/light.json
+lib/openhexagon/Packs/VeeDefault/Styles/pistyle.json
+lib/openhexagon/Packs/VeeDefault/Styles/toxic.json
+lib/openhexagon/Packs/VeeDefault/Styles/tutorial.json
+lib/openhexagon/Packs/VeeDefault/Styles/tutorial2.json
+lib/openhexagon/Packs/VeeDefault/pack.json
+lib/openhexagon/Packs/VeeEndurance/Levels/commando.json
+lib/openhexagon/Packs/VeeEndurance/Levels/commando.tracked
+lib/openhexagon/Packs/VeeEndurance/Levels/labyrinth.json
+lib/openhexagon/Packs/VeeEndurance/Levels/labyrinth.tracked
+lib/openhexagon/Packs/VeeEndurance/Music/commandoSteve.json
+lib/openhexagon/Packs/VeeEndurance/Scripts/alternativepatterns.lua
+lib/openhexagon/Packs/VeeEndurance/Scripts/common.lua
+lib/openhexagon/Packs/VeeEndurance/Scripts/commonpatterns.lua
+lib/openhexagon/Packs/VeeEndurance/Scripts/defaultLevels/commando.lua
+lib/openhexagon/Packs/VeeEndurance/Scripts/defaultLevels/labyrinth.lua
+lib/openhexagon/Packs/VeeEndurance/Scripts/patternizerpatterns.lua
+lib/openhexagon/Packs/VeeEndurance/Scripts/utils.lua
+lib/openhexagon/Packs/VeeEndurance/Styles/wordless.json
+lib/openhexagon/Packs/VeeEndurance/Styles/wordlessinverse.json
+lib/openhexagon/Packs/VeeEndurance/pack.json
+lib/openhexagon/Packs/VeeEvolution/Levels/disc-o.json
+lib/openhexagon/Packs/VeeEvolution/Levels/disc-o.tracked
+lib/openhexagon/Packs/VeeEvolution/Levels/evotutorial.json
+lib/openhexagon/Packs/VeeEvolution/Levels/g-force.json
+lib/openhexagon/Packs/VeeEvolution/Levels/g-force.tracked
+lib/openhexagon/Packs/VeeEvolution/Levels/massacre.json
+lib/openhexagon/Packs/VeeEvolution/Levels/massacre.tracked
+lib/openhexagon/Packs/VeeEvolution/Levels/reppaws.json
+lib/openhexagon/Packs/VeeEvolution/Levels/reppaws.tracked
+lib/openhexagon/Packs/VeeEvolution/Levels/slither.json
+lib/openhexagon/Packs/VeeEvolution/Levels/slither.tracked
+lib/openhexagon/Packs/VeeEvolution/Music/cpumood.json
+lib/openhexagon/Packs/VeeEvolution/Music/dischipo.json
+lib/openhexagon/Packs/VeeEvolution/Music/gmoomh.json
+lib/openhexagon/Packs/VeeEvolution/Music/massacrev2.json
+lib/openhexagon/Packs/VeeEvolution/Music/minimal.json
+lib/openhexagon/Packs/VeeEvolution/Music/pep.json
+lib/openhexagon/Packs/VeeEvolution/Scripts/alternativepatterns.lua
+lib/openhexagon/Packs/VeeEvolution/Scripts/common.lua
+lib/openhexagon/Packs/VeeEvolution/Scripts/commonpatterns.lua
+lib/openhexagon/Packs/VeeEvolution/Scripts/defaultLevels/disc-o.lua
+lib/openhexagon/Packs/VeeEvolution/Scripts/defaultLevels/evotutorial.lua
+lib/openhexagon/Packs/VeeEvolution/Scripts/defaultLevels/g-force.lua
+lib/openhexagon/Packs/VeeEvolution/Scripts/defaultLevels/massacre.lua
+lib/openhexagon/Packs/VeeEvolution/Scripts/defaultLevels/reppaws.lua
+lib/openhexagon/Packs/VeeEvolution/Scripts/defaultLevels/slither.lua
+lib/openhexagon/Packs/VeeEvolution/Scripts/evolutionpatterns.lua
+lib/openhexagon/Packs/VeeEvolution/Scripts/nextpatterns.lua
+lib/openhexagon/Packs/VeeEvolution/Scripts/patternizerpatterns.lua
+lib/openhexagon/Packs/VeeEvolution/Scripts/utils.lua
+lib/openhexagon/Packs/VeeEvolution/Styles/disc-o.json
+lib/openhexagon/Packs/VeeEvolution/Styles/evotutorial.json
+lib/openhexagon/Packs/VeeEvolution/Styles/g-force.json
+lib/openhexagon/Packs/VeeEvolution/Styles/massacre.json
+lib/openhexagon/Packs/VeeEvolution/Styles/reppaws.json
+lib/openhexagon/Packs/VeeEvolution/Styles/slither.json
+lib/openhexagon/Packs/VeeEvolution/pack.json
+lib/openhexagon/Packs/VeeNext/Levels/acceleradiant.json
+lib/openhexagon/Packs/VeeNext/Levels/incongruence.json
+lib/openhexagon/Packs/VeeNext/Levels/incongruence.tracked
+lib/openhexagon/Packs/VeeNext/Levels/polyhedrug.json
+lib/openhexagon/Packs/VeeNext/Levels/polyhedrug.tracked
+lib/openhexagon/Packs/VeeNext/Music/flirtFlirt.json
+lib/openhexagon/Packs/VeeNext/Music/johnnyDerp.json
+lib/openhexagon/Packs/VeeNext/Music/mrGawne.json
+lib/openhexagon/Packs/VeeNext/Scripts/alternativepatterns.lua
+lib/openhexagon/Packs/VeeNext/Scripts/common.lua
+lib/openhexagon/Packs/VeeNext/Scripts/commonpatterns.lua
+lib/openhexagon/Packs/VeeNext/Scripts/defaultLevels/acceleradiant.lua
+lib/openhexagon/Packs/VeeNext/Scripts/defaultLevels/incongruence.lua
+lib/openhexagon/Packs/VeeNext/Scripts/defaultLevels/polyhedrug.lua
+lib/openhexagon/Packs/VeeNext/Scripts/nextpatterns.lua
+lib/openhexagon/Packs/VeeNext/Scripts/patternizerpatterns.lua
+lib/openhexagon/Packs/VeeNext/Scripts/utils.lua
+lib/openhexagon/Packs/VeeNext/Styles/acceleradiant.json
+lib/openhexagon/Packs/VeeNext/Styles/incongruence.json
+lib/openhexagon/Packs/VeeNext/Styles/polyhedrug.json
+lib/openhexagon/Packs/VeeNext/pack.json
+lib/openhexagon/SSVOpenHexagon
+lib/openhexagon/_DOCUMENTATION/README.html
+lib/openhexagon/_DOCUMENTATION/README_CONFIGOVERRIDES.html
+lib/openhexagon/_DOCUMENTATION/README_EVENTS.html
+lib/openhexagon/_DOCUMENTATION/README_LEVELS.html
+lib/openhexagon/_DOCUMENTATION/README_MUSIC.html
+lib/openhexagon/_DOCUMENTATION/README_ONLINE.html
+lib/openhexagon/_DOCUMENTATION/README_SCRIPTING.html
+lib/openhexagon/_DOCUMENTATION/README_SOUNDS.html
+lib/openhexagon/_DOCUMENTATION/README_STYLES.html
+lib/openhexagon/config.json
diff --git a/openhexagon/TODO b/openhexagon/TODO
new file mode 100644
index 0000000000..7754e8404c
--- /dev/null
+++ b/openhexagon/TODO
@@ -0,0 +1,31 @@
+This seems to be working if slow on my computer
+
+- depends on wip/sfml+ which has a note that joystick input
+  is not available but might not be too much work and I don't
+  know if relevant for this game
+
+- this is the last tagged version of OpenHexagon and is 7
+  years old but there has been some work upstream since
+
+- the dependencies suck there are no version numbers have
+  just used the tag that was used in the submodule. The
+  submodules need to be built before we run cmake here so
+  have packaged them separately
+
+- there are some 'Assets' which a script can fetch using
+  wget, it seems to be some music files for packs don't
+  know if important or if possible to download in pkgsrc
+  framework
+
+- I have written a wrapper script which sets up a
+  $HOME/.openhexagon dir with symlinks to the assets etc
+  it kind of works but could be better, particularly
+  need to look at what happens to config files and/or if
+  it is only the Profiles/ folder which needs to be written
+  in which case that could be ~/.openhexagon
+
+- the game itself bombs out sometimes complaining that it
+  is too slow. is this simply to do with lack of GL ?
+
+- there was a complaint about network connectivity needs to
+  be checked
diff --git a/openhexagon/distinfo b/openhexagon/distinfo
index fe28f00270..428e0ef008 100644
--- a/openhexagon/distinfo
+++ b/openhexagon/distinfo
@@ -1,6 +1,7 @@
 $NetBSD$
 
-SHA1 (SSVOpenHexagon/SSVOpenHexagon.tar.gz) = 6bb86de3a194e816957d8cdd55fc423259c2c000
-RMD160 (SSVOpenHexagon/SSVOpenHexagon.tar.gz) = 7feefde13a795d687dbe09b96062e149851f5d5c
-SHA512 (SSVOpenHexagon/SSVOpenHexagon.tar.gz) = 0836b6b477227ee768ce43f411b065b1b25fff6ba16401d5ebde1443cde3f03e36d9bb1d11043e958a3f4a38e9af2f0b801aecd39b4edb31007c45c9ce074fdb
-Size (SSVOpenHexagon/SSVOpenHexagon.tar.gz) = 317548 bytes
+SHA1 (openhexagon-2.0.tar.gz) = 6bb86de3a194e816957d8cdd55fc423259c2c000
+RMD160 (openhexagon-2.0.tar.gz) = 7feefde13a795d687dbe09b96062e149851f5d5c
+SHA512 (openhexagon-2.0.tar.gz) = 0836b6b477227ee768ce43f411b065b1b25fff6ba16401d5ebde1443cde3f03e36d9bb1d11043e958a3f4a38e9af2f0b801aecd39b4edb31007c45c9ce074fdb
+Size (openhexagon-2.0.tar.gz) = 317548 bytes
+SHA1 (patch-CMakeLists.txt) = 07a5cf6436652fd023741f655c4a7c11fe4c6eb0
diff --git a/openhexagon/files/openhexagon.sh b/openhexagon/files/openhexagon.sh
new file mode 100644
index 0000000000..55d62874b9
--- /dev/null
+++ b/openhexagon/files/openhexagon.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+
+set -e
+
+# set up the home directory
+dir="$HOME/.@PKGBASE@"
+if [ ! -d "$dir" ]; then
+	if [ ! -d "$HOME" ]; then
+		echo "error: no HOME directory"
+		exit 1
+	fi
+	if [ -e "$dir" ]; then
+		echo "error: $dir exists"
+		exit 1
+	fi
+	mkdir "$dir"
+fi
+cd "$dir"
+
+for dir in Assets ConfigOverrides Packs _DOCUMENTATION
+do
+	if [ ! -e "$dir" ]; then
+		ln -hs "@PREFIX@/lib/@PKGBASE@/$dir" .
+	fi
+done
+
+for file in config.json
+do
+	if [ ! -e "$file" ]; then
+		cp "@PREFIX@/lib/@PKGBASE@/$file" .
+	fi
+done
+
+exec @PREFIX@/lib/@PKGBASE@/@GITHUB_PROJECT@
diff --git a/openhexagon/patches/patch-CMakeLists.txt b/openhexagon/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..dfe61faad8
--- /dev/null
+++ b/openhexagon/patches/patch-CMakeLists.txt
@@ -0,0 +1,35 @@
+$NetBSD$
+
+find dependencies and install in relation to pkgsrc
+
+--- CMakeLists.txt.orig	2013-07-13 23:37:47.000000000 +0000
++++ CMakeLists.txt
+@@ -6,14 +6,7 @@ project(SSVOpenHexagon)
+ set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -W -pedantic" CACHE STRING "" FORCE)
+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3" CACHE STRING "" FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG "-fno-omit-frame-pointer -g3 -gdwarf-2 -O0" CACHE STRING "" FORCE)
+-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/;${CMAKE_MODULE_PATH}")
+-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/extlibs/SSVJsonCpp/cmake/modules/")
+-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/extlibs/SSVUtils/cmake/modules/")
+-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/extlibs/SSVUtilsJson/cmake/modules/")
+-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/extlibs/SSVMenuSystem/cmake/modules/")
+-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/extlibs/SSVLuaWrapper/cmake/modules/")
+-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/extlibs/SSVEntitySystem/cmake/modules/")
+-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/extlibs/SSVStart/cmake/modules/")
++set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/;${MODULES}")
+ 
+ set(SFML_STATIC_LIBRARIES FALSE CACHE BOOL "Look for static SFML libraries.")
+ find_package(SFML 2 COMPONENTS audio graphics window system network)
+@@ -65,10 +58,8 @@ target_link_libraries(${PROJECT_NAME} ${
+ target_link_libraries(${PROJECT_NAME} ${LUA_LIBRARY})
+ 
+ if(UNIX)
+-	install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION /usr/local/games/${PROJECT_NAME}/)
+-	install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_SOURCE_DIR}/_RELEASE/)
+-	install(DIRECTORY _RELEASE/ DESTINATION /usr/local/games/SSVOpenHexagon/)
+-	install(PROGRAMS _RELEASE/${PROJECT_NAME} DESTINATION /usr/local/games/${PROJECT_NAME}/ PERMISSIONS WORLD_EXECUTE WORLD_READ)
++	install(DIRECTORY _RELEASE/ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${PKGBASE}/)
++	install(PROGRAMS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${PKGBASE}/)
+ else(WIN32)
+ 	install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ./_RELEASE/)
+ endif()


Home | Main Index | Thread Index | Old Index