diff options
| -rw-r--r-- | src/cegui-build-pkgconfig-files.patch | 13 | ||||
| -rw-r--r-- | src/cegui.mk | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/cegui-build-pkgconfig-files.patch b/src/cegui-build-pkgconfig-files.patch new file mode 100644 index 0000000..55d7562 --- /dev/null +++ b/src/cegui-build-pkgconfig-files.patch @@ -0,0 +1,13 @@ +# 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.mk b/src/cegui.mk index 4f97036..913c747 100644 --- a/src/cegui.mk +++ b/src/cegui.mk @@ -31,6 +31,7 @@ endef 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)' \ |