msvc and mingw

This commit is contained in:
Valentin Vanelslande 2017-10-23 15:03:07 -05:00 committed by GitHub
parent 9abaa19e9d
commit 4270a99fb9

View File

@ -88,8 +88,8 @@ after_build:
Copy-Item .\msvc_build\bin\release\* -Destination $RELEASE_DIST -Recurse
Copy-Item .\license.txt -Destination $RELEASE_DIST
Copy-Item .\README.md -Destination $RELEASE_DIST
7z a -tzip $MSVC_BUILD_ZIP $RELEASE_DIST\*
7z a $MSVC_SEVENZIP $RELEASE_DIST
7z a -tzip $MSVC_BUILD_ZIP $RELEASE_DIST\* .\dlls\SDL2.dll
7z a $MSVC_SEVENZIP $RELEASE_DIST .\dlls\SDL2.dll
} else {
$MINGW_BUILD_ZIP = "citra-windows-mingw-$GITDATE-$GITREV.zip" -replace " ", ""
$MINGW_SEVENZIP = "citra-windows-mingw-$GITDATE-$GITREV.7z" -replace " ", ""
@ -112,8 +112,6 @@ after_build:
# copy the compiled binaries and other release files to the release folder
Get-ChildItem "$CMAKE_BINARY_DIR" -Recurse -Filter "citra*.exe" | Copy-Item -destination $RELEASE_DIST
# copy SDL2 DLL
Copy-Item -path "$CMAKE_SOURCE_DIR/dlls/SDL2.dll" -destination "$RELEASE_DIST/SDL2.dll"
# copy the libcurl dll
Get-ChildItem "$CMAKE_BINARY_DIR" -Recurse -Filter "libcurl.dll" | Copy-Item -destination $RELEASE_DIST
Copy-Item -path "$CMAKE_SOURCE_DIR/license.txt" -destination $RELEASE_DIST
@ -140,8 +138,8 @@ after_build:
# copy the qt windows plugin dll to platforms
Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/platforms/qwindows.dll" -force -destination "$RELEASE_DIST/platforms"
7z a -tzip $MINGW_BUILD_ZIP $RELEASE_DIST\*
7z a $MINGW_SEVENZIP $RELEASE_DIST
7z a -tzip $MINGW_BUILD_ZIP $RELEASE_DIST\* $CMAKE_SOURCE_DIR\dlls\SDL2.dll
7z a $MINGW_SEVENZIP $RELEASE_DIST $CMAKE_SOURCE_DIR\dlls\SDL2.dll
}
test_script: