all repos — mgba @ f27566fb081377b13997625d747c3654a10bcf24

mGBA Game Boy Advance Emulator

Qt: Fix build on Windows without epoxy
Jeffrey Pfau jeffrey@endrift.com
Sat, 16 Apr 2016 17:20:02 -0700
commit

f27566fb081377b13997625d747c3654a10bcf24

parent

82e79db1c8c5380a23126b0a4f3b81d75b4a04b9

1 files changed, 4 insertions(+), 0 deletions(-)

jump to
M src/platform/qt/ShaderSelector.cppsrc/platform/qt/ShaderSelector.cpp

@@ -201,6 +201,7 @@ });

} QWidget* ShaderSelector::makePage(mGLES2Shader* shader, const QString& name, int pass) { +#if !defined(_WIN32) || defined(USE_EPOXY) if (!shader->nUniforms) { return nullptr; }

@@ -253,6 +254,9 @@ }

layout->addRow(shader->uniforms[u].readableName, settings); } return page; +#else + return nullptr; +#endif } void ShaderSelector::buttonPressed(QAbstractButton* button) {