From db15de385d60482c785f56f589eebe6d05cff2a8 Mon Sep 17 00:00:00 2001 From: Marek Blok <Marek.Blok@pg.edu.pl> Date: Fri, 21 Apr 2023 11:54:39 +0200 Subject: [PATCH] removed Main.o from libDSPE.a --- CHANGELOG | 4 +++- src/Makefile.win | 8 ++++---- src/include/DSP_lib.h | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2d6b4e8..0587b15 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,7 +8,9 @@ TODO:: LAST DONE: CHANGES: -- ver. 0.20.026 - <b>2022.04.14</b> Fixed: +- ver. 0.20.027 - <b>2022.04.21</b> Fixed: + - not Main.o is not included in libDSPE.a +- ver. 0.20.026 - <b>2022.04.21</b> Fixed: - fixed DSP::TMorseTable::LoadFromFile - DSP::TMorseTable::LoadFromFile and DSP::u::MORSEkey::LoadFromFile now read file based on full path to *.mct file - ver. 0.20.025 - <b>2022.04.14</b> Changed: diff --git a/src/Makefile.win b/src/Makefile.win index 0fc3548..29bab25 100644 --- a/src/Makefile.win +++ b/src/Makefile.win @@ -63,8 +63,8 @@ DEPENDS_SOCKETS_Release := $(DEPENDS_SOCKETS:%.cpp=$(OUT_DIR_RLS)/%.d) # DEBUG OBJECTS_Debug := $(SOURCES:%.cpp=$(OUT_DIR_DBG)/%.o) DEPENDS_Debug := $(SOURCES:%.cpp=$(OUT_DIR_DBG)/%.d) -OBJECTS_Debug += $(SOURCES_DBG:%.cpp=$(OUT_DIR_DBG)/%.o) -DEPENDS_Debug += $(SOURCES_DBG:%.cpp=$(OUT_DIR_DBG)/%.d) +OBJECTS_DBG_Debug := $(SOURCES_DBG:%.cpp=$(OUT_DIR_DBG)/%.o) +DEPENDS_DBG_Debug := $(SOURCES_DBG:%.cpp=$(OUT_DIR_DBG)/%.d) OBJECTS_EXAMPLES_Debug := $(SOURCES_EXAMPLES_DBG:%.cpp=$(OUT_DIR_DBG)/%.o) DEPENDS_EXAMPLES_Debug := $(SOURCES_EXAMPLES_DBG:%.cpp=$(OUT_DIR_DBG)/%.d) OBJECTS_SOCKETS_Debug := $(SOURCES_SOCKETS:%.cpp=$(OUT_DIR_DBG)/%.o) @@ -115,7 +115,7 @@ Debug: $(OUT_DIR_DBG)/DSPElib.exe $(OUT_DIR_DBG)/DSPElib.exe: $(OUT_DIR_DBG)/libDSPE.a $(OUT_DIR_DBG)/libDSPEsockets.a $(OUT_DIR_DBG)/libDSPEexamples.a $(CC) -L"$(OUT_DIR_DBG)" "$(OUT_DIR_DBG)/src/Main.o" -o"$(OUT_DIR_DBG)/DSPElib.exe" $(LINKER_FLAGS_debug) -lDSPE -lDSPEsockets -lDSPEexamples $(LIBS) -$(OUT_DIR_DBG)/libDSPE.a: $(OBJECTS_Debug) $(OBJECTS_MISC_Debug) +$(OUT_DIR_DBG)/libDSPE.a: $(OBJECTS_DBG_Debug) $(OBJECTS_Debug) $(OBJECTS_MISC_Debug) @echo Preparing lib file $@ ar rc $@ $(OBJECTS_Debug) $(OBJECTS_MISC_Debug) ranlib $@ @@ -130,7 +130,7 @@ $(OUT_DIR_DBG)/libDSPEexamples.a: $(OBJECTS_EXAMPLES_Debug) ranlib $@ # Z podanej listy usuwany $(OUT_DIR_RLS)/ oraz '.o' zamieniamy na '.cpp' -$(OBJECTS_Debug) $(OBJECTS_EXAMPLES_Debug) $(OBJECTS_SOCKETS_Debug) $(OBJECTS_MISC_Debug): $(OUT_DIR_DBG)/%.o : %.cpp +$(OBJECTS_Debug) $(OBJECTS_DBG_Debug) $(OBJECTS_EXAMPLES_Debug) $(OBJECTS_SOCKETS_Debug) $(OBJECTS_MISC_Debug): $(OUT_DIR_DBG)/%.o : %.cpp @echo $(@D) $< $@ mkdir -p $(@D) diff --git a/src/include/DSP_lib.h b/src/include/DSP_lib.h index ef40002..15ca7d7 100644 --- a/src/include/DSP_lib.h +++ b/src/include/DSP_lib.h @@ -11,7 +11,7 @@ #define DSP_VER_MAJOR 0 #define DSP_VER_MINOR 20 -#define DSP_VER_BUILD 26 // !!! without zeroes before, else this will be treated as octal number +#define DSP_VER_BUILD 27 // !!! without zeroes before, else this will be treated as octal number #define DSP_VER_YEAR 2023 #define DSP_VER DSP_VER_MAJOR.DSP_VER_MINOR.DSP_VER_BUILD -- GitLab