cegui: fix libxml2 and minizip; enable fribidi and glfw3

Boost and SDL2 aren't detected and need more work, other packages are
either outdated or missing from MXE.
This commit is contained in:
Tony Theodore 2016-08-04 15:05:44 +10:00
parent 3e4172b8f3
commit 54bcbae7e8
2 changed files with 34 additions and 5 deletions

View File

@ -26,19 +26,25 @@ index 1111111..2222222 100644
get_target_property(_TARGET_EXISTS ${_TARGET_NAME}_Static TYPE)
if (_TARGET_EXISTS)
@@ -167,8 +169,10 @@ macro (cegui_add_dependency _TARGET_NAME _DEP_NAME)
@@ -167,11 +169,13 @@ macro (cegui_add_dependency _TARGET_NAME _DEP_NAME)
###########################################################################
# NON-STATIC VERSION OF TARGET
###########################################################################
- if (${_DEP_NAME}_DEFINITIONS)
- set_property( TARGET ${_TARGET_NAME} APPEND PROPERTY COMPILE_DEFINITIONS ${${_DEP_NAME}_DEFINITIONS} )
- endif()
- if (${_DEP_NAME}_COMPILE_FLAGS)
- set_property( TARGET ${_TARGET_NAME} APPEND PROPERTY COMPILE_FLAGS ${${_DEP_NAME}_COMPILE_FLAGS} )
+ if (CEGUI_BUILD_SHARED_CONFIGURATION)
+ if (${_DEP_NAME}_DEFINITIONS)
+ set_property( TARGET ${_TARGET_NAME} APPEND PROPERTY COMPILE_DEFINITIONS ${${_DEP_NAME}_DEFINITIONS} )
+ endif()
+ if (${_DEP_NAME}_COMPILE_FLAGS)
+ set_property( TARGET ${_TARGET_NAME} APPEND PROPERTY COMPILE_FLAGS ${${_DEP_NAME}_COMPILE_FLAGS} )
+ endif()
endif()
if (${_DEP_NAME}_COMPILE_FLAGS)
set_property( TARGET ${_TARGET_NAME} APPEND PROPERTY COMPILE_FLAGS ${${_DEP_NAME}_COMPILE_FLAGS} )
if (CEGUI_BUILD_SHARED_LIBS_WITH_STATIC_DEPENDENCIES)
@@ -252,10 +256,12 @@ macro (cegui_add_library_impl _LIB_NAME _IS_MODULE _SOURCE_FILES_VAR _HEADER_FIL
###########################################################################
# SHARED LIBRARY SET UP
@ -83,3 +89,23 @@ index 1111111..2222222 100644
if (CEGUI_BUILD_STATIC_CONFIGURATION)
install(TARGETS ${_LIB_NAME}_Static
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Thu, 4 Aug 2016 13:30:13 +1000
Subject: [PATCH] use cegui_target_link_libraries for minizip
diff --git a/cegui/src/CMakeLists.txt b/cegui/src/CMakeLists.txt
index 1111111..2222222 100644
--- a/cegui/src/CMakeLists.txt
+++ b/cegui/src/CMakeLists.txt
@@ -86,7 +86,7 @@ endif ()
if (CEGUI_HAS_MINIZIP_RESOURCE_PROVIDER)
cegui_add_dependency(${CEGUI_TARGET_NAME} MINIZIP PRIVATE TRUE)
if (MINGW)
- target_link_libraries(${CEGUI_TARGET_NAME} shlwapi)
+ cegui_target_link_libraries(${CEGUI_TARGET_NAME} shlwapi)
endif ()
endif ()

View File

@ -8,7 +8,8 @@ $(PKG)_CHECKSUM := 14b3da7f1f89693192cd9afbf2126f4519508245ed156de893828e31ce676
$(PKG)_SUBDIR := $(PKG)-$(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := https://bitbucket.org/$(PKG)/$(PKG)/get/$($(PKG)_VERSION).tar.bz2
$(PKG)_DEPS := gcc expat freeglut freeimage freetype libxml2 pcre xerces devil glm glew
$(PKG)_DEPS := gcc expat freeglut freeimage freetype fribidi glew \
glfw3 glm libxml2 minizip pcre xerces
define $(PKG)_UPDATE
$(WGET) -q -O- 'https://bitbucket.org/cegui/cegui/downloads' | \
@ -27,6 +28,8 @@ endef
# Use pkg-config to set FREEIMAGE_LIB and GLEW_STATIC to prevent "_imp__" errors
# freeimage and xerces don't have shared builds - disable with $(CMAKE_STATIC_BOOL)
# devil appears to be dead, tinyxml is deprecated, lua needs toluapp
# boost and sdl2 aren't detected
define $(PKG)_BUILD
cd '$(BUILD_DIR)' && '$(TARGET)-cmake' \
-DCEGUI_BUILD_SHARED_CONFIGURATION=$(CMAKE_SHARED_BOOL) \
@ -39,7 +42,7 @@ define $(PKG)_BUILD
-DCEGUI_BUILD_LUA_MODULE=OFF \
-DCEGUI_BUILD_PYTHON_MODULES=OFF \
-DCEGUI_BUILD_XMLPARSER_XERCES=$(CMAKE_STATIC_BOOL) \
-DCEGUI_BUILD_XMLPARSER_LIBXML2=OFF \
-DCEGUI_BUILD_XMLPARSER_LIBXML2=ON \
-DCEGUI_BUILD_XMLPARSER_EXPAT=ON \
-DCEGUI_BUILD_XMLPARSER_TINYXML=OFF \
-DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF \