libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-19 16:33:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TOOLS: Allow compilation and linking from inside the Code::Blocks IDE with create_project-created workspaces

Browse Source 
- Fix include directory search order
  - Add custom tool command for asm files
  - Change linker search directory to SCUMMVM_LIBS/lib/mingw (libraries from the precompiled mingw package will need to be renamed to match the names from the MSVC precompiled package and be of the form lib<name>.a)

svn-id: r55345
This commit is contained in:
Julien Templier 2011-01-20 07:29:45 +00:00
parent bd3f9ad1e2
commit dd3894a442
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/create_project/codeblocks.cpp
View File

@ -96,10 +96,10 @@ void CodeBlocksProvider::createProjectFile(const std::string &name, const std::s
writeWarnings(name, project);
writeDefines(setup.defines, project);
project << "\t\t\t\t\t<Add directory=\"..\\..\" />\n"
project << "\t\t\t\t\t<Add directory=\"$(SCUMMVM_LIBS)include\" />\n"
"\t\t\t\t\t<Add directory=\"..\\..\\engines\" />\n"
"\t\t\t\t\t<Add directory=\"..\\..\\common\" />\n"
"\t\t\t\t\t<Add directory=\"$(SCUMMVM_LIBS)\\include\" />\n"
"\t\t\t\t\t<Add directory=\"..\\..\" />\n"
"\t\t\t\t</Compiler>\n";
//////////////////////////////////////////////////////////////////////////
@ -107,7 +107,7 @@ void CodeBlocksProvider::createProjectFile(const std::string &name, const std::s
project << "\t\t\t\t<Linker>\n";
for (StringList::const_iterator i = setup.libraries.begin(); i != setup.libraries.end(); ++i)
project << "\t\t\t\t\t<Add library=\"" << *i << ".a\" />\n";
project << "\t\t\t\t\t<Add library=\"" << *i << "\" />\n";
for (UUIDMap::const_iterator i = _uuidMap.begin(); i != _uuidMap.end(); ++i) {
if (i->first == "scummvm")
@ -116,7 +116,7 @@ void CodeBlocksProvider::createProjectFile(const std::string &name, const std::s
project << "\t\t\t\t\t<Add library=\"scummvm\\engines\\" << i->first << "\\lib" << i->first << ".a\" />\n";
}
project << "\t\t\t\t\t<Add directory=\"$(SCUMMVM_LIBS)\\lib\" />\n"
project << "\t\t\t\t\t<Add directory=\"$(SCUMMVM_LIBS)lib\\mingw\" />\n"
"\t\t\t\t</Linker>\n";
//////////////////////////////////////////////////////////////////////////
@ -208,7 +208,10 @@ void CodeBlocksProvider::writeFileListToProject(const FileNode &dir, std::ofstre
projectFile << "\t\t<Unit filename=\"" << convertPathToWin(filePrefix + node->name) << "\">\n"
"\t\t\t<Option compilerVar=\"WINDRES\" />\n"
"\t\t</Unit>\n";
} else if (ext == "asm") {
projectFile << "\t\t<Unit filename=\"" << convertPathToWin(filePrefix + node->name) << "\">\n"
"\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"$(SCUMMVM_LIBS)bin/nasm.exe -f win32 -g $file -o $object\" />"
"\t\t</Unit>\n";
} else {
projectFile << "\t\t<Unit filename=\"" << convertPathToWin(filePrefix + node->name) << "\" />\n";
}