RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 10:42:36 +01:00
Code Issues Releases Wiki Activity

Qt: Create qt/plugins dir to tidy up our Visual Studio builds

Browse Source 
see folders: bearer, imageformats, styles and platforms.
This will stay compatible with the old builds too, unless someone wisely put their plugin folders into a 'plugin' subdirectory
This commit is contained in:
Megamouse 2018-05-12 18:22:30 +02:00 committed by Ivan
parent 4836a03a7d
commit a39384cadd
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/CMakeLists.txt
View File

@ -472,11 +472,11 @@ if(MSVC)
# them from the local QT installation at the end of the build. # them from the local QT installation at the end of the build.
if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug")
add_custom_command(TARGET rpcs3 POST_BUILD add_custom_command(TARGET rpcs3 POST_BUILD
COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --debug ${CMAKE_BINARY_DIR}/bin COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --plugindir ${CMAKE_BINARY_DIR}/bin/qt/plugins --debug ${CMAKE_BINARY_DIR}/bin
) )
else() else()
add_custom_command(TARGET rpcs3 POST_BUILD add_custom_command(TARGET rpcs3 POST_BUILD
COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick ${CMAKE_BINARY_DIR}/bin COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --plugindir ${CMAKE_BINARY_DIR}/bin/qt/plugins ${CMAKE_BINARY_DIR}/bin
) )
endif() endif()
endif() endif()

3
rpcs3/qt/etc/qt.conf Normal file
View File

@ -0,0 +1,3 @@
[Paths]
Prefix = qt/
Plugins = plugins

1
rpcs3/resources.qrc
View File

@ -27,5 +27,6 @@
<file>Icons/stop_blue.png</file> <file>Icons/stop_blue.png</file>
<file>Icons/cog_black.png</file> <file>Icons/cog_black.png</file>
<file>Icons/cog_gray.png</file> <file>Icons/cog_gray.png</file>
<file>qt/etc/qt.conf</file>
</qresource> </qresource>
</RCC> </RCC>

8
rpcs3/rpcs3.vcxproj
View File

@ -166,7 +166,7 @@
</ResourceCompile> </ResourceCompile>
<PostBuildEvent> <PostBuildEvent>
<Command> <Command>
$(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick $(TargetPath) $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --plugindir $(TargetDir)\qt\plugins $(TargetPath)
</Command> </Command>
</PostBuildEvent> </PostBuildEvent>
<PostBuildEvent> <PostBuildEvent>
@ -218,7 +218,7 @@
</ResourceCompile> </ResourceCompile>
<PostBuildEvent> <PostBuildEvent>
<Command> <Command>
$(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick $(TargetPath) $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --plugindir $(TargetDir)\qt\plugins $(TargetPath)
</Command> </Command>
</PostBuildEvent> </PostBuildEvent>
<PostBuildEvent> <PostBuildEvent>
@ -271,7 +271,7 @@
</ResourceCompile> </ResourceCompile>
<PostBuildEvent> <PostBuildEvent>
<Command> <Command>
$(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --debug $(TargetPath) $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --plugindir $(TargetDir)\qt\plugins --debug $(TargetPath)
</Command> </Command>
</PostBuildEvent> </PostBuildEvent>
<PostBuildEvent> <PostBuildEvent>
@ -324,7 +324,7 @@
</ResourceCompile> </ResourceCompile>
<PostBuildEvent> <PostBuildEvent>
<Command> <Command>
$(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --debug $(TargetPath) $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --plugindir $(TargetDir)\qt\plugins --debug $(TargetPath)
</Command> </Command>
</PostBuildEvent> </PostBuildEvent>
<PostBuildEvent> <PostBuildEvent>