diff --git a/Makefile b/Makefile index 9aa04cb..2868e32 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ BIN=bin/ OBJPATH=$(BIN)intermediates 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 -CFLAGS=$(INCLUDES) -std=c++17 -c -D_DEBUG -g3 -w +CFLAGS=$(INCLUDES) -std=c++17 -c LIBDIR= LDFLAGS= LIBS=$(LIBDIR) diff --git a/makegen.xml b/makegen.xml index e548290..1b1dd62 100644 --- a/makegen.xml +++ b/makegen.xml @@ -18,6 +18,6 @@ MakeGen src/ - Debug + Release v1.3.0 diff --git a/src/ConfigUtils.h b/src/ConfigUtils.h index 330dd7b..53c5c09 100644 --- a/src/ConfigUtils.h +++ b/src/ConfigUtils.h @@ -72,6 +72,7 @@ struct ConfigUtils case ConfigSetting::Invalid: return "invalid"; } + return ""; } static bool IsDirectory(ConfigSetting setting) @@ -97,11 +98,10 @@ struct ConfigUtils case ConfigSetting::ExecPreArgument: case ConfigSetting::ExecArgument: case ConfigSetting::GenerateHFile: + case ConfigSetting::Invalid: return false; - default: - LOG_ERROR("INVALID ENUM: ", (int)setting); - assert(false); } + return false; } static bool IsStringSetting(ConfigSetting setting) @@ -130,6 +130,7 @@ struct ConfigUtils case ConfigSetting::Invalid: return false; } + return false; } static bool IsVectorSetting(ConfigSetting setting) @@ -158,6 +159,7 @@ struct ConfigUtils case ConfigSetting::Invalid: return false; } + return false; } static bool IsBoolSetting(ConfigSetting setting) { @@ -185,6 +187,7 @@ struct ConfigUtils case ConfigSetting::Invalid: return false; } + return false; } static std::string GetDefaultSettingString(ConfigSetting setting, const std::string& path) @@ -209,6 +212,7 @@ struct ConfigUtils LOG_ERROR("INVALID STRING ENUM: ", (int)setting); assert(false); } + return ""; } static bool GetDefaultSettingBool(ConfigSetting setting)