Thraix/MakeGen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug with libraries

Browse Source
This commit is contained in:
Thraix
2018-06-10 14:56:45 +02:00
parent 5283801871
commit e140cac526
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ConfigFile.cpp
+1 -2
View File
@@ -7,7 +7,6 @@
#define FLAG_VECTOR 1 #define FLAG_VECTOR 1
#define FLAG_STRING 2 #define FLAG_STRING 2
#define FLAG_BOOL 3 #define FLAG_BOOL 3
ConfigFile::ConfigFile() ConfigFile::ConfigFile()
: outputdir("bin"), outputname("out.a"),executable(true) : outputdir("bin"), outputname("out.a"),executable(true)
{ {
@@ -121,7 +120,7 @@ ConfigFile ConfigFile::Gen()
{ {
ConfigFile conf; ConfigFile conf;
InputMultiple("Enter library:", conf.libs,true); InputMultiple("Enter library:", conf.libs,true);
InputMultiple("Enter library directory:", conf.libdirs,true); InputMultiple("Enter library directory:", conf.libdirs,false);
InputMultiple("Enter include directory:", conf.includedirs,true); InputMultiple("Enter include directory:", conf.includedirs,true);
InputMultiple("Enter source directories:", conf.srcdirs,true); InputMultiple("Enter source directories:", conf.srcdirs,true);
InputMultiple("Enter preprocessor definitions:", conf.defines,false); InputMultiple("Enter preprocessor definitions:", conf.defines,false);
src/Makefile.cpp
+8 -2
View File
@@ -71,10 +71,16 @@ void Makefile::Save(const ConfigFile& conf)
outputFile << "-D" << *it << " "; outputFile << "-D" << *it << " ";
} }
outputFile << std::endl; outputFile << std::endl;
outputFile << "LIBS="; outputFile << "LIBDIR=";
for(auto it = conf.libdirs.begin();it!=conf.libdirs.end();++it)
{
outputFile << "-L./" << *it << " ";
}
outputFile << std::endl;
outputFile << "LIBS=$(LIBDIR) ";
for(auto it = conf.libs.begin();it!=conf.libs.end();++it) for(auto it = conf.libs.begin();it!=conf.libs.end();++it)
{ {
outputFile << "-l:" << *it << " "; outputFile << "-l" << *it << " ";
} }
outputFile << std::endl; outputFile << std::endl;
outputFile << "OUTPUT=$(BIN)" << conf.outputname << std::endl; outputFile << "OUTPUT=$(BIN)" << conf.outputname << std::endl;