summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2016-07-29 14:54:28 (GMT)
committerTony Theodore <tonyt@logyst.com>2016-07-29 14:54:28 (GMT)
commitdafb826dbbe5962dda98deddb3e31a160dd60aa7 (patch)
tree159afd8bf4652a56388bba85c4c6a7430f20539b /src
parent1d2563ad3d1fbc928d51d5de3bfd03cdd9a10f68 (diff)
downloadmxe-dafb826dbbe5962dda98deddb3e31a160dd60aa7.zip
mxe-dafb826dbbe5962dda98deddb3e31a160dd60aa7.tar.gz
mxe-dafb826dbbe5962dda98deddb3e31a160dd60aa7.tar.bz2
cegui: unify patches
Diffstat (limited to 'src')
-rw-r--r--src/cegui-1-fixes.patch52
-rw-r--r--src/cegui-build-pkgconfig-files.patch13
-rw-r--r--src/cegui-fix-linking-order.patch19
-rw-r--r--src/cegui.mk2
4 files changed, 52 insertions, 34 deletions
diff --git a/src/cegui-1-fixes.patch b/src/cegui-1-fixes.patch
new file mode 100644
index 0000000..61f2c3c
--- /dev/null
+++ b/src/cegui-1-fixes.patch
@@ -0,0 +1,52 @@
+This file is part of MXE.
+See index.html for further information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Quintus <quintus@quintilianus.eu>
+Date: Fri, 29 Jul 2016 23:11:19 +1000
+Subject: [PATCH] Fix linking order.
+
+Fixed upstream since commit bf699651740a1206c9ce214b91426db1e709ddc4,
+which was after version 0.8.7, so remove this patch when upgrading to
+version 0.8.8 or newer.
+See: https://bitbucket.org/cegui/cegui/issues/1131/opengl-renderers-fail-to-crosscompile-due
+
+diff --git a/cegui/src/RendererModules/OpenGL/CMakeLists.txt b/cegui/src/RendererModules/OpenGL/CMakeLists.txt
+index 1111111..2222222 100644
+--- a/cegui/src/RendererModules/OpenGL/CMakeLists.txt
++++ b/cegui/src/RendererModules/OpenGL/CMakeLists.txt
+@@ -52,9 +52,9 @@ if (${CEGUI_USE_EPOXY})
+ cegui_add_dependency(${CEGUI_TARGET_NAME} GLM)
+ cegui_add_dependency(${CEGUI_TARGET_NAME} EPOXY)
+ elseif (${CEGUI_USE_GLEW})
+- cegui_add_dependency(${CEGUI_TARGET_NAME} OPENGL)
+ cegui_add_dependency(${CEGUI_TARGET_NAME} GLM)
+ cegui_add_dependency(${CEGUI_TARGET_NAME} GLEW PUBLIC)
++ cegui_add_dependency(${CEGUI_TARGET_NAME} OPENGL)
+ endif ()
+
+ cegui_target_link_libraries(${CEGUI_TARGET_NAME} ${CEGUI_BASE_LIBNAME})
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Quintus <quintus@quintilianus.eu>
+Date: Fri, 29 Jul 2016 23:12:27 +1000
+Subject: [PATCH] Build .pc files on Windows
+
+CEGUI does not build the .pc files when targetting Windows.
+See upstream ticket: https://bitbucket.org/cegui/cegui/issues/1135
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1111111..2222222 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -599,7 +599,7 @@ configure_file( cegui/include/CEGUI/ModuleConfig.h.in cegui/include/CEGUI/Module
+ configure_file( samples/common/include/CEGUISamplesConfig.h.in samples/common/include/CEGUISamplesConfig.h )
+ configure_file( doc/doxygen/doxyfile.in doc/doxygen/doxyfile )
+
+-if (UNIX AND NOT APPLE)
++if (NOT(APPLE))
+ configure_file( cegui/CEGUI.pc.in cegui/CEGUI-${CEGUI_VERSION_MAJOR}.pc @ONLY )
+ install(FILES ${PROJECT_BINARY_DIR}/cegui/CEGUI-${CEGUI_VERSION_MAJOR}.pc DESTINATION ${CEGUI_PKGCONFIG_INSTALL_DIR})
+
diff --git a/src/cegui-build-pkgconfig-files.patch b/src/cegui-build-pkgconfig-files.patch
deleted file mode 100644
index 55d7562..0000000
--- a/src/cegui-build-pkgconfig-files.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# CEGUI does not build the .pc files when targetting Windows.
-# See upstream ticket: https://bitbucket.org/cegui/cegui/issues/1135
---- old/CMakeLists.txt 2016-04-28 21:12:57.000000000 +0200
-+++ new/CMakeLists.txt 2016-07-29 13:07:15.095432616 +0200
-@@ -599,7 +599,7 @@
- configure_file( samples/common/include/CEGUISamplesConfig.h.in samples/common/include/CEGUISamplesConfig.h )
- configure_file( doc/doxygen/doxyfile.in doc/doxygen/doxyfile )
-
--if (UNIX AND NOT APPLE)
-+if (NOT(APPLE))
- configure_file( cegui/CEGUI.pc.in cegui/CEGUI-${CEGUI_VERSION_MAJOR}.pc @ONLY )
- install(FILES ${PROJECT_BINARY_DIR}/cegui/CEGUI-${CEGUI_VERSION_MAJOR}.pc DESTINATION ${CEGUI_PKGCONFIG_INSTALL_DIR})
-
diff --git a/src/cegui-fix-linking-order.patch b/src/cegui-fix-linking-order.patch
deleted file mode 100644
index 2f43ff1..0000000
--- a/src/cegui-fix-linking-order.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# Fix linking order.
-#
-# Fixed upstream since commit bf699651740a1206c9ce214b91426db1e709ddc4,
-# which was after version 0.8.7, so remove this patch when upgrading to
-# version 0.8.8 or newer.
-# See: https://bitbucket.org/cegui/cegui/issues/1131/opengl-renderers-fail-to-crosscompile-due
---- old/cegui/src/RendererModules/OpenGL/CMakeLists.txt 2016-04-23 20:19:40.000000000 +0200
-+++ new/cegui/src/RendererModules/OpenGL/CMakeLists.txt 2016-07-29 11:58:25.062131930 +0200
-@@ -52,9 +52,9 @@
- cegui_add_dependency(${CEGUI_TARGET_NAME} GLM)
- cegui_add_dependency(${CEGUI_TARGET_NAME} EPOXY)
- elseif (${CEGUI_USE_GLEW})
-- cegui_add_dependency(${CEGUI_TARGET_NAME} OPENGL)
- cegui_add_dependency(${CEGUI_TARGET_NAME} GLM)
- cegui_add_dependency(${CEGUI_TARGET_NAME} GLEW PUBLIC)
-+ cegui_add_dependency(${CEGUI_TARGET_NAME} OPENGL)
- endif ()
-
- cegui_target_link_libraries(${CEGUI_TARGET_NAME} ${CEGUI_BASE_LIBNAME})
diff --git a/src/cegui.mk b/src/cegui.mk
index 913c747..eb4781a 100644
--- a/src/cegui.mk
+++ b/src/cegui.mk
@@ -30,8 +30,6 @@ endef
# -DCMAKE_CXX_FLAGS="$($(PKG)_CXXFLAGS) $(shell $(TARGET)-pkg-config --cflags freetype2 glew freeimage)"
define $(PKG)_BUILD
mkdir '$(1)/build'
- $(PATCH) -d '$(1)' -p1 < '$(TOP_DIR)/src/cegui-fix-linking-order.patch'
- $(PATCH) -d '$(1)' -p1 < '$(TOP_DIR)/src/cegui-build-pkgconfig-files.patch'
cd '$(1)/build' && export CXXFLAGS="$($(PKG)_CXXFLAGS) $(shell $(TARGET)-pkg-config --cflags freetype2 glew freeimage)" \
&& cmake .. \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \