Release v1.3.0

This commit is contained in:
Thraix
2020-03-07 22:06:57 +01:00
parent 302081d66b
commit febfda55cc
3 changed files with 9 additions and 5 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ BIN=bin/
OBJPATH=$(BIN)intermediates OBJPATH=$(BIN)intermediates
INCLUDES= INCLUDES=
OBJECTS=$(OBJPATH)/ConfigCLI.o $(OBJPATH)/ConfigFile.o $(OBJPATH)/HFileGen.o $(OBJPATH)/IncludeDeps.o $(OBJPATH)/Makefile.o $(OBJPATH)/Utils.o $(OBJPATH)/ConfigFileConf.o $(OBJPATH)/main.o $(OBJPATH)/XML.o $(OBJPATH)/XMLObject.o OBJECTS=$(OBJPATH)/ConfigCLI.o $(OBJPATH)/ConfigFile.o $(OBJPATH)/HFileGen.o $(OBJPATH)/IncludeDeps.o $(OBJPATH)/Makefile.o $(OBJPATH)/Utils.o $(OBJPATH)/ConfigFileConf.o $(OBJPATH)/main.o $(OBJPATH)/XML.o $(OBJPATH)/XMLObject.o
CFLAGS=$(INCLUDES) -std=c++17 -c -D_DEBUG -g3 -w CFLAGS=$(INCLUDES) -std=c++17 -c
LIBDIR= LIBDIR=
LDFLAGS= LDFLAGS=
LIBS=$(LIBDIR) LIBS=$(LIBDIR)
+1 -1
View File
@@ -18,6 +18,6 @@
<projectname>MakeGen</projectname> <projectname>MakeGen</projectname>
<srcdir>src/</srcdir> <srcdir>src/</srcdir>
</configuration> </configuration>
<target>Debug</target> <target>Release</target>
<version>v1.3.0</version> <version>v1.3.0</version>
</makegen> </makegen>
+7 -3
View File
@@ -72,6 +72,7 @@ struct ConfigUtils
case ConfigSetting::Invalid: case ConfigSetting::Invalid:
return "invalid"; return "invalid";
} }
return "";
} }
static bool IsDirectory(ConfigSetting setting) static bool IsDirectory(ConfigSetting setting)
@@ -97,11 +98,10 @@ struct ConfigUtils
case ConfigSetting::ExecPreArgument: case ConfigSetting::ExecPreArgument:
case ConfigSetting::ExecArgument: case ConfigSetting::ExecArgument:
case ConfigSetting::GenerateHFile: case ConfigSetting::GenerateHFile:
case ConfigSetting::Invalid:
return false; return false;
default:
LOG_ERROR("INVALID ENUM: ", (int)setting);
assert(false);
} }
return false;
} }
static bool IsStringSetting(ConfigSetting setting) static bool IsStringSetting(ConfigSetting setting)
@@ -130,6 +130,7 @@ struct ConfigUtils
case ConfigSetting::Invalid: case ConfigSetting::Invalid:
return false; return false;
} }
return false;
} }
static bool IsVectorSetting(ConfigSetting setting) static bool IsVectorSetting(ConfigSetting setting)
@@ -158,6 +159,7 @@ struct ConfigUtils
case ConfigSetting::Invalid: case ConfigSetting::Invalid:
return false; return false;
} }
return false;
} }
static bool IsBoolSetting(ConfigSetting setting) static bool IsBoolSetting(ConfigSetting setting)
{ {
@@ -185,6 +187,7 @@ struct ConfigUtils
case ConfigSetting::Invalid: case ConfigSetting::Invalid:
return false; return false;
} }
return false;
} }
static std::string GetDefaultSettingString(ConfigSetting setting, const std::string& path) static std::string GetDefaultSettingString(ConfigSetting setting, const std::string& path)
@@ -209,6 +212,7 @@ struct ConfigUtils
LOG_ERROR("INVALID STRING ENUM: ", (int)setting); LOG_ERROR("INVALID STRING ENUM: ", (int)setting);
assert(false); assert(false);
} }
return "";
} }
static bool GetDefaultSettingBool(ConfigSetting setting) static bool GetDefaultSettingBool(ConfigSetting setting)