Commit 13674162 authored by multrus's avatar multrus
Browse files

further improvement wrt stripping

parent dfa4a4e5

scripts/makefile_noSR.patch

0 → 100644
+85 −0
Original line number Diff line number Diff line 
--- Makefile	2023-08-11 21:40:55.974878000 +0200

+++ Makefile_patched	2023-08-11 21:43:18.230151000 +0200

@@ -6,13 +6,12 @@

 SRC_LIBDEC   = lib_dec

 SRC_LIBENC   = lib_enc

 SRC_LIBREND  = lib_rend

-SRC_LC3PLUS  = lc3plus lc3plus/fft

 SRC_LIBUTIL  = lib_util

 SRC_APP      = apps

 BUILD        = build

 OBJDIR       = obj

 

-SRC_DIRS  = $(sort -u $(SRC_LIBCOM) $(SRC_LIBDEBUG) $(SRC_LIBDEC) $(SRC_LIBENC) $(SRC_LIBREND) $(SRC_LC3PLUS) $(SRC_LIBUTIL) $(SRC_APP)) 

+SRC_DIRS  = $(sort -u $(SRC_LIBCOM) $(SRC_LIBDEBUG) $(SRC_LIBDEC) $(SRC_LIBENC) $(SRC_LIBREND) $(SRC_LIBUTIL) $(SRC_APP)) 

 

 # Name of CLI binaries

 CLI_APIDEC   ?= IVAS_dec

@@ -23,7 +22,6 @@

 LIB_LIBDEC   ?= libivasdec.a

 LIB_LIBENC   ?= libivasenc.a

 LIB_LIBREND  ?= libivasrend.a

-LIB_LC3PLUS  ?= liblc3plus.a

 LIB_LIBUTIL  ?= libivasutil.a

 

 # Default tool settings

@@ -124,7 +122,6 @@

 SRCS_LIBDEC   = $(foreach DIR,$(SRC_LIBDEC),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

 SRCS_LIBENC   = $(foreach DIR,$(SRC_LIBENC),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

 SRCS_LIBREND  = $(foreach DIR,$(SRC_LIBREND),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

-SRCS_LC3PLUS  = $(foreach DIR,$(SRC_LC3PLUS),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

 SRCS_LIBUTIL  = $(foreach DIR,$(SRC_LIBUTIL),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

 

 OBJS_LIBCOM      = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.o))

@@ -132,14 +129,13 @@

 OBJS_LIBDEC      = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEC:.c=.o))

 OBJS_LIBENC      = $(addprefix $(OBJDIR)/,$(SRCS_LIBENC:.c=.o))

 OBJS_LIBREND     = $(addprefix $(OBJDIR)/,$(SRCS_LIBREND:.c=.o))

-OBJS_LC3PLUS     = $(addprefix $(OBJDIR)/,$(SRCS_LC3PLUS:.c=.o))

 OBJS_LIBUTIL     = $(addprefix $(OBJDIR)/,$(SRCS_LIBUTIL:.c=.o))

 OBJS_CLI_APIDEC  = $(OBJDIR)/decoder.o

 OBJS_CLI_APIENC  = $(OBJDIR)/encoder.o

 OBJS_CLI_APPREND = $(OBJDIR)/renderer.o

 

 DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.P) $(SRCS_LIBDEBUG:.c=.P) $(SRCS_LIBDEC:.c=.P) \

-  $(SRCS_LIBENC:.c=.P) $(SRCS_LIBUTIL:.c=.P) $(SRCS_LIBREND:.c=.P) $(SRCS_LC3PLUS:.c=.P))

+  $(SRCS_LIBENC:.c=.P) $(SRCS_LIBUTIL:.c=.P) $(SRCS_LIBREND:.c=.P))

 

 ###############################################################################

 

@@ -165,28 +161,25 @@

 $(LIB_LIBREND): $(OBJS_LIBREND)

 	$(QUIET_AR)$(AR) rcs $@ $^

 

-$(LIB_LC3PLUS): $(OBJS_LC3PLUS)

-	$(QUIET_AR)$(AR) rcs $@ $^

-

 $(LIB_LIBUTIL): $(OBJS_LIBUTIL)

 	$(QUIET_AR)$(AR) rcs $@ $^

 

-$(CLI_APIENC): $(OBJS_CLI_APIENC) $(LIB_LIBENC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)

+$(CLI_APIENC): $(OBJS_CLI_APIENC) $(LIB_LIBENC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG)

 	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC) -L. -livasenc -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIENC)

 

-$(CLI_APIDEC): $(OBJS_CLI_APIDEC) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)

-	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -livascom -livasutil -livasdebug -llc3plus $(LDLIBS) -o $(CLI_APIDEC)

+$(CLI_APIDEC): $(OBJS_CLI_APIDEC) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG)

+	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIDEC)

 

