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
6ca8637d
There was an error fetching the commit references. Please try again later.
Commit
6ca8637d
authored
4 years ago
by
James Rowe
Browse files
Options
Downloads
Patches
Plain Diff
Use the correct directory for Qt Plugins
parent
497f5935
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeModules/CopyYuzuQt5Deps.cmake
+8
-4
8 additions, 4 deletions
CMakeModules/CopyYuzuQt5Deps.cmake
with
8 additions
and
4 deletions
CMakeModules/CopyYuzuQt5Deps.cmake
+
8
−
4
View file @
6ca8637d
...
...
@@ -6,9 +6,9 @@ function(copy_yuzu_Qt5_deps target_dir)
set
(
Qt5_STYLES_DIR
"
${
Qt5_DIR
}
/../../../plugins/styles/"
)
set
(
Qt5_IMAGEFORMATS_DIR
"
${
Qt5_DIR
}
/../../../plugins/imageformats/"
)
set
(
Qt5_RESOURCES_DIR
"
${
Qt5_DIR
}
/../../../resources/"
)
set
(
PLATFORMS
${
DLL_DEST
}
platforms/
)
set
(
STYLES
${
DLL_DEST
}
styles/
)
set
(
IMAGEFORMATS
${
DLL_DEST
}
imageformats/
)
set
(
PLATFORMS
${
DLL_DEST
}
plugins/
platforms/
)
set
(
STYLES
${
DLL_DEST
}
plugins/
styles/
)
set
(
IMAGEFORMATS
${
DLL_DEST
}
plugins/
imageformats/
)
windows_copy_files
(
${
target_dir
}
${
Qt5_DLL_DIR
}
${
DLL_DEST
}
icudt*.dll
icuin*.dll
...
...
@@ -42,11 +42,15 @@ function(copy_yuzu_Qt5_deps target_dir)
icudtl.dat
)
endif
()
windows_copy_files
(
yuzu
${
Qt5_PLATFORMS_DIR
}
${
PLATFORMS
}
qwindows$<$<CONFIG:Debug>:d>.*
)
windows_copy_files
(
yuzu
${
Qt5_STYLES_DIR
}
${
STYLES
}
qwindowsvistastyle$<$<CONFIG:Debug>:d>.*
)
windows_copy_files
(
yuzu
${
Qt5_IMAGEFORMATS_DIR
}
${
IMAGEFORMATS
}
qjpeg$<$<CONFIG:Debug>:d>.*
qgif$<$<CONFIG:Debug>:d>.*
)
# Create an empty qt.conf file. Qt will detect that this file exists, and use the folder that its in as the root folder.
# This way it'll look for plugins in the root/plugins/ folder
add_custom_command
(
TARGET yuzu POST_BUILD
COMMAND
${
CMAKE_COMMAND
}
-E touch
${
DLL_DEST
}
qt.conf
)
endfunction
(
copy_yuzu_Qt5_deps
)
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