ALL: sync with scummvm

This commit is contained in:
Pawel Kolodziejski committed 2012-04-17 15:07:08 +02:00
1 parent 211a9a2eba
commit e856559777
11 files changed
+161 -38

No files matched your search

+5 -6
View File
@@ -575,8 +575,9 @@ int main(int argc, char *argv[]) {
globalWarnings.push_back("-Wwrite-strings");
// The following are not warnings at all... We should consider adding them to
// a different list of parameters.
//ResidualVM: disabled:
// globalWarnings.push_back("-fno-rtti");
#if !NEEDS_RTTI
globalWarnings.push_back("-fno-rtti");
#endif
globalWarnings.push_back("-fno-exceptions");
globalWarnings.push_back("-fcheck-new");
@@ -1214,11 +1215,9 @@ void ProjectProvider::createProject(const BuildSetup &setup) {
createModuleList(setup.srcDir + "/gui", setup.defines, in, ex);
createModuleList(setup.srcDir + "/audio", setup.defines, in, ex);
createModuleList(setup.srcDir + "/audio/softsynth/mt32", setup.defines, in, ex);
//ResidualVM specific
createModuleList(setup.srcDir + "/math", setup.defines, in, ex);
#if HAS_VIDEO_FOLDER
createModuleList(setup.srcDir + "/video", setup.defines, in, ex);
#endif
//ResidualVM specific:
createModuleList(setup.srcDir + "/math", setup.defines, in, ex);
// Resource files
in.push_back(setup.srcDir + "/icons/" + setup.projectName + ".ico");