diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2015-07-26 23:59:06 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2015-07-26 23:59:06 (GMT) |
| commit | 719dad50d9a992271ae3535d45eefe6a34c38838 (patch) | |
| tree | 1a9b24b6d911c23d8f8d8265d9872ff00465c6a7 /src | |
| parent | dbf0f756aa25bc85ee0272174c8fd9ac6bd83289 (diff) | |
| parent | f8bdecb1a519618d742c989a2ba66b5ac1380d43 (diff) | |
| download | mxe-719dad50d9a992271ae3535d45eefe6a34c38838.zip mxe-719dad50d9a992271ae3535d45eefe6a34c38838.tar.gz mxe-719dad50d9a992271ae3535d45eefe6a34c38838.tar.bz2 | |
Merge pull request #727 from bugbrains/tinyxml_shared
tinyxml: enable shared
Diffstat (limited to 'src')
| -rw-r--r-- | src/tinyxml-1-cmakelists.patch | 22 | ||||
| -rw-r--r-- | src/tinyxml-test.cpp | 24 | ||||
| -rw-r--r-- | src/tinyxml.mk | 22 |
3 files changed, 32 insertions, 36 deletions
diff --git a/src/tinyxml-1-cmakelists.patch b/src/tinyxml-1-cmakelists.patch new file mode 100644 index 0000000..b2336b2 --- /dev/null +++ b/src/tinyxml-1-cmakelists.patch @@ -0,0 +1,22 @@ +diff -burN tinyxml.orig/CMakeLists.txt tinyxml/CMakeLists.txt +--- tinyxml.orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ tinyxml/CMakeLists.txt 2015-06-21 19:03:09.878168410 +0200 +@@ -0,0 +1,18 @@ ++cmake_minimum_required(VERSION 2.8) ++ ++file(GLOB SRCS "${CMAKE_SOURCE_DIR}/tiny*.cpp" ) ++ ++include_directories(${CMAKE_SOURCE_DIR}) ++add_definitions(-DTIXML_USE_STL) ++ ++add_library(tinyxml ${SRCS}) ++ ++install(TARGETS tinyxml ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++ ++file(GLOB HEADERS "${CMAKE_SOURCE_DIR}/*.h") ++install(FILES ${HEADERS} ++ DESTINATION include) ++ diff --git a/src/tinyxml-test.cpp b/src/tinyxml-test.cpp deleted file mode 100644 index 519c51b..0000000 --- a/src/tinyxml-test.cpp +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file is part of MXE. - * See index.html for further information. - */ - -#include <iostream> -#include <tinyxml.h> - -int main(int argc, char *argv[]) -{ - if (argc != 2) { - std::cerr << "Usage: tinyxml-test <xml-file>" << std::endl; - return 1; - } - std::string fpn = argv[1]; - - TiXmlDocument doc(fpn); - if (!doc.LoadFile()) { - std::cerr << "failed to load " << fpn << std::endl; - return 1; - } - - return 0; -} diff --git a/src/tinyxml.mk b/src/tinyxml.mk index 515adff..d584b6e 100644 --- a/src/tinyxml.mk +++ b/src/tinyxml.mk @@ -17,18 +17,16 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && $(TARGET)-g++ -c -O3 -Wall -Wno-unknown-pragmas -Wno-format -D TIXML_USE_STL '$(1)'/*.cpp - cd '$(1)' && $(TARGET)-ar cr libtinyxml.a *.o - $(TARGET)-ranlib '$(1)/libtinyxml.a' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)'/*.a '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -m644 '$(1)'/*.h '$(PREFIX)/$(TARGET)/include/' + mkdir '$(1).build' + cd '$(1).build' && cmake \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),FALSE,TRUE) \ + '$(1)' + $(MAKE) -C '$(1).build' install '$(TARGET)-g++' \ - -W -Wall -D TIXML_USE_STL -Werror -ansi -pedantic \ - '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-tinyxml.exe' \ - -ltinyxml -endef + -Wall -DTIXML_USE_STL -ansi -pedantic \ + '$(1)/xmltest.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-tinyxml.exe' \ + -ltinyxml -$(PKG)_BUILD_SHARED = +endef |