Commit Graph

784 Commits

Author SHA1 Message Date
Lee Thomason 536a4cde37 Merge branch 'master' into int64support 2016-07-17 21:37:39 -07:00
Lee Thomason 098bd1f17a fix project file version 2016-07-17 21:35:10 -07:00
Lee Thomason 53b0727037 Merge pull request #453 from morinim/issue425
Fixes issue #425
2016-07-17 21:33:54 -07:00
Manlio Morini 0f45b2422f Fixes issue #425 2016-07-11 12:14:59 +02:00
Lee Thomason d7e5f47524 Merge pull request #445 from kurylo/master
Add INCLUDE_DIRECTORIES on the targets for supported cmake versions.
2016-06-23 13:50:24 -07:00
Lukasz Kurylo 2818e67f31 Add INCLUDE_DIRECTORIES on the targets for supported cmake versions. 2016-06-22 19:22:57 +02:00
Lee Thomason 2fe47ead77 Merge pull request #443 from TheZoc/patch-1
Standardized static library output name
2016-06-09 16:25:14 -07:00
Felipe "Zoc" Silveira 04639a59a5 Standardized static library output name
Renamed ```tinyxml2.a``` to ```libtinyxml2.a```, to allow proper linking using the ```-l``` flag on gcc.
2016-06-08 19:11:37 -03:00
Lee Thomason 1889c3e679 try to make gcc happier 2016-06-04 20:22:57 -07:00
Lee Thomason 51c1271797 add int64 support 2016-06-04 20:18:49 -07:00
Lee Thomason a572db13cf ps3 support 2016-06-04 19:16:24 -07:00
Lee Thomason 8553625730 one successful return type. simplify build on vs2015 2016-06-04 19:10:53 -07:00
Lee Thomason df4ffc00d6 fix warning up from vs2015 2016-06-04 11:32:46 -07:00
Lee Thomason 41599e2583 Merge branch 'master' of git://github.com/TheZoc/tinyxml2 into TheZoc-master 2016-06-04 11:26:08 -07:00
Lee Thomason ceb646812a Merge pull request #438 from TheZoc/osx-makefile
Updated Makefile to allow building TinyXML2 as a static library
2016-06-03 07:56:17 -07:00
Lee Thomason d3f5c318ae remove unused XMLBase 2016-06-03 07:49:35 -07:00
Felipe "Zoc" Silveira 48daa2dd81 Updated Makefile to allow building TinyXML2 as a static library 2016-05-22 00:21:53 -03:00
Lee Thomason 31d6c877bd Merge pull request #435 from ongjunjie/master
minimize file copying on incremental builds
2016-05-14 10:46:04 -07:00
Felipe "Zoc" Silveira 1f16f9ddf5 Updated to VS 2015 2016-05-12 06:31:28 -03:00
Jun Jie 47f9931130 minimize file copying on incremental builds 2016-04-22 13:37:44 +08:00
Lee Thomason bb4d246f7b update to VS 2013 2016-03-25 20:08:32 -07:00
Lee Thomason 97837e77f4 Merge pull request #428 from wvvelzen/WarningsFix
Fix 2 "Condition is always true" compiler warnings.
2016-03-25 07:41:51 -07:00
Lee Thomason 3d60e25c4a Merge pull request #427 from wvvelzen/bcb6fix
Fix for Borland C++ Builder 6
2016-03-25 07:41:05 -07:00
Wilfred van Velzen 0aeac18ad3 Fix 2 "Condition is always true" compiler warnings. 2016-03-25 14:14:03 +01:00
Wilfred van Velzen 67abee5610 Fix for Borland C++ Builder 6 2016-03-25 14:01:15 +01:00
Lee Thomason fe5dbdb817 Merge pull request #414 from ReadmeCritic/master
Correct the capitalization of Xcode in README
2016-03-24 07:49:15 -07:00
Lee Thomason d175e9de0b Merge pull request #413 from Darksun2010/master
space misses in the comment of CMakeLists.txt
2016-02-17 11:39:22 -08:00
ReadmeCritic ff714133bc Correct the capitalization of Xcode in README 2016-02-17 09:24:03 -08:00
Darksun 6bf8a07587 space misses in the comment of CMakeLists.txt 2016-02-16 16:10:57 +08:00
Lee Thomason c8dad95d44 Merge pull request #410 from Dmitry-Me/assertForFTellReturn
Assert to ensure ftell() behaves as expected by later code
2016-02-09 08:39:14 -08:00
Dmitry-Me 96b110d25e Assert to ensure ftell() behaves as expected by later code 2016-02-09 15:12:40 +03:00
Lee Thomason 9ff6654174 Merge pull request #407 from JarleStrand/fix-deletechild
Error fix DeleteChild
2016-01-04 07:40:22 -08:00
Jarle Strand 81abfd6d4c Error fix DeleteChild
Added call to Unlink in XMLNode::DeleteChild() so that references to
node are removed before memory is unallocated. This will ensure the
child is removed from parent and that no pointers are referring to the
unallocated memory. (Code is now aligned with the code in
XMLNode::DeleteChildren() )
2015-12-27 17:30:04 +01:00
Lee Thomason 9c8582c7c3 Merge pull request #401 from Dmitry-Me/assertForNonNullString
Assertion in StrPair::SetStr()
2015-12-09 11:36:59 -08:00
Dmitry-Me 0515fa9d27 Assertion in StrPair::SetStr() 2015-12-09 11:54:06 +03:00
Lee Thomason f47b20f114 fix readme syntax 2015-10-19 22:55:32 -07:00
Lee Thomason dffea5747b remove mystery comment 2015-10-19 22:51:49 -07:00
Lee Thomason fe5b7a5cac Merge pull request #393 from Dmitry-Me/fixSetTextDescription
Fix SetText() description spelling
2015-10-19 17:13:45 -07:00
Dmitry-Me 9e9c85b3ae Fix SetText() description spelling 2015-10-19 18:04:46 +03:00
Lee Thomason 7bc9201322 remove static-assert accidentally checked in. 2015-10-09 14:45:08 -07:00
Lee Thomason 598a88d9fd used stdlib strncmp function 2015-10-09 14:42:12 -07:00
Lee Thomason e4c0738318 Merge pull request #383 from Chocobo1/travis
CI improvements
2015-10-09 11:28:55 -07:00
Chocobo1 f2c6b118da readme.md: add CI build status badges 2015-10-02 22:09:12 +08:00
Chocobo1 a58de11b42 Add appveyor.yml 2015-10-02 18:08:48 +08:00
Chocobo1 87a8e71c20 TravisCI: support osx build 2015-10-02 17:53:31 +08:00
Lee Thomason e4f8ba89d0 Merge pull request #381 from ya1gaurav/patch-1
Travis also support clang.
2015-09-29 19:50:14 -07:00
Lee Thomason a589da416c Merge pull request #380 from Dmitry-Me/getRidOfWtypeLimits
Get rid of -Wtype-limits warning
2015-09-29 19:49:46 -07:00
Gaurav 60af433d31 Travis also support clang.
Add clang compiler to travis build support.
2015-09-28 13:32:30 +05:30
Dmitry-Me 901fed5f19 Get rid of -Wtype-limits warning 2015-09-25 10:29:51 +03:00
Lee Thomason 2aee5e1b37 Merge pull request #379 from renu555/renu555-patch-5
Build with travis CI on every pull request or commit
2015-09-24 10:31:39 -07:00