diff --git a/Makefile b/Makefile index 333b8c7..e8e5f20 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# This Makefile was generated using MakeGen v1.0.3 made by Tim Håkansson +# This Makefile was generated using MakeGen v1.0.4 made by Tim Håkansson # and is licensed under MIT. Full source of the project can be found at # https://github.com/Thraix/MakeGen CC=@g++ @@ -23,14 +23,14 @@ install: all $(info Installing MakeGen to /usr/bin/) @cp $(OUTPUT) /usr/bin/makegen $(OBJPATH)/ConfigFile.o : src/ConfigFile.cpp src/Common.h src/ConfigFile.h - $(info ---- $<) + $(info -[25%]- $<) $(CC) $(CFLAGS) -o $@ $< $(OBJPATH)/IncludeDeps.o : src/IncludeDeps.cpp src/IncludeDeps.h - $(info ---- $<) + $(info -[50%]- $<) $(CC) $(CFLAGS) -o $@ $< $(OBJPATH)/Makefile.o : src/Makefile.cpp src/Common.h src/IncludeDeps.h src/Makefile.h src/ConfigFile.h - $(info ---- $<) + $(info -[75%]- $<) $(CC) $(CFLAGS) -o $@ $< $(OBJPATH)/main.o : src/main.cpp src/Common.h src/ConfigFile.h src/IncludeDeps.h src/Makefile.h - $(info ---- $<) + $(info -[100%]- $<) $(CC) $(CFLAGS) -o $@ $< diff --git a/src/Common.h b/src/Common.h index a4207f3..f2244b1 100644 --- a/src/Common.h +++ b/src/Common.h @@ -7,10 +7,10 @@ #define STRINGIFY(x) #x #define STR(x) STRINGIFY(x) -#define VERSION_MAJOR 1 -#define VERSION_UPDATE 0 -#define VERSION_MINOR 3 -#define VERSION ("v" STR(VERSION_MAJOR) "." STR(VERSION_UPDATE) "." STR(VERSION_MINOR)) +#define MAKEGEN_VERSION_MAJOR 1 +#define MAKEGEN_VERSION_RELEASE 0 +#define MAKEGEN_VERSION_MINOR 4 +#define MAKEGEN_VERSION ("v" STR(MAKEGEN_VERSION_MAJOR) "." STR(MAKEGEN_VERSION_RELEASE) "." STR(MAKEGEN_VERSION_MINOR)) const static unsigned int FLAG_HELP = BIT(0); const static unsigned int FLAG_GEN= BIT(1); diff --git a/src/ConfigFile.cpp b/src/ConfigFile.cpp index d6cba13..7115264 100644 --- a/src/ConfigFile.cpp +++ b/src/ConfigFile.cpp @@ -119,8 +119,21 @@ void ConfigFile::InputMultiple(const std::string& inputText, std::vector dependencies; + size_t i = 0; for(auto it = cppFiles.begin(); it!=cppFiles.end();++it) { + i++; auto itD = dependencies.find(it->first+it->second); if(itD == dependencies.end()) { @@ -109,7 +117,7 @@ void Makefile::Save(const ConfigFile& conf) size_t slash = it->first.find_last_of("/")+1; std::string oFile = it->first.substr(slash, extensionPos - slash)+".o "; outputFile << "$(OBJPATH)/" << oFile << ": " << *deps << std::endl; - outputFile << "\t$(info ---- $<)" << std::endl; + outputFile << "\t$(info -[" << (int)(i / (float)cppFiles.size() * 100) << "%]- $<)" << std::endl; outputFile << "\t$(CC) $(CFLAGS) -o $@ $<" << std::endl; //std::cout << *deps << std::endl; } diff --git a/src/main.cpp b/src/main.cpp index 131a598..4b1444a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -61,7 +61,7 @@ int main(int argc, char** argv) } if(flags & FLAG_VERSION) { - LOG_INFO("MakeGen ",VERSION); + LOG_INFO("MakeGen ",MAKEGEN_VERSION); return 0; } if(flags & FLAG_GEN)