60cf860450
Merge branch 'develop' of dfhack/dfhack into develop
2016-07-29 19:15:53 -04:00
6e1777e1e3
Remove _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
...
Fixed by #959
2016-07-29 19:13:19 -04:00
158f18106f
Merge remote-tracking branch 'NCommander/vs2015' into develop
2016-07-29 15:30:32 -04:00
42c620bb9c
Download non-broken libstdc++ on OS X
2016-07-27 21:43:38 -04:00
828fee532a
Switch to downloading zlib.lib and SDLreal.dll on Windows
2016-07-27 21:08:24 -04:00
8916aba3bf
win64 fixes (partial)
...
cherry-picked from 2f734ae2317060edb83021f17cffc966c435ad7b
2016-07-27 19:46:49 -04:00
fe18f176f7
More 64-bit fixes
...
Cherry-picked from 7eb3ba6
- Lua update already done in e2c63504dd411e
2016-07-26 23:47:53 -04:00
a684e1dd0f
Merge remote-tracking branch 'lethosor/64-bit' into develop
2016-07-26 22:54:36 -04:00
e10397370b
Merge branch 'develop' of github.com:DFHack/dfhack into vs2015
2016-07-11 18:59:22 -05:00
98893793bd
Turn off prerelease flag
2016-07-06 21:27:54 -04:00
4f96bdd0eb
Merge pull request #950 from TC01/linux-system-tinyxml
...
Support linking against an external tinyxml if EXTERNAL_TINYXML is set
2016-07-06 20:37:28 -04:00
2de2e6a983
Update CMakeLists and submodules
2016-07-06 20:30:28 -04:00
2455e36510
Initial 64-bit support
2016-07-03 23:32:43 -04:00
cfaba3ec71
Update various references to scripts/ and mention old git issues in Compile.rst
2016-06-29 19:38:15 -04:00
ae55d2d526
Support linking against an external tinyxml if EXTERNAL_TINYXML is set
...
As best as I can tell, the copy of tinyxml dfhack uses is unmodified
from whenever it was first bundled. This commit adds an option to CMake,
EXTERNAL_TINYXML, that if set to ON, will attempt to link against a system
tinyxml instead of using the dfhack-bundled one. It defaults to OFF,
so there is no change in default behavior.
The DFHACK_TINYXML variable is then set to either "tinyxml" or "dfhack-tinyxml"
so the library (and any plugins that need updating) can link against one
or the other.
The FindTinyXML.cmake script was taken from https://github.com/ros/cmake_modules
(licensed under the 3-clause BSD license).
Add license text to new CMake file.
2016-06-29 17:53:16 -04:00
d49032ef73
Supress a lot of compiler noise in hopes of finding real errors. Right now, a plugin free DFHack can be built with VS2015
2016-06-28 08:34:11 -05:00
e94804ca9f
Convince the build system to generate VS2015 project files
...
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-28 06:53:23 -05:00
27a84a8246
Move scripts to library/scripts
...
git can't cope with replacing scripts/3rdparty/* submodules with a single
scripts submodule.
2016-06-15 18:45:08 -04:00
450fcdba31
Bump version to alpha1
2016-06-14 14:07:01 -04:00
c1ba435058
Update version and xml
2016-05-27 17:41:23 -04:00
8fd25f7320
Set prerelease flag again
2016-05-14 16:07:35 -04:00
97f7cd6081
Bump version and update xml
2016-05-12 16:03:33 -04:00
b53f829737
Update to 0.43.01-alpha0 and update xml
2016-05-10 17:48:50 -04:00
24fd47c030
Bump to r1 in CMakeLists.txt
2016-04-23 22:02:39 -04:00
3ab963499a
Bump to beta1
2016-04-12 21:30:25 -04:00
6fd904fd9e
Bump version, tweak whitespace.
2016-03-10 09:16:03 -05:00
b8ca4b5acc
Bump version to alpha1
2016-03-04 20:38:25 -05:00
5334bd8a6a
Bump version to 0.42.06-alpha0 and update xml
2016-02-28 11:18:27 -05:00
fbe076c5ef
Bump version to 0.42.05-alpha1
2016-02-01 10:32:45 -05:00
61d4c9da9c
Enable ycmd for project
2016-01-26 20:37:27 -05:00
c78a1391e1
Update version to 0.42.05
2016-01-18 10:55:21 -05:00
63e5b5bc0f
Fix ZLIB_ROOT on Windows
2016-01-17 23:04:08 -05:00
b62a8673bc
Bump version to 0.42.04-alpha2
2016-01-09 10:51:55 -05:00
8cec8af3b1
CMake: Support cross-compiling
...
This relies on a working cross-compiler, of course, as well as a separate build
directory for cross-compiled builds, with DFHACK_NATIVE_BUILD_DIR pointing
to an already-successful native build directory (this is needed for protoc).
2016-01-08 21:08:26 -05:00
45ba3c0c68
Try specifying ZLIB_ROOT
2016-01-01 20:01:24 -05:00
26f66ce8e2
Bump version to 0.42.04
2015-12-30 11:27:19 -05:00
a75a8cb496
Update version in CMakeLists.txt
2015-12-22 19:35:40 -05:00
83603fcf45
Add prerelease build flag and warning script
2015-12-11 20:27:46 -05:00
e720c498c9
Bump to 0.42.02
2015-12-05 17:57:52 -05:00
f9af5a71d6
Bump to 0.42.01-r0
2015-12-01 17:36:44 -05:00
d84f5f1e52
Re-enable GCC 5 compilation for OSX and Linux, passing -D_GLIBCXX_USE_CXX11_ABI=0 to disable new C++11 name mangling and remain compatible with DF.
2015-11-29 14:26:11 +00:00
33302251c3
Update version to r5
2015-11-27 16:45:39 -05:00
036c30fa68
Set BUILD_DOCS to OFF by default
...
See #738
2015-11-26 17:09:53 -05:00
9c62ff1d7f
Blacklist GCC 5 on Linux again
...
GCC 5 mangles some symbols, such as "plugin_globals" ->
"plugin_globals[abi:c++11]" (or "_Z14plugin_globalsB5cxx11"), even
when declared with 'extern "C"'. This breaks plugins, in particular.
2015-11-10 18:51:29 -05:00
07839c511a
Update CMakeLists.txt
...
* Require Git
* Only complain about Sphinx if BUILD_DOCS is enabled
* Just issue a warning for GCC >= 5.x on Linux
2015-11-10 17:00:49 -05:00
7b483a4461
Update version to r4
...
Ref #737
2015-11-07 20:28:37 -05:00
1e42f97e76
Add GCC version to OS X package names and remove trailing newlines
2015-11-07 20:27:48 -05:00
178811af43
Add GCC version to package filename on Linux
2015-11-07 18:07:48 -05:00
91d5b74c3b
sphinx: Depend on CMakeLists.txt
2015-11-07 18:07:12 -05:00
e176c3ea05
Merge remote-tracking branch 'PeridexisErrant/docs-again' into develop
2015-11-07 15:50:11 -05:00
lethosor
Vitaly Pronkin
Michael Casadevall
Lethosor
Ben Rosser
expwnent
James Gilles
TheBloke