Commit 7cb7f985 authored by bayers's avatar bayers
Browse files

Merge remote-tracking branch 'remotes/origin/main' into FhG/5ms-api-continuation

parents 6d428d2e 58b0db81

.gitlab-ci.yml

+197 −78
Original line number Diff line number Diff line
@@ -12,12 +12,14 @@ variables: 
  EXIT_CODE_FAIL: 1

  PROCESSING_SCRIPTS_BIN_DIR: "/test-bin"

  TESTS_DIR_CODEC_BE_ON_MR: "tests/codec_be_on_mr_nonselection"

  IVAS_PIPELINE_NAME: ''

  MANUAL_PIPELINE_TYPE:

    description: "Type for the manual pipeline run. Use 'test-be-release' to run BE test against release codec."

    value: 'default'

    options:

      - 'default'

      - 'test-be-release'

      - 'test-long-self-test'





default:
@@ -25,23 +27,39 @@ default: 


# This sets when pipelines are created. Jobs have more specific rules to restrict them.

workflow:

  name: '$IVAS_PIPELINE_NAME'

  rules:

    # see https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines

    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"

      when: never

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

      variables:

        IVAS_PIPELINE_NAME: 'MR pipeline: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME'

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main

      variables:

        IVAS_PIPELINE_NAME: 'Push pipeline: $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'schedule' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Scheduled in main

    - if: $CI_PIPELINE_SOURCE == 'web' # for testing

      variables:

        IVAS_PIPELINE_NAME: 'Scheduled pipeline: $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'default' # for testing

      variables:

        IVAS_PIPELINE_NAME: 'Web run pipeline: $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'test-be-release'

      variables:

        IVAS_PIPELINE_NAME: 'Test BE to release pipeline: $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'test-long-self-test'

      variables:

        IVAS_PIPELINE_NAME: 'Test long self-test against main pipeline: $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'trigger'



stages:

  - .pre

  - maintenance

  - prevalidate

  - build

  - test

  - compare

  - validate

  - postvalidate

  - deploy



# ---------------------------------------------------------------
@@ -133,6 +151,14 @@ stages: 
  - sed -i.bak -e "s/\/\*[[:space:]]*\(#define[[:space:]]*SPLIT_REND_WITH_HEAD_ROT\)[[:space:]]*\*\//\1/g" ./lib_com/options.h

  - sed -i.bak -e "s/\/\/[[:space:]]*\(#define[[:space:]]*SPLIT_REND_WITH_HEAD_ROT\)/\1/g"        ./lib_com/options.h



.get-commits-behind-count: &get-commits-behind-count

  - echo $CI_COMMIT_SHA

  - echo $CI_MERGE_REQUEST_TARGET_BRANCH_NAME

  - commits_behind_count=$(git rev-list --count $CI_COMMIT_SHA..origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME)



.check-commits-behind-count-in-compare-jobs: &check-commits-behind-count-in-compare-jobs

  - if [ $commits_behind_count -ne 0 ]; then echo "Your branch is not up-to-date with main -> Compare tests will not run as they can contain false negatives this way.\nMain might have changed during your pipeline run. Run 'git merge origin/main' to update."; exit 1; fi



# ---------------------------------------------------------------

# Job templates

# ---------------------------------------------------------------
@@ -152,6 +178,8 @@ stages: 
      when: never

    - if: $MANUAL_PIPELINE_TYPE == 'test-be-release' # Skip all the normal jobs when testing manually against release codec

      when: never

    - if: $MANUAL_PIPELINE_TYPE == 'test-long-self-test' # Skip all the normal jobs when testing manually against release codec

      when: never

    - when: on_success



.rules-merge-request:
@@ -179,11 +207,13 @@ stages: 
.build-job-linux:

  stage: build

  timeout: "4 minutes"

  needs: []

  tags:

    - ivas-linux



.build-job-windows:

  stage: build

  needs: []

  timeout: "4 minutes"

  tags:

    - ivas-windows
@@ -236,19 +266,28 @@ uninterruptible: 
# Validation jobs

# ---------------------------------------------------------------



check-if-branch-is-up-to-date-with-main:

branch-is-up-to-date-with-main-pre:

  extends:

    - .rules-merge-request

  stage: validate

  stage: prevalidate

  needs: []

  tags:

    - ivas-linux

  script:

    - echo $CI_COMMIT_SHA

    - echo $CI_MERGE_REQUEST_TARGET_BRANCH_NAME

    - commits_behind_count=$(git rev-list --count $CI_COMMIT_SHA..origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME)

    - *get-commits-behind-count

    - echo $commits_behind_count

    - if [ $commits_behind_count -eq 0 ]; then exit 0; else exit 1; fi;

    - if [ $commits_behind_count -eq 0 ]; then exit 0; else echo "Your branch is behind main, run 'git merge origin/main' to update."; exit 1; fi;



branch-is-up-to-date-with-main-post:

  extends:

    - .rules-merge-request

  stage: postvalidate

  tags:

    - ivas-linux

  script:

    - *get-commits-behind-count

    - echo $commits_behind_count

    - if [ $commits_behind_count -eq 0 ]; then exit 0; else echo "Your branch is behind main, possibly main changed during your pipeline run, run 'git merge origin/main' to update." exit 1; fi;



# ---------------------------------------------------------------

# Build jobs
@@ -333,7 +372,7 @@ codec-smoke-test: 
  extends:

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

  timeout: "10 minutes"

  timeout: "17 minutes"

  stage: test

  needs: ["build-codec-linux-cmake", "build-codec-linux-make", "build-codec-instrumented-linux", "build-codec-sanitizers-linux"]

  script:
@@ -352,6 +391,7 @@ codec-smoke-test: 
  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    expire_in: 1 week

    when: always

    paths:

      - smoke_test_output.txt

      - smoke_test_output_plc.txt
@@ -376,6 +416,7 @@ codec-msan: 
  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    expire_in: 1 week

    when: always

    paths:

      - scripts/ref/logs/

      - test_output.txt
@@ -398,6 +439,7 @@ codec-asan: 
  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    expire_in: 1 week

    when: always

    paths:

      - scripts/ref/logs/

      - test_output.txt
@@ -421,6 +463,7 @@ codec-usan: 
  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    expire_in: 1 week

    when: always

    paths:

      - scripts/ref/logs/

    expose_as: "usan selftest results"
@@ -530,6 +573,8 @@ renderer-pytest-on-merge-request: 
  stage: compare

  script:

    - *print-common-info

    - *get-commits-behind-count

    - *check-commits-behind-count-in-compare-jobs



    # some helper variables - "|| true" to prevent failures from grep not finding anything

    # write to temporary file as workaround for failures observed with piping echo
@@ -611,6 +656,8 @@ split-rendering-pytest-on-merge-request: 
  stage: compare

  script:

    - *print-common-info

    - *get-commits-behind-count

    - *check-commits-behind-count-in-compare-jobs



    # some helper variables - "|| true" to prevent failures from grep not finding anything

    # write to temporary file as workaround for failures observed with piping echo
@@ -640,6 +687,7 @@ split-rendering-pytest-on-merge-request: 
    - make -j INCLUDE_SPLIT=1



    ### Run test using scripts and input from main

    - if [ $ref_using_main == 1 ]; then git restore lib_com/options.h; fi # Revert changes back before checking out another branch to avoid conflicts

    - if [ $ref_using_main == 1 ]; then git checkout $target_commit; fi



    # run test
@@ -674,6 +722,8 @@ ivas-pytest-on-merge-request: 
  timeout: "10 minutes"

  script:

    - *print-common-info

    - *get-commits-behind-count

    - *check-commits-behind-count-in-compare-jobs

    - *merge-request-comparison-setup-codec



    # some helper variables - "|| true" to prevent failures from grep not finding anything
@@ -682,7 +732,7 @@ ivas-pytest-on-merge-request: 
    - non_be_flag=$(grep -c --ignore-case "\[non[ -]*be\]" tmp.txt) || true

    - ref_using_main=$(grep -c --ignore-case "\[ref[ -]*using[ -]*main\]" tmp.txt) || true



    ### If ref_using_main is not set, checkoug the source branch to use scripts and input from there

    ### If ref_using_main is not set, checkout the source branch to use scripts and input from there

    - if [ $ref_using_main == 0 ]; then git checkout $source_branch_commit_sha; fi



    ### prepare pytest
@@ -717,6 +767,62 @@ ivas-pytest-on-merge-request: 
      junit:

        - report-junit.xml





# Check interop IVAS_cod_test -> IVAS_dec_ref

ivas-interop-on-merge-request:

  extends:

    - .test-job-linux

    - .rules-merge-request

  stage: test

  needs: ["build-codec-linux-cmake"]

  timeout: "10 minutes"

  script:

    - *print-common-info

    - *get-commits-behind-count

    - *check-commits-behind-count-in-compare-jobs

    - *merge-request-comparison-setup-codec

    # the next line is dependent on ref-using-main flag in the other tests, but here the flag does not make sense

    - git checkout $source_branch_commit_sha



    # some helper variables - "|| true" to prevent failures from grep not finding anything

    # write to temporary file as workaround for failures observed with piping echo

    - echo $CI_MERGE_REQUEST_TITLE > tmp.txt

    - non_interop_flag=$(grep -c --ignore-case "\[non[ -]*io\]" tmp.txt) || true



    ### prepare pytest

    # create short test vectors

    - python3 tests/create_short_testvectors.py



    # Run reference creation, using source branch encoder and main decoder (see .merge-request-comparison-setup-codec)

    - exit_code=0

    - exit_code2=0

    # set timeout for individual testcase runs to 60 seconds

    - testcase_timeout=60

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec_ref --testcase_timeout=$testcase_timeout || exit_code=$?

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report2.html --self-contained-html --junit-xml=report2-junit.xml --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec_ref --testcase_timeout=$testcase_timeout || exit_code2=$?

    - zero_failures=$(cat report-junit.xml report2-junit.xml | grep -c 'failures="0"') || true



    - if [ $zero_failures != 2 ] && [ $non_interop_flag == 0 ]; then echo "Non-interop cases without non-interop flag encountered!"; exit $EXIT_CODE_FAIL; fi

    - if [ $zero_failures != 2 ] && [ $non_interop_flag == 1 ]; then echo "Non-interop cases with non-interop flag encountered"; exit $EXIT_CODE_NON_BE; fi

    - exit 0



  allow_failure:

    exit_codes:

      - 123

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    expire_in: 1 week

    when: always

    paths:

      - report-junit.xml

      - report.html

      - report2-junit.xml

      - report2.html

    expose_as: "interop test results"

    reports:

      junit:

        - report*-junit.xml



evs-pytest-on-merge-request:

  extends:

    - .test-job-linux
@@ -726,6 +832,8 @@ evs-pytest-on-merge-request: 
  timeout: "10 minutes"

  script:

    - *print-common-info

    - *get-commits-behind-count

    - *check-commits-behind-count-in-compare-jobs

    - *merge-request-comparison-setup-codec



    # some helper variables - "|| true" to prevent failures from grep not finding anything
@@ -770,8 +878,8 @@ voip-be-on-merge-request: 
  extends:

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

  stage: compare # Or should it be test? Comparison is done within one git revision

  needs: ["build-codec-linux-make", codec-smoke-test]

  stage: test

  needs: ["build-codec-linux-make", "codec-smoke-test"]

  timeout: "10 minutes"

  script:

    - *print-common-info
@@ -783,7 +891,7 @@ clang-format-check: 
    - .rules-merge-request

  variables:

    ARTIFACT_BASE_NAME: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--formatting-fix"

  stage: validate

  stage: prevalidate

  needs: []

  timeout: "5 minutes"

  script:
@@ -818,7 +926,7 @@ clang-format-check: 
    expire_in: 1 day

    paths:

      - tmp-formatting-fix/

    when: on_failure

    when: always

    name: "$ARTIFACT_BASE_NAME"

    expose_as: "formatting patch"
@@ -830,7 +938,7 @@ check-first-frame-is-sid: 
  tags:

    - ivas-linux

  stage: test

  # needs: ["build-codec-linux-cmake"]

  needs: ["build-codec-linux-cmake"]

  script:

    - *print-common-info

    - *update-ltv-repo
@@ -855,55 +963,16 @@ check-first-frame-is-sid: 
  artifacts:

    paths:

      - out/logs

    when: on_failure

    when: always

    name: "$CI_JOB_NAME--$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--sidstart"

    expose_as: "logs-sidstart"

    expire_in: "5 days"



