search

OpenTechEngine / OpenTechBFG

Engine based on (RB) Doom 3 BFG aiming to allow the creation of standalone games
Other
84 stars 11 forks source link

Cegui rebase #31

Closed kortemik closed 9 years ago

kortemik commented 9 years ago

Let's merge this as there shouldn't be any reason not to. Some commits might be nice to squash, so let's comment here which ones

DanielGibson commented 9 years ago

this should be squashed, of course.

"stb image and truetype" to "disabling c++11-narrowing on clang for cegui" can probably be squashed into a "make cegui build" commit

"fixing mingw-w64 build on fedora 20" and "uncoupling system includes when using bundled ones,... "into a "fix mignw-w64 build issues" commit

"adding bundled built freetype-2.5.5" to "new travis instructions for bundled openal and freetype" into "bundle freetype and openal" (or something like that, didn't look into the commits)

the minizip-related stuff as well?

"-fPIC is not needed on mingw and causes unnecessary warnings, disabling" to "-D__USE_MINGW_ANSI_STDIO=1 for mingw" in one "make mingw32.toolchain work" or something like thast

"travis-deployment" stuff into ones

"mingw bundle updated" to "more trying of freetype build fixes for cmake" can probably also be squashed into one "try to make shit work" commit

maybe some things in the remaining commits can be squashed as well, I trust you'll know what to do there ;)