Skip to content

Commit 72f2556

Browse files
committed
fix 1 and 2 gl clamp edge, file system - windows bugs
1 parent 31e46f4 commit 72f2556

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

source/gui/imgui/src/App.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77
#include <al/io/al_AudioIO.hpp>
88

99
#include <GLFW/glfw3.h>
10+
11+
// GL_CLAMP_TO_EDGE is OpenGL 1.2+. Windows <GL/gl.h> only provides 1.1.
12+
// Define the value here if the header hasn't supplied it.
13+
#ifndef GL_CLAMP_TO_EDGE
14+
# define GL_CLAMP_TO_EDGE 0x812F
15+
#endif
16+
1017
#include "miniLogo_data.h"
1118
#include "stb_image.h"
1219

source/gui/imgui/src/FileDialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ std::string pickFileOrDirectory(const std::string& title) {
5959
pDialog->SetTitle(titleW);
6060
DWORD opts = 0;
6161
pDialog->GetOptions(&opts);
62-
pDialog->SetOptions(opts | FOS_PICKFOLDERS | FOS_ALLFILESYSTEMED);
62+
pDialog->SetOptions(opts | FOS_PICKFOLDERS | FOS_FORCEFILESYSTEM);
6363

6464
if (pDialog->Show(nullptr) == S_OK) {
6565
IShellItem* pItem = nullptr;

0 commit comments

Comments
 (0)