Explorar el Código

Hopefully fix windows build

Run in debug now instead of release to ignore warnings and use a glob to find the DLL's instead of hard coding their paths
tags/v1.8.0
Xerbo hace 4 años
padre
commit
c3422dc634
Se han modificado 3 ficheros con 4 adiciones y 3 borrados
  1. +1
    -1
      .github/workflows/win_debug.yml
  2. +2
    -1
      CMakeLists.txt
  3. +1
    -1
      build_windows.sh

+ 1
- 1
.github/workflows/win_debug.yml Ver fichero

@@ -27,4 +27,4 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: Debug build
path: ${{runner.workspace}}/winbuild/aptdec-1.7.0.zip
path: ${{runner.workspace}}/aptdec/winbuild/aptdec-1.7.0.zip

+ 2
- 1
CMakeLists.txt Ver fichero

@@ -53,7 +53,8 @@ else()
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")

install(TARGETS aptdec DESTINATION "bin/")
install(FILES libpng16.dll sndfile.dll libzlib.dll DESTINATION "bin/")
file(GLOB_RECURSE DLLS *.dll)
install(FILES ${DLLS} DESTINATION "bin/")
install(DIRECTORY "${PROJECT_SOURCE_DIR}/palettes/" DESTINATION "palettes/")
endif()



+ 1
- 1
build_windows.sh Ver fichero

@@ -42,6 +42,6 @@ cp $TEMP_PATH/bin/*.dll ../

# Build aptdec
mkdir -p winbuild && cd winbuild
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw32.cmake -DCMAKE_INSTALL_PREFIX=$TEMP_PATH ..
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw32.cmake -DCMAKE_INSTALL_PREFIX=$TEMP_PATH ..
make -j 4
make package

Cargando…
Cancelar
Guardar