blob: c7801466f5cae862f64f25ef5639da21fe939870 (
plain)
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
37
38
39
40
41
42
43
44
45
46
|
From: Julian Ospald <hasufell@gentoo.org>
Date: Mon Jan 27 00:46:56 UTC 2014
Subject: fix installation
--- megaglest-source-3.9.1.tar.xz/source/glest_game/CMakeLists.txt
+++ megaglest-source-3.9.1.tar.xz/source/glest_game/CMakeLists.txt
@@ -310,9 +310,9 @@
"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png"
"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.xpm"
"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.bmp"
- "${PROJECT_SOURCE_DIR}/data/glest_game/editor.ico"
+ "${PROJECT_SOURCE_DIR}/editor.ico"
"${PROJECT_SOURCE_DIR}/mk/linux/glest.ico"
- "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
+ "${PROJECT_SOURCE_DIR}/g3dviewer.ico"
DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
ELSE()
From e463986ba1f40210b40eff34c4aac727c7f2e571 Mon Sep 17 00:00:00 2001
From: Michael Palimaka <kensington@gentoo.org>
Date: Wed, 13 May 2015 04:22:45 +1000
Subject: [PATCH] Fix build with >=cmake-3.2.
The FindOpenGL module no longer pulls in X11 libraries.
---
source/shared_lib/CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
index 3da563e..e5a06fc 100644
--- a/source/shared_lib/CMakeLists.txt
+++ b/source/shared_lib/CMakeLists.txt
@@ -95,6 +95,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
ENDIF()
+ IF(UNIX)
+ FIND_PACKAGE(X11 REQUIRED)
+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${X11_LIBRARIES})
+ ENDIF()
IF(WANT_XERCES)
FIND_PACKAGE(XercesC REQUIRED)
--
2.3.6
|
GitWeb
