lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 09:00:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only build qt.conf on windows, it breaks linux platform plugin search :(

Browse Source
This commit is contained in:
baldurk
2017-06-13 13:31:29 +01:00
parent d6d93a7734
commit def80ac8da
5 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Resources/qtconf.qrc
+5
View File
@@ -0,0 +1,5 @@
<RCC>
<qresource prefix="/qt/etc">
<file>qt.conf</file>
</qresource>
</RCC>
qrenderdoc/Resources/resources.qrc
-3
View File
@@ -68,7 +68,4 @@
<file>action.png</file>
<file>action_hover.png</file>
</qresource>
<qresource prefix="/qt/etc">
<file>qt.conf</file>
</qresource>
</RCC>
qrenderdoc/qrenderdoc.pro
+3
View File
@@ -61,6 +61,9 @@ win32 {
silent:swig.commands = @echo SWIG ${QMAKE_FILE_IN} && $$swig.commands
QMAKE_EXTRA_COMPILERS += swig
# windows only qrc file with qt.conf
RESOURCES += Resources/qtconf.qrc
SWIGSOURCES += Code/pyrenderdoc/renderdoc.i
SWIGSOURCES += Code/pyrenderdoc/qrenderdoc.i
qrenderdoc/qrenderdoc_local.vcxproj
+7
View File
@@ -638,6 +638,7 @@
<ClCompile Include="$(IntDir)generated\moc_VirtualFileDialog.cpp" />
<ClCompile Include="$(IntDir)generated\moc_VulkanPipelineStateViewer.cpp" />
<ClCompile Include="$(IntDir)generated\qrc_resources.cpp" />
<ClCompile Include="$(IntDir)generated\qrc_qtconf.cpp" />
<ClCompile Include="$(IntDir)generated\renderdoc_python.cxx">
<DisableSpecificWarnings>4101;4456;4459;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
@@ -1434,6 +1435,12 @@
<Message>RCC resources.qrc</Message>
<Outputs>$(IntDir)generated\qrc_resources.cpp</Outputs>
</CustomBuild>
<CustomBuild Include="Resources\qtconf.qrc">
<AdditionalInputs>Resources\qtconf.qrc;$(ProjectDir)3rdparty\qt\$(Platform)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
<Command>$(ProjectDir)3rdparty\qt\$(Platform)\bin\rcc.exe -name qtconf Resources\qtconf.qrc -o $(IntDir)generated\qrc_qtconf.cpp</Command>
<Message>RCC qtconf.qrc</Message>
<Outputs>$(IntDir)generated\qrc_qtconf.cpp</Outputs>
</CustomBuild>
<None Include="Resources\runback.png" />
<None Include="Resources\runcursor.png" />
<None Include="Resources\runfwd.png" />
qrenderdoc/qrenderdoc_local.vcxproj.filters
+6
View File
@@ -618,6 +618,9 @@
<ClCompile Include="Widgets\Extended\RDHeaderView.cpp">
<Filter>Widgets\Extended</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)generated\qrc_qtconf.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="3rdparty\flowlayout\FlowLayout.h">
@@ -1397,5 +1400,8 @@
<CustomBuild Include="Widgets\Extended\RDHeaderView.h">
<Filter>Widgets\Extended</Filter>
</CustomBuild>
<CustomBuild Include="Resources\qtconf.qrc">
<Filter>Resources</Filter>
</CustomBuild>
</ItemGroup>
</Project>