followup configuration changes after previous refactoring to static libs
Merge remote-tracking branch 'upstream/master'
Fix  compiler errors under Ubuntu64/Codeblocks
make buildable accross platforms
Merge pull request #56 from helgp/master

To make  buildable across platforms