1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
Description: Tweak install paths for better integration with Debian standards
Author: Antoine Le Gonidec <vv221@debian.org>
Forwarded: not-needed
--- a/cmake/ncine_installation.cmake
+++ b/cmake/ncine_installation.cmake
@@ -8,8 +8,8 @@
set(PACKAGE_DIRECTORY ${NCINE_LINUX_PACKAGE})
endif()
set(README_INSTALL_DESTINATION "share/doc/${PACKAGE_DIRECTORY}")
- set(DATA_INSTALL_DESTINATION "share/${PACKAGE_DIRECTORY}/Content")
- set(SHADERS_INSTALL_DESTINATION "share/${PACKAGE_DIRECTORY}/Content/Shaders")
+ set(DATA_INSTALL_DESTINATION "share/games/${PACKAGE_DIRECTORY}/Content")
+ set(SHADERS_INSTALL_DESTINATION "share/games/${PACKAGE_DIRECTORY}/Content/Shaders")
endif()
#get_target_property(CPACK_EXECUTABLE_NAME ${NCINE_APP} OUTPUT_NAME)
--- a/Sources/Jazz2/ContentResolver.cpp
+++ b/Sources/Jazz2/ContentResolver.cpp
@@ -201,7 +201,7 @@ namespace Jazz2
# elif defined(NCINE_OVERRIDE_CONTENT_PATH)
_contentPath = NCINE_OVERRIDE_CONTENT_PATH;
# else
- _contentPath = NCINE_INSTALL_PREFIX "/share/" NCINE_LINUX_PACKAGE "/Content/";
+ _contentPath = NCINE_INSTALL_PREFIX "/share/games/" NCINE_LINUX_PACKAGE "/Content/";
# endif
# if defined(NCINE_PACKAGED_CONTENT_PATH)
// If Content is packaged with binaries, always use standard XDG paths for everything else
@@ -233,7 +233,7 @@ namespace Jazz2
_sourcePath = fs::CombinePath(fs::GetDirectoryName(_cachePath), "Source/"_s);
if (!fs::FindPathCaseInsensitive(fs::CombinePath(_sourcePath, "Anims.j2a"_s)) &&
!fs::FindPathCaseInsensitive(fs::CombinePath(_sourcePath, "AnimsSw.j2a"_s))) {
- auto systemWideSource = NCINE_INSTALL_PREFIX "/share/" NCINE_LINUX_PACKAGE "/Source/";
+ auto systemWideSource = NCINE_INSTALL_PREFIX "/share/games/" NCINE_LINUX_PACKAGE "/Source/";
if (fs::FindPathCaseInsensitive(fs::CombinePath(systemWideSource, "Anims.j2a"_s)) ||
fs::FindPathCaseInsensitive(fs::CombinePath(systemWideSource, "AnimsSw.j2a"_s))) {
_sourcePath = systemWideSource;
|
