Rémi Verschelde
539664ecd6
SCons: Use list in Append() to ensure proper argument spacing
...
Otherwise we can end up with `scons CXXFLAGS="some-arg"` giving
a `some-arg-std=c++11` argument when `-std=c++11` is Append()'ed.
2018-04-07 16:01:34 +02:00
Rémi Verschelde
3909d80360
SCons: Use Variables for command line option and help output
...
Also add options to configure the compilers for C and C++ (no C code yet
but C libraries may be added in the future, and we wouldn't to mix e.g.
gcc for C and clang++ for C++).
2018-04-07 16:01:34 +02:00
514a5dccc9
Xcode: Fix tests working directory
2018-04-07 10:01:08 -04:00
4e6d690de6
Xcode: Fix a couple more incorrect file paths
2018-04-07 09:52:43 -04:00
4ad84e6cf8
Missed some when fixing #191
2018-04-07 09:38:13 -04:00
b54ab46d7e
XCode: Fix an incorrect path
2018-04-06 21:06:23 -04:00
05c9936b48
fix #191
2018-04-06 21:02:01 -04:00
5e4c92e7ad
Merge pull request #189 from akien-mga/gcc-auto-iterator
...
Fix GCC build issue with ambiguous for loop iterator
2018-04-05 09:03:11 -04:00
f7c035c6b0
Merge pull request #188 from akien-mga/scons-warning
...
SCons: Fix warning on posix build
2018-04-05 09:01:50 -04:00
Rémi Verschelde
141cfab23c
Fix GCC build issue with ambiguous for loop iterator
...
Previous code would raise this error with GCC 5.5.0:
build/obj/scenario/monster.cpp:804:19: error: use of 'abil' before deduction of 'auto'
for(auto& abil : abil) {
^
I'd advise to do some further refactoring to prevent confusion between the public 'abil'
which is a map of two types of abilities, and the various local 'abil's that shadow it
in monster.cpp.
2018-04-05 11:13:58 +02:00
Rémi Verschelde
cb0054d68a
SCons: Fix warning on posix build
...
`build/pkg/SConscript` only exists for darwin or for win32 when
makensis is available, so it should not be added inconditionally.
2018-04-05 10:10:03 +02:00
1d273b312e
Merge pull request #186 from seisatsu/master
...
Fix save filename newline bug on Linux
2018-03-23 20:42:08 -04:00
Michael D. Reiley
5a142a656a
Fix save filename newline bug on Linux
2018-03-23 17:39:13 -07:00
Michael Bonfils
69589afff7
Fix travis for Linux build
...
Several issues was detected with linux build:
- travis_wait raise timeout
- --jobs=2 sometimes fails
- add flag BOOST_NO_CXX11_SCOPED_ENUMS to fix compilation with old boost filesystme
- add missing tool xmllint
2018-03-11 12:07:20 -04:00
d1838991a8
This is an attempt to fix the Travis build errors due to mismatched virtual override signatures
2018-03-03 18:44:27 -05:00
ed402040c9
Fix the fix for Mac
2018-03-03 18:19:18 -05:00
ee0bfa835a
Fix merge errors
2018-03-03 18:05:05 -05:00
9073063423
Merge branch 'merge_linux' of https://github.com/murlock/cboe
2018-03-03 17:52:59 -05:00
a0b61c1065
New VS2013 projectfile fixups
...
* Fix non-relative include paths for resources
* Fix one file path for the tests build
(Currently tests crash for me, but at least they do compile?)
* Remove old VS project junkfiles from gitignore
* Fix missing resource compiler include paths for Release builds
2018-03-03 17:41:29 -05:00
8ad20166e8
Merge pull request #179 from daerogami/moving2013proj
...
Moving vs2013 to 'proj' folder
Closes #178
2018-03-03 16:42:37 -05:00
Mark Clark
05711ec831
Removed copyfiles.bat and replaced functionality with MSBUILD targets;
...
Added 'gitinfo' NuGet package to replace need for bash to create gitrev.hpp;
Added preproccessor statement to prevent 'gitrev.hpp' from being referenced;
Re-ordered preproccessor definitions for easier diffing;
2018-02-25 23:30:13 -05:00
Mark Clark
942b102ed4
Corrected 'AdditionalIncludeDirectories' paths;
...
Corrected 'ForcedIncludeFiles' path;
2018-02-25 23:23:44 -05:00
Mark Clark
f81b6fd927
Fixed paths on all project source files;
2018-02-25 22:55:38 -05:00
Mark Clark
265f959ecf
Moved project;
2018-02-25 22:54:48 -05:00
be7ddb7948
Fixup README
2018-02-25 15:51:12 -05:00
282cc7b850
Fix VS2013 project
2018-02-25 15:48:09 -05:00
57c395379e
Merge pull request #176 from daerogami/proj-vs2017
...
Adding vs2017 project in new proj directory parallel to src
2018-02-25 15:38:55 -05:00
Mark Clark
a4f30e8c5c
Updated readme;
2018-02-25 15:20:06 -05:00
Mark Clark
d501c340d0
Tests project (with initial files and existing files, needs work);
2018-02-25 14:55:17 -05:00
Mark Clark
e70c360e11
Minor fixes to get build working for vs2017 project;
2018-02-25 14:55:13 -05:00
Mark Clark
cec4ca7a20
Added vs2017 project;
2018-02-25 14:55:10 -05:00
Mark Clark
4bba2ba691
Updated .gitignore to ignore new vs2017 solution artifacts;
2018-02-25 14:55:07 -05:00
e77d5194a3
Add a version directive to the shaders
2018-02-19 02:15:28 -05:00
17d87e87a7
Remove obsolete/unmaintained build files
2018-02-19 02:12:36 -05:00
8759aad90a
Move Xcode project to a separate tree parallel to src
2018-02-19 02:11:29 -05:00
827e1b2a6b
Fix crash when loading a saved game containing boats or horses
2018-02-18 17:33:12 -05:00
c21b0b8de7
Fix #155
2018-02-18 16:26:10 -05:00
516d5fff25
Remove references to removed outdoor size limits from the scenario creation dialog
2018-02-18 16:12:25 -05:00
03c19fa7ec
Use the new erase_completed_specials() function for towns too
2018-02-17 18:46:53 -05:00
e9490ac9d1
Rename a function
2018-02-17 18:45:45 -05:00
1d5e0c2e1e
Formatting
2018-02-17 18:14:38 -05:00
Mark Clark
b7d62067cc
Fixed issue where special could attempt accessing index outside range for specials;
2018-02-17 17:15:10 -05:00
Mark Clark
a2dc641f31
Refactored erase_out_specials();
2018-02-17 17:10:34 -05:00
05b6a9689f
Ignore the .vs directory from newer versions of MSVC.
2018-02-12 23:45:29 -05:00
5bc085facd
Ensure mathutil.hpp doesn't break in the presence of min/max macros
2018-02-12 23:36:30 -05:00
Eric Ahnell
709faf2c03
Fix broken links in README.md ( #62 )
...
2 links were affected by hard wrapping, unintentionally splitting them into two (broken) segments. This commit fixes that.
2018-02-11 15:42:38 -05:00
Michael Bonfils
12c3ce26f8
Fix compilation of linux
2018-02-10 17:08:33 +01:00
Michael Bonfils
d940f2c39d
Merge branch 'linux' into merge_linux
2018-02-08 20:36:46 +01:00
cb9f0eda53
Apply patches posted to the forums by Ir the Great
...
http://spiderwebforums.ipbhost.com/topic/22322-exile-remaster/?page=3&tab=comments#comment-300022
2017-12-16 16:52:00 -05:00
f3866861bb
Fix inability to duel-wield
...
(thanks to Ir the Great for this patch)
2017-12-16 16:51:27 -05:00