selection-test-processing:

  extends:

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

  tags:

    - processing-scripts-linux

  stage: test

  needs: ["build-codec-linux-make"]

  script:

    # get processing script code

    - git clone https://forge.3gpp.org/rep/ivas-codec-pc/ivas-processing-scripts.git --single-branch -b main



    - mkdir -p ivas-processing-scripts/tests/data/testv

    - cp -r scripts/testv/* ivas-processing-scripts/tests/data/testv/



    # copy binaries into local bin dir, those should take precendence over PATH

    - cp $PROCESSING_SCRIPTS_BIN_DIR/* ivas-processing-scripts/ivas_processing_scripts/bin/

    # for testing with native binaries

    - rm ivas-processing-scripts/ivas_processing_scripts/bin/IVAS*.exe

    - rm ivas-processing-scripts/ivas_processing_scripts/bin/EVS*.exe



    # build codec and put into bin dir

    - make -j

    - cp ./IVAS_* ivas-processing-scripts/ivas_processing_scripts/bin/



    # patch the use_windows_codec_binaries key (weird folding is needed so colons are accepted)

    - >

      sed -i "s/use_windows_codec_binaries: true/use_windows_codec_binaries: false/" ivas-processing-scripts/experiments/selection/*/config/*.yml



    # run experiments test

    - cd ivas-processing-scripts

    - python3 -m pytest tests/test_experiments.py::test_generate_test_items -n auto | tee log.txt

  artifacts:

    paths:

      - ivas-processing-scripts/experiments/selection/*/proc_output/*.log

      - log.txt

    when: on_failure

    expire_in: 1 week



lc3plus-ensure-no-code-changes:

  extends:

    - .test-job-linux

    - .rules-merge-request

  stage: validate

  stage: postvalidate

  needs: []

  timeout: "5 minutes"

  script:
@@ -1085,6 +1154,77 @@ test-be-to-release: 
      - logs/

    expose_as: "test-be-to-release results"





test-long-self-test:

  tags:

    - ivas-linux-fast

  stage: compare

  resource_group: ivas-long-self-test-resource

  timeout: "50 minutes"

  rules:

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'test-long-self-test'

  allow_failure:

    exit_codes:

      - 123

  script:

    - *print-common-info

    - *update-ltv-repo



    ### build branch binaries

    - cmake . -Bbuild-test

    - cmake --build build-test -- -j

    - mv build-test/IVAS_cod ./IVAS_cod

    - mv build-test/IVAS_dec ./IVAS_dec



    ### store the current commit hash

    - source_branch_commit_sha=$(git rev-parse HEAD)



    ### switch to main

    - git checkout main



    ### build main (ref) binaries

    - cmake . -Bbuild-ref

    - cmake --build build-ref -- -j

    - mv build-ref/IVAS_cod ./IVAS_cod_ref

    - mv build-ref/IVAS_dec ./IVAS_dec_ref



    ### Switch back to branch, this could probably be removed later

    - git checkout $source_branch_commit_sha



    ### prepare pytest



    # Copy test vectors from LTV to TESTV

    - cp "$LTV_DIR"/*.wav scripts/testv/

    - cp "$LTV_DIR"/*.met scripts/testv/

    - cp "$LTV_DIR"/*.csv scripts/testv/



    # create references

    - exit_code_ref=0

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v --update_ref 1 -m create_ref --param_file scripts/config/self_test_ltv.prm || exit_code_ref=$?



    ### run pytest self-test using long test vectors

    - exit_code=0

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v --param_file scripts/config/self_test_ltv.prm --html=report-ltv.html --self-contained-html --junit-xml=report-junit-ltv.xml || exit_code=$?

    - zero_errors=$(cat report-junit-ltv.xml | grep -c 'errors="0"') || true



    - if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi

    - if [ $exit_code -eq 1 ]; then echo "Non-bitexact cases encountered!"; exit $EXIT_CODE_NON_BE; fi

    - exit 0





  artifacts:

    name: "test-long-self-test--sha-$CI_COMMIT_SHORT_SHA--results"

    when: always

    expire_in: 4 mos

    paths:

      - report-junit-ltv.xml

      - report-ltv.html

    expose_as: "test-long-self-test results"

    reports:

      junit:

        - report-junit-ltv.xml





# ---------------------------------------------------------------

# Scheduled jobs on main

# ---------------------------------------------------------------
@@ -1525,27 +1665,6 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
# Other jobs

# ---------------------------------------------------------------



upload-selection-BE-log:

  rules:

    - if: $UPLOAD_SELECTION_BE_RESULTS && $CI_PIPELINE_SOURCE == 'trigger'

      when: always

  timeout: 5 minutes

  tags:

    - ericsson-windows-runner

  script:

    - cp -r $SELECTION_BE_RESULT ./selection-BE-result

    - Get-Content -Path selection-BE-result/public_log--sha-*.txt

    - $has_failed_debugging_active = (Select-String -Path selection-BE-result/public_log--sha-*.txt -Pattern '^FAILED tests' -CaseSensitive).Line

    - Get-Content -Path selection-BE-result/public_log_DEBUGGING_inactive--sha-*.txt

    - $has_failed_debugging_inactive = (Select-String -Path selection-BE-result/public_log_DEBUGGING_inactive--sha-*.txt -Pattern '^FAILED tests' -CaseSensitive).Line

    - If($has_failed_debugging_active -or $has_failed_debugging_inactive) {exit -1}

  artifacts:

    paths:

      - selection-BE-result/public_log--sha-*.txt

      - selection-BE-result/public_log_DEBUGGING_inactive--sha-*.txt

    when: always

    expire_in: 1 week



# job that sets up gitlab pages website

pages:

  stage: deploy

.gitlab/merge_request_templates/default.md

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--- Basic information that is useful -->

- Related issues:

- Requested reviewers: 



### Reason why this change is needed



* This may be a direct copy from the issue.



### Description of the change



* Describe what is done.



### Affected operating points



* Describe here as well as possible what operating points are affected and how

* In minimum, there should be a status for bitstream compatibility and output bit exactness

* For bitstream compatibility, the following levels are helpful for describing encoder

  1. Produced bitstream is BE compared to previous state.

  2. Produced bitstream is non-BE but it is fully backwards compatible for decoding. Decoded output may differ.

  3. Produced bitstream is non-BC. Old decoder cannot decode the produced bitstream correctly.

* For output difference, use BE or non-BE. Additionally, amount of difference can be presented.





<!--- By default, no labels are added as they often come from the issue. Add labels if there is no issue for this. -->

CMakeLists.txt

+15 −15
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ if(UNIX) 
endif()

target_include_directories(lib_com PUBLIC lib_com PRIVATE lib_enc lib_dec lib_rend lib_debug)

if(INCLUDE_SPLIT)

  target_include_directories(lib_com PRIVATE lc3plus)

  target_include_directories(lib_com PRIVATE lib_lc3plus)

endif()



file(GLOB libDebugSrcs "lib_debug/*.c")
@@ -148,17 +148,17 @@ add_library(lib_enc ${libEncSrcs} ${libEncHeaders}) 
target_link_libraries(lib_enc lib_com lib_debug)

target_include_directories(lib_enc PUBLIC lib_enc PRIVATE lib_dec lib_rend)

if(INCLUDE_SPLIT)

  target_include_directories(lib_enc PRIVATE lc3plus)

  target_include_directories(lib_enc PRIVATE lib_lc3plus)

endif()



if(INCLUDE_SPLIT)

  file(GLOB libLC3plusSrcs "lc3plus/*.c")

  file(GLOB libLC3plusHeaders "lc3plus/*.h")

  file(GLOB libLC3plusSrcs "lib_lc3plus/*.c")

  file(GLOB libLC3plusHeaders "lib_lc3plus/*.h")

  add_library(lc3plus ${libLC3plusSrcs} ${libLC3plusHeaders})

  target_include_directories(lc3plus PUBLIC lc3plus)

  target_link_libraries(lc3plus lib_com) # For including options.h, which is needed for instrumentation to work correctly

  target_include_directories(lib_lc3plus PUBLIC lib_lc3plus)

  target_link_libraries(lib_lc3plus lib_com) # For including options.h, which is needed for instrumentation to work correctly

  if(WMOPS)

    target_link_libraries(lc3plus lib_debug)

  target_link_libraries(lib_lc3plus lib_debug)

  endif()

endif()
@@ -191,7 +191,7 @@ else() 
endif()

target_link_libraries(lib_rend lib_dec lib_com lib_debug) # Todo refactor: This dependency on lib_dec should be removed.

if(INCLUDE_SPLIT)

  target_link_libraries(lib_rend lc3plus)

  target_link_libraries(lib_rend lib_lc3plus)

endif()

target_include_directories(lib_rend PUBLIC lib_rend PRIVATE lib_enc)
@@ -210,7 +210,7 @@ endif() 
add_library(lib_util ${libUtilSrcs} ${libUtilHeaders})

target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_com lib_enc lib_dec lib_rend lib_debug)

if(INCLUDE_SPLIT)

  target_include_directories(lib_util PRIVATE lc3plus)

  target_include_directories(lib_util PRIVATE lib_lc3plus)

endif()



if(INCLUDE_SPLIT)

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ SRC_LIBDEBUG = lib_debug 
SRC_LIBDEC   = lib_dec

SRC_LIBENC   = lib_enc

SRC_LIBREND  = lib_rend

SRC_LC3PLUS  = lc3plus lc3plus/fft

SRC_LC3PLUS  = lib_lc3plus lib_lc3plus/fft

SRC_LIBUTIL  = lib_util

SRC_APP      = apps

BUILD        = build

Workspace_msvc/Workspace_msvc.sln

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encoder", "encoder.vcxproj" 
EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer.vcxproj", "{12B4C8A5-1E06-4E30-B443-D1F916F52B47}"

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LC3plus", "LC3plus.vcxproj", "{95030B82-70CD-4C6B-84D4-61096035BEA2}"

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LC3plus", "lib_lc3plus.vcxproj", "{95030B82-70CD-4C6B-84D4-61096035BEA2}"

EndProject

Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{51160D4C-55C9-4C16-A792-D94507225746}"

	ProjectSection(SolutionItems) = preProject