zinnschlag/openmw — pull request #66 by pvdk (2012-02-28 21:57:49+00:00)
Title: Defeat

Whoops! Wrong branch, retry:

As promised: the fixes to the Qt exit and launcher.cfg. And I sneaked in some other minor changes to the launcher. It seems you added returns after every QApplication::exit() in graphicspage.cpp but forgot to do datafilespage.cpp. I think that's why I never bothered to fix it as I assumed your commit did.

Also, I changed the stylesheet location in the CMake files to put it into resources, but there seem to be problems with the getGlobalDataPath() function. I assumed it would read the resources= value from the configuration files but it does not. It also seems to return a path without /resources appended to it for Windows and Mac, but we'll have to check that with the people responsible for those platforms. Right now the fallback in the build directory might work for at least Windows.

We certainly have to ask corristo where to put the stylesheet in the CMakeLists.txt for Mac as getGlobalDataPath returns /Library/Application Support.

Now the last thing we will need to look into is the libpng problem werdanith is having on Ubuntu. It's the same library version mismatch we've encountered before, which I then fixed by adding libpng as a dependency. I think we can remove it from the CMakeLists.txt, as it does not fix the problem for werdanith and I might have found one that does. BrotherBrick and I are looking into it.