From e140cac526c6c47f793d0045095776372c3588a2 Mon Sep 17 00:00:00 2001 From: Thraix Date: Sun, 10 Jun 2018 14:56:45 +0200 Subject: [PATCH] Fix bug with libraries --- src/ConfigFile.cpp | 5 ++--- src/Makefile.cpp | 10 ++++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/ConfigFile.cpp b/src/ConfigFile.cpp index 6b35a59..112092b 100644 --- a/src/ConfigFile.cpp +++ b/src/ConfigFile.cpp @@ -6,8 +6,7 @@ #define FLAG_NONE 0 #define FLAG_VECTOR 1 #define FLAG_STRING 2 -#define FLAG_BOOL 3 - +#define FLAG_BOOL 3 ConfigFile::ConfigFile() : outputdir("bin"), outputname("out.a"),executable(true) { @@ -121,7 +120,7 @@ ConfigFile ConfigFile::Gen() { ConfigFile conf; 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 source directories:", conf.srcdirs,true); InputMultiple("Enter preprocessor definitions:", conf.defines,false); diff --git a/src/Makefile.cpp b/src/Makefile.cpp index e79b852..eecc322 100644 --- a/src/Makefile.cpp +++ b/src/Makefile.cpp @@ -71,10 +71,16 @@ void Makefile::Save(const ConfigFile& conf) outputFile << "-D" << *it << " "; } 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) { - outputFile << "-l:" << *it << " "; + outputFile << "-l" << *it << " "; } outputFile << std::endl; outputFile << "OUTPUT=$(BIN)" << conf.outputname << std::endl;