diff --git a/.gitignore b/.gitignore index 9c4c9c5..e5a11bd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ /launch.sh /log.txt /log_gladeparse.txt -/bin \ No newline at end of file +/bin +/.vscode \ No newline at end of file diff --git a/LICENSE.MD b/LICENSE.MD new file mode 100644 index 0000000..08b460f --- /dev/null +++ b/LICENSE.MD @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022 T. Ashton Blair, Jr. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/Makefile b/Makefile index 74fa075..f8b1101 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,6 @@ EXE := $(notdir $(CWD))$(EXE_SFX) ICONFILE := $(CWD)/share/icons/small.ico USETERMINAL := false LOGFILE := $(CWD)/log.txt -DEPFILE := $(CWD)/dep.txt DIRFILE := $(CWD)/dir.txt #updating base directory structure: @@ -93,10 +92,11 @@ allinBLD := $(shell find $(BLD) -type f) allinRSC := $(shell find $(RSC) -type f) allinSRC := $(shell find $(SRC) -type f) SRCS := $(filter %.cpp, $(allinSRC)) -DEPS := $(addprefix $(BLD)/, $(addsuffix .d, $(SRCS))) +DEPS := $(filter %.d, $(allinBLD)) +DEL_BLD := $(filter-out $(DEPS:%.d=%.o), $(filter $(BLD)/$(SRC)/%.o, $(allinBLD))) OBJS := $(addprefix $(BLD)/, $(addsuffix .o, $(SRCS))) OBJS += $(addprefix $(BLD)/, $(addsuffix .o, $(allinRSC))) -DEL_BLD := $(filter-out $(BLD)/$(EXE), $(filter-out $(DEPS), $(filter-out $(OBJS), $(allinBLD)))) +DEL_BLD += $(filter-out $(BLD)/$(EXE), $(filter-out $(DEPS), $(filter-out $(OBJS), $(allinBLD)))) RUN_DT := $(EXE).desktop RUN_SH := $(EXE).sh @@ -156,15 +156,10 @@ $(BLD)/$(RSC)/%.o: $(RSC)/% @echo resource $< made into object $@ >> $(LOGFILE) ; $(BLD)/$(SRC)/%.o: $(SRC)/% - @$(CXX) $(CXX_FLAGS) -I$(INC) $(CFLAGS) $< -c -o $@ - @echo new object file compiled [$@] >> $(LOGFILE) - -$(BLD)/$(SRC)/%.d: $(SRC)/% - @$(CXX) $(CXX_FLAGS) -I$(INC) -MM $< -MF $@ - @STEM=$(subst .cpp,,$*) ; \ - sed -i "s,$${STEM}.o,$(BLD)/$(SRC)/$${STEM}.cpp.o $@," $@ ; \ - sed -i "s,$< ,," $@ ; - @echo new depend file compiled [$@] >> $(DEPFILE) + @$(CXX) -I$(INC) $< -MM -MT '$@' -MF $(subst .o,.d,$@) + @sed -i 's/$(SRC)\/$* //g' $(subst .o,.d,$@) + @$(CXX) $(CXX_FLAGS) -I$(INC) $(CFLAGS) -c $< -o $@ + @echo new object + depend file compiled [$@ + .d] due to [$?] >> $(LOGFILE) .PHONY: logsetup logsetup: @@ -196,10 +191,6 @@ logsetup: @echo [allinRSC=$(allinRSC)] >> $(LOGFILE) @echo [allinSRC=$(allinSRC)] >> $(LOGFILE) @echo [OBJS=$(OBJS)] >> $(LOGFILE) - @if [ -f $(DEPFILE) ]; then \ - echo -------\>MADE DEPENDS FILES WHEN INCLUDING: >> $(LOGFILE) ; \ - cat $(DEPFILE) >> $(LOGFILE) ; \ - $(RM) $(DEPFILE) ; fi ; @echo -----\>MAKE OUTPUT FOLLOWS: >> $(LOGFILE) .PHONY: logclear diff --git a/dep/APCalc.d b/dep/APCalc.d deleted file mode 100644 index e786cc0..0000000 --- a/dep/APCalc.d +++ /dev/null @@ -1,2 +0,0 @@ -obj/rel/APCalc.o obj/dbg/APCalc.o: src/APCalc.cpp inc/stdafx.h inc/mfloat.h inc/mint.h \ - inc/widgets.h inc/GUI.h diff --git a/dep/GUI.d b/dep/GUI.d deleted file mode 100644 index e6866db..0000000 --- a/dep/GUI.d +++ /dev/null @@ -1,2 +0,0 @@ -obj/rel/GUI.o obj/dbg/GUI.o: src/GUI.cpp inc/GUI.h inc/stdafx.h inc/mfloat.h inc/mint.h \ - inc/widgets.h diff --git a/dep/mfloat.d b/dep/mfloat.d deleted file mode 100644 index 35fcd83..0000000 --- a/dep/mfloat.d +++ /dev/null @@ -1 +0,0 @@ -obj/rel/mfloat.o obj/dbg/mfloat.o: src/mfloat.cpp inc/stdafx.h inc/mfloat.h inc/mint.h diff --git a/dep/mint.d b/dep/mint.d deleted file mode 100644 index 103e530..0000000 --- a/dep/mint.d +++ /dev/null @@ -1 +0,0 @@ -obj/rel/mint.o obj/dbg/mint.o: src/mint.cpp inc/stdafx.h inc/mint.h diff --git a/dep/stdafx.d b/dep/stdafx.d deleted file mode 100644 index b0a7715..0000000 --- a/dep/stdafx.d +++ /dev/null @@ -1 +0,0 @@ -obj/rel/stdafx.o obj/dbg/stdafx.o: src/stdafx.cpp inc/stdafx.h diff --git a/dep/widgets.d b/dep/widgets.d deleted file mode 100644 index 2c5abac..0000000 --- a/dep/widgets.d +++ /dev/null @@ -1,2 +0,0 @@ -obj/rel/widgets.o obj/dbg/widgets.o: src/widgets.cpp inc/widgets.h inc/stdafx.h inc/GUI.h \ - inc/mfloat.h inc/mint.h diff --git a/obj/dbg/APCalc.o b/obj/dbg/APCalc.o deleted file mode 100644 index 125981f..0000000 Binary files a/obj/dbg/APCalc.o and /dev/null differ diff --git a/obj/dbg/GUI.o b/obj/dbg/GUI.o deleted file mode 100644 index e321726..0000000 Binary files a/obj/dbg/GUI.o and /dev/null differ diff --git a/obj/dbg/glade.glade.o b/obj/dbg/glade.glade.o deleted file mode 100644 index 8cf40ad..0000000 Binary files a/obj/dbg/glade.glade.o and /dev/null differ diff --git a/obj/dbg/mfloat.o b/obj/dbg/mfloat.o deleted file mode 100644 index aa047a2..0000000 Binary files a/obj/dbg/mfloat.o and /dev/null differ diff --git a/obj/dbg/mint.o b/obj/dbg/mint.o deleted file mode 100644 index 18340d3..0000000 Binary files a/obj/dbg/mint.o and /dev/null differ diff --git a/obj/dbg/stdafx.o b/obj/dbg/stdafx.o deleted file mode 100644 index 25ee1d5..0000000 Binary files a/obj/dbg/stdafx.o and /dev/null differ diff --git a/obj/dbg/style.css.o b/obj/dbg/style.css.o deleted file mode 100644 index aab8b7a..0000000 Binary files a/obj/dbg/style.css.o and /dev/null differ diff --git a/obj/dbg/widgets.o b/obj/dbg/widgets.o deleted file mode 100644 index 5312646..0000000 Binary files a/obj/dbg/widgets.o and /dev/null differ diff --git a/obj/rel/APCalc.o b/obj/rel/APCalc.o deleted file mode 100644 index 2ca3451..0000000 Binary files a/obj/rel/APCalc.o and /dev/null differ diff --git a/obj/rel/GUI.o b/obj/rel/GUI.o deleted file mode 100644 index 41f7e3c..0000000 Binary files a/obj/rel/GUI.o and /dev/null differ diff --git a/obj/rel/glade.glade.o b/obj/rel/glade.glade.o deleted file mode 100644 index b55732b..0000000 Binary files a/obj/rel/glade.glade.o and /dev/null differ diff --git a/obj/rel/mfloat.o b/obj/rel/mfloat.o deleted file mode 100644 index 3f6a11d..0000000 Binary files a/obj/rel/mfloat.o and /dev/null differ diff --git a/obj/rel/mint.o b/obj/rel/mint.o deleted file mode 100644 index 360b343..0000000 Binary files a/obj/rel/mint.o and /dev/null differ diff --git a/obj/rel/stdafx.o b/obj/rel/stdafx.o deleted file mode 100644 index ef974de..0000000 Binary files a/obj/rel/stdafx.o and /dev/null differ diff --git a/obj/rel/style.css.o b/obj/rel/style.css.o deleted file mode 100644 index da56ee7..0000000 Binary files a/obj/rel/style.css.o and /dev/null differ diff --git a/obj/rel/widgets.o b/obj/rel/widgets.o deleted file mode 100644 index 891d317..0000000 Binary files a/obj/rel/widgets.o and /dev/null differ