Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Suyu
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Suyu
Commits
6ff20dc6
There was an error fetching the commit references. Please try again later.
Commit
6ff20dc6
authored
6 years ago
by
James Rowe
Committed by
bunnei
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add qt windowsvistastyle dll to the build
parent
3dab0e28
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeModules/CopyYuzuQt5Deps.cmake
+3
-0
3 additions, 0 deletions
CMakeModules/CopyYuzuQt5Deps.cmake
appveyor.yml
+4
-0
4 additions, 0 deletions
appveyor.yml
with
7 additions
and
0 deletions
CMakeModules/CopyYuzuQt5Deps.cmake
+
3
−
0
View file @
6ff20dc6
...
@@ -3,7 +3,9 @@ function(copy_yuzu_Qt5_deps target_dir)
...
@@ -3,7 +3,9 @@ function(copy_yuzu_Qt5_deps target_dir)
set
(
DLL_DEST
"
${
CMAKE_BINARY_DIR
}
/bin/$<CONFIG>/"
)
set
(
DLL_DEST
"
${
CMAKE_BINARY_DIR
}
/bin/$<CONFIG>/"
)
set
(
Qt5_DLL_DIR
"
${
Qt5_DIR
}
/../../../bin"
)
set
(
Qt5_DLL_DIR
"
${
Qt5_DIR
}
/../../../bin"
)
set
(
Qt5_PLATFORMS_DIR
"
${
Qt5_DIR
}
/../../../plugins/platforms/"
)
set
(
Qt5_PLATFORMS_DIR
"
${
Qt5_DIR
}
/../../../plugins/platforms/"
)
set
(
Qt5_STYLES_DIR
"
${
Qt5_DIR
}
/../../../plugins/styles/"
)
set
(
PLATFORMS
${
DLL_DEST
}
platforms/
)
set
(
PLATFORMS
${
DLL_DEST
}
platforms/
)
set
(
STYLES
${
DLL_DEST
}
styles/
)
windows_copy_files
(
${
target_dir
}
${
Qt5_DLL_DIR
}
${
DLL_DEST
}
windows_copy_files
(
${
target_dir
}
${
Qt5_DLL_DIR
}
${
DLL_DEST
}
icudt*.dll
icudt*.dll
icuin*.dll
icuin*.dll
...
@@ -14,4 +16,5 @@ function(copy_yuzu_Qt5_deps target_dir)
...
@@ -14,4 +16,5 @@ function(copy_yuzu_Qt5_deps target_dir)
Qt5Widgets$<$<CONFIG:Debug>:d>.*
Qt5Widgets$<$<CONFIG:Debug>:d>.*
)
)
windows_copy_files
(
yuzu
${
Qt5_PLATFORMS_DIR
}
${
PLATFORMS
}
qwindows$<$<CONFIG:Debug>:d>.*
)
windows_copy_files
(
yuzu
${
Qt5_PLATFORMS_DIR
}
${
PLATFORMS
}
qwindows$<$<CONFIG:Debug>:d>.*
)
windows_copy_files
(
yuzu
${
Qt5_STYLES_DIR
}
${
STYLES
}
qwindowsvistastyle$<$<CONFIG:Debug>:d>.*
)
endfunction
(
copy_yuzu_Qt5_deps
)
endfunction
(
copy_yuzu_Qt5_deps
)
This diff is collapsed.
Click to expand it.
appveyor.yml
+
4
−
0
View file @
6ff20dc6
...
@@ -116,6 +116,7 @@ after_build:
...
@@ -116,6 +116,7 @@ after_build:
mkdir $RELEASE_DIST
mkdir $RELEASE_DIST
mkdir $RELEASE_DIST/platforms
mkdir $RELEASE_DIST/platforms
mkdir $RELEASE_DIST/styles
# copy the compiled binaries and other release files to the release folder
# copy the compiled binaries and other release files to the release folder
Get-ChildItem "$CMAKE_BINARY_DIR" -Filter "yuzu*.exe" | Copy-Item -destination $RELEASE_DIST
Get-ChildItem "$CMAKE_BINARY_DIR" -Filter "yuzu*.exe" | Copy-Item -destination $RELEASE_DIST
...
@@ -136,6 +137,9 @@ after_build:
...
@@ -136,6 +137,9 @@ after_build:
# copy the qt windows plugin dll to platforms
# 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"
Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/platforms/qwindows.dll" -force -destination "$RELEASE_DIST/platforms"
# copy the qt windows vista style dll to platforms
Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/styles/qwindowsvistastyle.dll" -force -destination "$RELEASE_DIST/styles"
7z a -tzip $MINGW_BUILD_ZIP $RELEASE_DIST\*
7z a -tzip $MINGW_BUILD_ZIP $RELEASE_DIST\*
7z a $MINGW_SEVENZIP $RELEASE_DIST
7z a $MINGW_SEVENZIP $RELEASE_DIST
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment