d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tinyxml2: update 2.2.0 --> 3.0.0

This commit is contained in:
Tony Theodore 2015-09-22 02:30:24 +10:00
parent 434a422b74
commit e53f05a75d
2 changed files with 4 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/tinyxml2-1-static.patch
View File

@ -1,34 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91c61a4..1aeba57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,22 +50,22 @@ set(BUILD_STATIC_LIBS ON CACHE BOOL "Set to ON to build static libraries")
if(BUILD_STATIC_LIBS)
add_library(tinyxml2static STATIC tinyxml2.cpp tinyxml2.h)
set_target_properties(tinyxml2static PROPERTIES OUTPUT_NAME tinyxml2)
-endif(BUILD_STATIC_LIBS)
+else(BUILD_STATIC_LIBS)
add_library(tinyxml2 SHARED tinyxml2.cpp tinyxml2.h)
set_target_properties(tinyxml2 PROPERTIES
COMPILE_DEFINITIONS "TINYXML2_EXPORT"
VERSION "${GENERIC_LIB_VERSION}"
SOVERSION "${GENERIC_LIB_SOVERSION}")
+endif(BUILD_STATIC_LIBS)
-add_executable(test xmltest.cpp)
-add_dependencies(test tinyxml2)
-add_dependencies(test ${TARGET_DATA_COPY})
-target_link_libraries(test tinyxml2)
+#add_executable(test xmltest.cpp)
+#add_dependencies(test tinyxml2)
+#add_dependencies(test ${TARGET_DATA_COPY})
+#target_link_libraries(test tinyxml2)
if(BUILD_STATIC_LIBS)
- install(TARGETS tinyxml2 tinyxml2static
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ install(TARGETS tinyxml2static
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
else(BUILD_STATIC_LIBS)

9
src/tinyxml2.mk
View File

@ -3,8 +3,8 @@
PKG := tinyxml2
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.2.0
$(PKG)_CHECKSUM := 7869aa08241ce16f93ba3732c1cde155b1f2b6a0
$(PKG)_VERSION := 3.0.0
$(PKG)_CHECKSUM := 07acaae49f7dd3dab790da4fe72d0c7ef0d116d1
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/leethomason/tinyxml2/archive/$($(PKG)_VERSION).tar.gz
@ -20,8 +20,7 @@ define $(PKG)_BUILD
mkdir '$(1)/build'
cd '$(1)/build' && cmake .. \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
$(if $(BUILD_STATIC), \
-DBUILD_STATIC_LIBS=ON)
-DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),OFF,ON)
$(MAKE) -C '$(1)/build' -j '$(JOBS)' install
endef
endef