-$(CLI_APIREND): $(OBJS_CLI_APPREND) $(LIB_LIBREND) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LIBDEC) $(LIB_LC3PLUS)

-	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -livasdec -livasutil -livasdebug -livascom -llc3plus $(LDLIBS) -o $(CLI_APIREND)

+$(CLI_APIREND): $(OBJS_CLI_APPREND) $(LIB_LIBREND) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LIBDEC)

+	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -livasdec -livasutil -livasdebug -livascom $(LDLIBS) -o $(CLI_APIREND)

 

-libs: $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBREND) $(LIB_LC3PLUS) $(LIB_LIBUTIL)

+libs: $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBREND) $(LIB_LIBUTIL)

 

 clean: 

 	$(QUIET)$(RM) $(OBJS_LIBENC) $(OBJS_LIBDEC) $(DEPS)

 	$(QUIET)$(RM) $(DEPS:.P=.d)

 	$(QUIET)test ! -d $(OBJDIR) || rm -rf $(OBJDIR)

-	$(QUIET)$(RM) $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBUTIL) $(LIB_LIBREND) $(LIB_LC3PLUS)

+	$(QUIET)$(RM) $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBUTIL) $(LIB_LIBREND)

 

 $(OBJDIR)/%.o : %.c | $(OBJDIR)

 	$(QUIET_CC)$(CC) $(CFLAGS) -c -MD -o $@ $<

scripts/prepare_delivery.sh

+31 −4
Original line number Diff line number Diff line
@@ -113,6 +113,10 @@ rm -f ${OUTDIR}/Workspace_msvc/lib_debug.vcxproj.bak 
cp ${ROOT}/readme.txt ${OUTDIR}

recode lat1..ibmpc ${OUTDIR}/readme.txt # unix2dos ...



# LICENSE.md

cp ${ROOT}/LICENSE.md ${OUTDIR}

recode lat1..ibmpc ${OUTDIR}/LICENSE.md # unix2dos ...





##########################

#                        #
@@ -128,7 +132,7 @@ if [ $STRIP_SPLITREND -ne 0 ]; then 
  rm -R $OUTDIR/lc3plus

  

  # remove other split rendering files

  declare -a sr_files=(

  declare -a sr_files_rend=(

      "lib_rend/ivas_CQMFDecoder.c"

      "lib_rend/ivas_CQMFDecoder.h"

      "lib_rend/ivas_CQMFEncoder.c"
@@ -154,7 +158,7 @@ if [ $STRIP_SPLITREND -ne 0 ]; then 
      "lib_rend/ivas_lc3plus_dec.h"

      "lib_rend/ivas_lc3plus_enc.c"

      "lib_rend/ivas_lc3plus_enc.h"

      "lib_rend/ivas_lc3plus_enc.c"

      "lib_rend/ivas_lcld_tables.c"

      "lib_rend/ivas_lcld_tables.h"

      "lib_rend/ivas_splitRend_lcld_dec.c"

      "lib_rend/ivas_splitRend_lcld_enc.c"
@@ -162,14 +166,25 @@ if [ $STRIP_SPLITREND -ne 0 ]; then 
      "lib_rend/ivas_splitRendererPost.c"

      "lib_rend/ivas_splitRendererPre.c"

      "lib_rend/ivas_splitRenderer_utils.c"

  )



  for file in ${sr_files_rend[@]}; do

    rm $OUTDIR/$file

    file_windows=${file//\//'\\'}

    sed -i.bak -e "/${file_windows}/d" ${OUTDIR}/Workspace_msvc/lib_rend.vcxproj

  done



  declare -a sr_files_util=(

      "lib_util/split_rend_bfi_file_reader.c"

      "lib_util/split_rend_bfi_file_reader.h"

      "lib_util/split_render_file_read_write.c"

      "lib_util/split_render_file_read_write.h"

  )



  for file in ${sr_files[@]}; do

  for file in ${sr_files_util[@]}; do

    rm $OUTDIR/$file

    file_windows=${file//\//'\\'}

    sed -i.bak -e "/${file_windows}/d" ${OUTDIR}/Workspace_msvc/lib_rend.vcxproj

  done
@@ -198,6 +213,18 @@ if [ $STRIP_SPLITREND -ne 0 ]; then 


  fi



  # patch Makefile

  patch ${OUTDIR}/Makefile < ${ROOT}/scripts/makefile_noSR.patch



  # delete project file

  rm ${OUTDIR}/Workspace_msvc/LC3plus.vcxproj 



  # patch project/solution files

  sed -i.bak "/LC3plus.vcxproj/,+1d" ${OUTDIR}/Workspace_msvc/Workspace_msvc.sln

  find ${OUTDIR}/Workspace_msvc -name "*.vcxproj" -exec sed -i.bak -e "s/..\\lc3plus\;//g" \{\} \;



  # clean-up *.bak-files

  find $OUTDIR -name "*.bak" -exec rm \{\} \;



fi