Branch: refs/heads/master
Home: https://github.com/Warzone2100/warzone2100
Commit: d13bc0de7dd0588351af24dc45d55110d0eed6e8
https://github.com/Warzone2100/warzone2100/commit/d13bc0de7dd0588351af24dc45d55110d0eed6e8
Author: vexed <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M .gitignore
M autogen.sh
M configure.ac
M lib/framework/Makefile.am
M lib/framework/framework.vcxproj
M lib/framework/framework.vcxproj.filters
A lib/framework/resource_lexer.cpp
A lib/framework/resource_parser.cpp
A lib/framework/resource_parser.h
A lib/framework/strres_lexer.cpp
A lib/framework/strres_parser.cpp
A lib/framework/strres_parser.h
M lib/gamelib/Makefile.am
A lib/gamelib/audp_lexer.cpp
A lib/gamelib/audp_parser.cpp
A lib/gamelib/audp_parser.h
M lib/gamelib/gamelib.vcxproj
M lib/gamelib/gamelib.vcxproj.filters
M lib/script/Makefile.am
A lib/script/chat_lexer.cpp
A lib/script/chat_parser.cpp
A lib/script/chat_parser.h
M lib/script/script.vcxproj
M lib/script/script.vcxproj.filters
A lib/script/script_lexer.cpp
A lib/script/script_parser.cpp
A lib/script/script_parser.h
M src/Makefile.am
M src/Warzone2100.vcxproj
M src/Warzone2100.vcxproj.filters
A src/level_lexer.cpp
A src/scriptvals_lexer.cpp
A src/scriptvals_parser.cpp
A src/scriptvals_parser.h
R win32/MSVCdelparser.bat
Log Message:
-----------
Simplify build process by getting rid of bison/flex dependencies.
Fixes both MSVC and autotools (automake 1.12+).
Revert "Abort autogen.sh when automake 1.12+ is found."
This reverts commit 978ed8f1f90544162c327f334bd590cd7b944ce1.
Should now work with automake 1.11+
fixes ticket:3887
fixes ticket:3538
closes ticket:3950
(cherry picked from commit 372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f)
Forgot to push these changes for commit 372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f
(cherry picked from commit e397b24d4724d835d6cdc39a92800e64c0551dab)
Out of tree builds ? Who needs them. :P
refs: 372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f
(cherry picked from commit 20317c2a6f2c700042a727c6d719056ab3c90dcb)
Commit: 4f16a617d5bd000ce9fbcc0dc3a1cd0149314848
https://github.com/Warzone2100/warzone2100/commit/4f16a617d5bd000ce9fbcc0dc3a1cd0149314848
Author: cybersphinx <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Log Message:
-----------
Merge branch 'bugfixes'
* bugfixes:
Simplify build process by getting rid of bison/flex dependencies.
Conflicts:
src/Makefile.am
src/scriptvals_parser.cpp
Compare:
https://github.com/Warzone2100/warzone2100/compare/b13f2fde0262...4f16a617d5bd
------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
