diff --git a/C Project/.codelite/C Project.session b/C Project/.codelite/C Project.session deleted file mode 100644 index d341bdc..0000000 --- a/C Project/.codelite/C Project.session +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/C Project/.codelite/C Project.tags b/C Project/.codelite/C Project.tags deleted file mode 100644 index b18b3aa..0000000 Binary files a/C Project/.codelite/C Project.tags and /dev/null differ diff --git a/C Project/.codelite/compilation.db b/C Project/.codelite/compilation.db deleted file mode 100644 index 9e74677..0000000 Binary files a/C Project/.codelite/compilation.db and /dev/null differ diff --git a/C Project/Basic_Calculator/Basic_Calculator.mk b/C Project/Basic_Calculator/Basic_Calculator.mk deleted file mode 100644 index cefe775..0000000 --- a/C Project/Basic_Calculator/Basic_Calculator.mk +++ /dev/null @@ -1,110 +0,0 @@ -## -## Auto Generated makefile by CodeLite IDE -## any manual changes will be erased -## -## Debug -ProjectName :=Basic_Calculator -ConfigurationName :=Debug -WorkspacePath :="/home/topartioliver/C-Programming/C Project" -ProjectPath :="/home/topartioliver/C-Programming/C Project/Basic_Calculator" -IntermediateDirectory :=./Debug -OutDir := $(IntermediateDirectory) -CurrentFileName := -CurrentFilePath := -CurrentFileFullPath := -User :=topartioliver -Date :=12/13/20 -CodeLitePath :=/home/topartioliver/.codelite -LinkerName :=gcc -SharedObjectLinkerName :=gcc -shared -fPIC -ObjectSuffix :=.o -DependSuffix :=.o.d -PreprocessSuffix :=.o.i -DebugSwitch :=-g -IncludeSwitch :=-I -LibrarySwitch :=-l -OutputSwitch :=-o -LibraryPathSwitch :=-L -PreprocessorSwitch :=-D -SourceSwitch :=-c -OutputFile :=$(IntermediateDirectory)/$(ProjectName) -Preprocessors := -ObjectSwitch :=-o -ArchiveOutputSwitch := -PreprocessOnlySwitch :=-E -ObjectsFileList :="Basic_Calculator.txt" -PCHCompileFlags := -MakeDirCommand :=mkdir -p -LinkOptions := -IncludePath := $(IncludeSwitch). $(IncludeSwitch). -IncludePCH := -RcIncludePath := -Libs := -ArLibs := -LibPath := $(LibraryPathSwitch). - -## -## Common variables -## AR, CXX, CC, AS, CXXFLAGS and CFLAGS can be overriden using an environment variables -## -AR := ar rcus -CXX := gcc -CC := gcc -CXXFLAGS := -g -O0 -Wall $(Preprocessors) -CFLAGS := -g -O0 -Wall $(Preprocessors) -ASFLAGS := -AS := as - - -## -## User defined environment variables -## -CodeLiteDir:=/usr/share/codelite -Objects0=$(IntermediateDirectory)/main.c$(ObjectSuffix) - - - -Objects=$(Objects0) - -## -## Main Build Targets -## -.PHONY: all clean PreBuild PrePreBuild PostBuild MakeIntermediateDirs -all: $(OutputFile) - -$(OutputFile): $(IntermediateDirectory)/.d $(Objects) - @$(MakeDirCommand) $(@D) - @echo "" > $(IntermediateDirectory)/.d - @echo $(Objects0) > $(ObjectsFileList) - $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions) - -MakeIntermediateDirs: - @test -d ./Debug || $(MakeDirCommand) ./Debug - - -$(IntermediateDirectory)/.d: - @test -d ./Debug || $(MakeDirCommand) ./Debug - -PreBuild: - - -## -## Objects -## -$(IntermediateDirectory)/main.c$(ObjectSuffix): main.c $(IntermediateDirectory)/main.c$(DependSuffix) - $(CC) $(SourceSwitch) "/home/topartioliver/C-Programming/C Project/Basic_Calculator/main.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/main.c$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/main.c$(DependSuffix): main.c - @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/main.c$(ObjectSuffix) -MF$(IntermediateDirectory)/main.c$(DependSuffix) -MM main.c - -$(IntermediateDirectory)/main.c$(PreprocessSuffix): main.c - $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main.c$(PreprocessSuffix) main.c - - --include $(IntermediateDirectory)/*$(DependSuffix) -## -## Clean -## -clean: - $(RM) -r ./Debug/ - - diff --git a/C Project/Basic_Calculator/Basic_Calculator.project b/C Project/Basic_Calculator/Basic_Calculator.project deleted file mode 100644 index d8e960b..0000000 --- a/C Project/Basic_Calculator/Basic_Calculator.project +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - - - - - - - - - - - - - - - diff --git a/C Project/Basic_Calculator/Basic_Calculator.txt b/C Project/Basic_Calculator/Basic_Calculator.txt deleted file mode 100644 index cfe2248..0000000 --- a/C Project/Basic_Calculator/Basic_Calculator.txt +++ /dev/null @@ -1 +0,0 @@ -./Debug/main.c.o diff --git a/C Project/Basic_Calculator/Debug/Basic_Calculator b/C Project/Basic_Calculator/Debug/Basic_Calculator deleted file mode 100755 index 4b60d7b..0000000 Binary files a/C Project/Basic_Calculator/Debug/Basic_Calculator and /dev/null differ diff --git a/C Project/Basic_Calculator/Debug/trial-programs b/C Project/Basic_Calculator/Debug/trial-programs deleted file mode 100755 index e489c29..0000000 Binary files a/C Project/Basic_Calculator/Debug/trial-programs and /dev/null differ diff --git a/C Project/Basic_Calculator/main.c b/C Project/Basic_Calculator/main.c deleted file mode 100644 index 4ad8e82..0000000 --- a/C Project/Basic_Calculator/main.c +++ /dev/null @@ -1,35 +0,0 @@ -#include -#include -#include - -/*int main() -{ - double num1; - double num2; - printf("Enter first number: "); - scanf("%lf", &num1); - printf("Enter second number: "); - scanf("%lf", &num2); - printf("Answer is %f", num1 + num2); - return 0; -}*/ - -int main() -{ - - char color[20]; - char pluralNoun[20]; - char celebrityF[20]; - char celebrityL[20]; - - printf("Enter a color: "); - scanf("%s", &color); - printf("Enter a plural noun: "); - scanf("%s", &pluralNoun); - printf("Enter a celebrity: "); - scanf("%s%s", celebrityF, celebrityL); - - printf("Roses are %s,\n", color); - printf("%s are blue,\n", pluralNoun); - printf("I love %s %s.", celebrityF, celebrityL); -} diff --git a/C Project/Basic_Calculator/trial-programs.mk b/C Project/Basic_Calculator/trial-programs.mk deleted file mode 100644 index 826037a..0000000 --- a/C Project/Basic_Calculator/trial-programs.mk +++ /dev/null @@ -1,110 +0,0 @@ -## -## Auto Generated makefile by CodeLite IDE -## any manual changes will be erased -## -## Debug -ProjectName :=trial-programs -ConfigurationName :=Debug -WorkspacePath :="/home/topartioliver/C-Programming/C Project" -ProjectPath :="/home/topartioliver/C-Programming/C Project/Basic_Calculator" -IntermediateDirectory :=./Debug -OutDir := $(IntermediateDirectory) -CurrentFileName := -CurrentFilePath := -CurrentFileFullPath := -User :=topartioliver -Date :=12/13/20 -CodeLitePath :=/home/topartioliver/.codelite -LinkerName :=gcc -SharedObjectLinkerName :=gcc -shared -fPIC -ObjectSuffix :=.o -DependSuffix :=.o.d -PreprocessSuffix :=.o.i -DebugSwitch :=-g -IncludeSwitch :=-I -LibrarySwitch :=-l -OutputSwitch :=-o -LibraryPathSwitch :=-L -PreprocessorSwitch :=-D -SourceSwitch :=-c -OutputFile :=$(IntermediateDirectory)/$(ProjectName) -Preprocessors := -ObjectSwitch :=-o -ArchiveOutputSwitch := -PreprocessOnlySwitch :=-E -ObjectsFileList :="trial-programs.txt" -PCHCompileFlags := -MakeDirCommand :=mkdir -p -LinkOptions := -IncludePath := $(IncludeSwitch). $(IncludeSwitch). -IncludePCH := -RcIncludePath := -Libs := -ArLibs := -LibPath := $(LibraryPathSwitch). - -## -## Common variables -## AR, CXX, CC, AS, CXXFLAGS and CFLAGS can be overriden using an environment variables -## -AR := ar rcus -CXX := gcc -CC := gcc -CXXFLAGS := -g -O0 -Wall $(Preprocessors) -CFLAGS := -g -O0 -Wall $(Preprocessors) -ASFLAGS := -AS := as - - -## -## User defined environment variables -## -CodeLiteDir:=/usr/share/codelite -Objects0=$(IntermediateDirectory)/main.c$(ObjectSuffix) - - - -Objects=$(Objects0) - -## -## Main Build Targets -## -.PHONY: all clean PreBuild PrePreBuild PostBuild MakeIntermediateDirs -all: $(OutputFile) - -$(OutputFile): $(IntermediateDirectory)/.d $(Objects) - @$(MakeDirCommand) $(@D) - @echo "" > $(IntermediateDirectory)/.d - @echo $(Objects0) > $(ObjectsFileList) - $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions) - -MakeIntermediateDirs: - @test -d ./Debug || $(MakeDirCommand) ./Debug - - -$(IntermediateDirectory)/.d: - @test -d ./Debug || $(MakeDirCommand) ./Debug - -PreBuild: - - -## -## Objects -## -$(IntermediateDirectory)/main.c$(ObjectSuffix): main.c $(IntermediateDirectory)/main.c$(DependSuffix) - $(CC) $(SourceSwitch) "/home/topartioliver/C-Programming/C Project/Basic_Calculator/main.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/main.c$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/main.c$(DependSuffix): main.c - @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/main.c$(ObjectSuffix) -MF$(IntermediateDirectory)/main.c$(DependSuffix) -MM main.c - -$(IntermediateDirectory)/main.c$(PreprocessSuffix): main.c - $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main.c$(PreprocessSuffix) main.c - - --include $(IntermediateDirectory)/*$(DependSuffix) -## -## Clean -## -clean: - $(RM) -r ./Debug/ - - diff --git a/C Project/Basic_Calculator/trial-programs.txt b/C Project/Basic_Calculator/trial-programs.txt deleted file mode 100644 index cfe2248..0000000 --- a/C Project/Basic_Calculator/trial-programs.txt +++ /dev/null @@ -1 +0,0 @@ -./Debug/main.c.o diff --git a/C Project/C Project.workspace b/C Project/C Project.workspace deleted file mode 100644 index 4090054..0000000 --- a/C Project/C Project.workspace +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/C Project/Makefile b/C Project/Makefile deleted file mode 100644 index 26dece7..0000000 --- a/C Project/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -.PHONY: clean All - -All: - @echo "----------Building project:[ Project_C - Debug ]----------" - @cd "Project_C" && "$(MAKE)" -f "Project_C.mk" -clean: - @echo "----------Cleaning project:[ Project_C - Debug ]----------" - @cd "Project_C" && "$(MAKE)" -f "Project_C.mk" clean diff --git a/C Project/Project_C/.basic.c.swp b/C Project/Project_C/.basic.c.swp deleted file mode 100644 index 2389398..0000000 Binary files a/C Project/Project_C/.basic.c.swp and /dev/null differ diff --git a/C Project/Project_C/Debug/Project_C b/C Project/Project_C/Debug/Project_C deleted file mode 100755 index 40b2647..0000000 Binary files a/C Project/Project_C/Debug/Project_C and /dev/null differ diff --git a/C Project/Project_C/Debug/employees.txt b/C Project/Project_C/Debug/employees.txt deleted file mode 100644 index 1510532..0000000 --- a/C Project/Project_C/Debug/employees.txt +++ /dev/null @@ -1 +0,0 @@ -Hello Oliver, It's good to finish this 4 hour video. \ No newline at end of file diff --git a/C Project/Project_C/Project_C.mk b/C Project/Project_C/Project_C.mk deleted file mode 100644 index 757e82f..0000000 --- a/C Project/Project_C/Project_C.mk +++ /dev/null @@ -1,110 +0,0 @@ -## -## Auto Generated makefile by CodeLite IDE -## any manual changes will be erased -## -## Debug -ProjectName :=Project_C -ConfigurationName :=Debug -WorkspacePath :="/home/topartioliver/C-Programming/C Project" -ProjectPath :="/home/topartioliver/C-Programming/C Project/Project_C" -IntermediateDirectory :=./Debug -OutDir := $(IntermediateDirectory) -CurrentFileName := -CurrentFilePath := -CurrentFileFullPath := -User :=topartioliver -Date :=12/13/20 -CodeLitePath :=/home/topartioliver/.codelite -LinkerName :=gcc -SharedObjectLinkerName :=gcc -shared -fPIC -ObjectSuffix :=.o -DependSuffix :=.o.d -PreprocessSuffix :=.o.i -DebugSwitch :=-g -IncludeSwitch :=-I -LibrarySwitch :=-l -OutputSwitch :=-o -LibraryPathSwitch :=-L -PreprocessorSwitch :=-D -SourceSwitch :=-c -OutputFile :=$(IntermediateDirectory)/$(ProjectName) -Preprocessors := -ObjectSwitch :=-o -ArchiveOutputSwitch := -PreprocessOnlySwitch :=-E -ObjectsFileList :="Project_C.txt" -PCHCompileFlags := -MakeDirCommand :=mkdir -p -LinkOptions := -IncludePath := $(IncludeSwitch). $(IncludeSwitch). -IncludePCH := -RcIncludePath := -Libs := -ArLibs := -LibPath := $(LibraryPathSwitch). - -## -## Common variables -## AR, CXX, CC, AS, CXXFLAGS and CFLAGS can be overriden using an environment variables -## -AR := ar rcus -CXX := gcc -CC := gcc -CXXFLAGS := -g -O0 -Wall $(Preprocessors) -CFLAGS := -g -O0 -Wall $(Preprocessors) -ASFLAGS := -AS := as - - -## -## User defined environment variables -## -CodeLiteDir:=/usr/share/codelite -Objects0=$(IntermediateDirectory)/main.c$(ObjectSuffix) - - - -Objects=$(Objects0) - -## -## Main Build Targets -## -.PHONY: all clean PreBuild PrePreBuild PostBuild MakeIntermediateDirs -all: $(OutputFile) - -$(OutputFile): $(IntermediateDirectory)/.d $(Objects) - @$(MakeDirCommand) $(@D) - @echo "" > $(IntermediateDirectory)/.d - @echo $(Objects0) > $(ObjectsFileList) - $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions) - -MakeIntermediateDirs: - @test -d ./Debug || $(MakeDirCommand) ./Debug - - -$(IntermediateDirectory)/.d: - @test -d ./Debug || $(MakeDirCommand) ./Debug - -PreBuild: - - -## -## Objects -## -$(IntermediateDirectory)/main.c$(ObjectSuffix): main.c $(IntermediateDirectory)/main.c$(DependSuffix) - $(CC) $(SourceSwitch) "/home/topartioliver/C-Programming/C Project/Project_C/main.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/main.c$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/main.c$(DependSuffix): main.c - @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/main.c$(ObjectSuffix) -MF$(IntermediateDirectory)/main.c$(DependSuffix) -MM main.c - -$(IntermediateDirectory)/main.c$(PreprocessSuffix): main.c - $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main.c$(PreprocessSuffix) main.c - - --include $(IntermediateDirectory)/*$(DependSuffix) -## -## Clean -## -clean: - $(RM) -r ./Debug/ - - diff --git a/C Project/Project_C/Project_C.txt b/C Project/Project_C/Project_C.txt deleted file mode 100644 index cfe2248..0000000 --- a/C Project/Project_C/Project_C.txt +++ /dev/null @@ -1 +0,0 @@ -./Debug/main.c.o diff --git a/C Project/Project_C/ex1 b/C Project/Project_C/ex1 deleted file mode 100755 index 23bca54..0000000 Binary files a/C Project/Project_C/ex1 and /dev/null differ diff --git a/C-Base/.codelite/C-Base.session b/C-Base/.codelite/C-Base.session new file mode 100644 index 0000000..ef7fe09 --- /dev/null +++ b/C-Base/.codelite/C-Base.session @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/C-Base/.codelite/C-Base.tags b/C-Base/.codelite/C-Base.tags new file mode 100644 index 0000000..1e4a4c0 Binary files /dev/null and b/C-Base/.codelite/C-Base.tags differ diff --git a/C Project/.codelite/refactoring.db b/C-Base/.codelite/refactoring.db similarity index 85% rename from C Project/.codelite/refactoring.db rename to C-Base/.codelite/refactoring.db index d2136a1..53fb567 100644 Binary files a/C Project/.codelite/refactoring.db and b/C-Base/.codelite/refactoring.db differ diff --git a/C-Base/C-Base.workspace b/C-Base/C-Base.workspace new file mode 100644 index 0000000..4af7248 --- /dev/null +++ b/C-Base/C-Base.workspace @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/C Project/Project_C/Project_C.project b/C-Base/C-Base/C-Base.project similarity index 88% rename from C Project/Project_C/Project_C.project rename to C-Base/C-Base/C-Base.project index 17110ba..71af6ee 100644 --- a/C Project/Project_C/Project_C.project +++ b/C-Base/C-Base/C-Base.project @@ -1,5 +1,5 @@ - + @@ -12,7 +12,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/C Project/Project_C/main.c b/C-Base/C-Base/main.c similarity index 100% rename from C Project/Project_C/main.c rename to C-Base/C-Base/main.c