diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index daee2ac..fd0f643 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -43,7 +43,6 @@ jobs: mkdir dist cp -r /${{ matrix.sys }}/share/licenses dist/ cp licenses/* dist/licenses/ - cp fonts/*.license dist/licenses/ - name: Install dev dependencies run: pacboy --noconfirm -S --needed gcc:p cmake:p ninja:p asciidoctor:p diff --git a/android/app/jni/CMakeLists.txt b/android/app/jni/CMakeLists.txt index 9437f34..e882a41 100644 --- a/android/app/jni/CMakeLists.txt +++ b/android/app/jni/CMakeLists.txt @@ -44,8 +44,8 @@ file(MAKE_DIRECTORY ${ASSETS_DIR}/licenses) file(COPY_FILE ${PROJECT_ROOT_DIR}/fonts/MTLc3m.ttf ${ASSETS_DIR}/MTLc3m.ttf) file(COPY_FILE ${PROJECT_ROOT_DIR}/fonts/mincho.otf ${ASSETS_DIR}/mincho.otf) file(COPY_FILE ${PROJECT_ROOT_DIR}/COPYING ${ASSETS_DIR}/licenses/xsystem35) -file(COPY_FILE ${PROJECT_ROOT_DIR}/fonts/MTLc3m.ttf.license ${ASSETS_DIR}/licenses/MTLc3m) -file(COPY_FILE ${PROJECT_ROOT_DIR}/fonts/mincho.otf.license ${ASSETS_DIR}/licenses/mincho) +file(COPY_FILE ${PROJECT_ROOT_DIR}/licenses/MTLc3m.txt ${ASSETS_DIR}/licenses/MTLc3m) +file(COPY_FILE ${PROJECT_ROOT_DIR}/licenses/mincho.txt ${ASSETS_DIR}/licenses/mincho) file(COPY_FILE ${PROJECT_ROOT_DIR}/licenses/nanojpeg.txt ${ASSETS_DIR}/licenses/nanojpeg) file(COPY_FILE ${sdl_SOURCE_DIR}/LICENSE.txt ${ASSETS_DIR}/licenses/SDL) file(COPY_FILE ${sdl_ttf_SOURCE_DIR}/LICENSE.txt ${ASSETS_DIR}/licenses/SDL_ttf) diff --git a/fonts/CMakeLists.txt b/fonts/CMakeLists.txt index 643cf70..2a6d65d 100644 --- a/fonts/CMakeLists.txt +++ b/fonts/CMakeLists.txt @@ -1,8 +1,6 @@ install(FILES MTLc3m.ttf - MTLc3m.ttf.license mincho.otf - mincho.otf.license DESTINATION share/xsystem35/fonts) # pyftsubset is included in fonttools. diff --git a/fonts/MTLc3m.ttf.license b/licenses/MTLc3m.txt similarity index 100% rename from fonts/MTLc3m.ttf.license rename to licenses/MTLc3m.txt diff --git a/fonts/mincho.otf.license b/licenses/mincho.txt similarity index 100% rename from fonts/mincho.otf.license rename to licenses/mincho.txt