forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade binbc dependencies to latest version. issue #681

This commit is contained in:
Vadim Lopatin 2024-02-28 11:15:19 +00:00
parent 47d764bd82
commit 2f0ae834eb
No known key found for this signature in database
GPG Key ID: F6AAFFDCB423B7E7
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dub.json
View File

@ -58,9 +58,9 @@
"versions-windows": ["Unicode"], "versions-windows": ["Unicode"],
"libs-windows": ["opengl32"], "libs-windows": ["opengl32"],
"dependencies": { "dependencies": {
"bindbc-opengl": "~>1.0.0", "bindbc-opengl": "~>1.1.0",
"bindbc-freetype": "~>1.0.0", "bindbc-freetype": "~>1.1.1",
"bindbc-sdl": "~>1.0.0" "bindbc-sdl": "~>1.4.5"
}, },
"copyFiles-windows-x86_64": [ "copyFiles-windows-x86_64": [
"libs/windows/x86_64/libfreetype-6.dll" "libs/windows/x86_64/libfreetype-6.dll"
@ -80,8 +80,8 @@
"versions": ["USE_EXTERNAL"], "versions": ["USE_EXTERNAL"],
"libs-windows": ["opengl32"], "libs-windows": ["opengl32"],
"dependencies": { "dependencies": {
"bindbc-opengl": "~>1.0.0", "bindbc-opengl": "~>1.1.0",
"bindbc-freetype": "~>1.0.0" "bindbc-freetype": "~>1.1.1"
} }
}, },
{ {
@ -91,9 +91,9 @@
"versions-windows": ["Unicode" ,"NO_OPENGL"], "versions-windows": ["Unicode" ,"NO_OPENGL"],
"libs-windows": ["opengl32"], "libs-windows": ["opengl32"],
"dependencies": { "dependencies": {
"bindbc-opengl": "~>1.0.0", "bindbc-opengl": "~>1.1.0",
"bindbc-freetype": "~>1.0.0", "bindbc-freetype": "~>1.1.1",
"bindbc-sdl": "~>1.0.0", "bindbc-sdl": "~>1.4.5",
"icontheme": "~>1.2.3" "icontheme": "~>1.2.3"
} }
}, },
@ -102,9 +102,9 @@
"versions": ["USE_SDL", "USE_OPENGL", "USE_FREETYPE", "EmbedStandardResources", "GL_32", "SDL_204"], "versions": ["USE_SDL", "USE_OPENGL", "USE_FREETYPE", "EmbedStandardResources", "GL_32", "SDL_204"],
"versions-windows": ["Unicode"], "versions-windows": ["Unicode"],
"dependencies": { "dependencies": {
"bindbc-opengl": "~>1.0.0", "bindbc-opengl": "~>1.1.0",
"bindbc-freetype": "~>1.0.0", "bindbc-freetype": "~>1.1.1",
"bindbc-sdl": "~>1.0.0", "bindbc-sdl": "~>1.4.5",
"icontheme": "~>1.2.3" "icontheme": "~>1.2.3"
}, },
"copyFiles-windows-x86_64": [ "copyFiles-windows-x86_64": [
@ -122,8 +122,8 @@
"versions-windows": ["Unicode"], "versions-windows": ["Unicode"],
"libs-posix": ["GLX"], "libs-posix": ["GLX"],
"dependencies": { "dependencies": {
"bindbc-opengl": "~>1.0.0", "bindbc-opengl": "~>1.1.0",
"bindbc-freetype": "~>1.0.0", "bindbc-freetype": "~>1.1.1",
"x11": "~>1.0.21", "x11": "~>1.0.21",
"icontheme": "~>1.2.3", "icontheme": "~>1.2.3",
"glx-d": "~>1.1.0" "glx-d": "~>1.1.0"
@ -134,8 +134,8 @@
"versions": ["USE_DSFML", "USE_OPENGL", "USE_FREETYPE", "EmbedStandardResources", "GL_32"], "versions": ["USE_DSFML", "USE_OPENGL", "USE_FREETYPE", "EmbedStandardResources", "GL_32"],
"versions-windows": ["Unicode"], "versions-windows": ["Unicode"],
"dependencies": { "dependencies": {
"bindbc-opengl": "~>1.0.0", "bindbc-opengl": "~>1.1.0",
"bindbc-freetype": "~>1.0.0", "bindbc-freetype": "~>1.1.1",
"dsfml": "~>2.1.0", "dsfml": "~>2.1.0",
"icontheme": "~>1.2.3" "icontheme": "~>1.2.3"
}, },

7
src/dlangui/platforms/sdl/sdlapp.d
View File

@ -1605,9 +1605,12 @@ version (Windows) {
} }
} }
SDLSupport sdlVer;
/// try to get screen resolution and update SCREEN_DPI; returns true if SCREEN_DPI is changed (when custom override DPI value is not set) /// try to get screen resolution and update SCREEN_DPI; returns true if SCREEN_DPI is changed (when custom override DPI value is not set)
bool sdlUpdateScreenDpi(int displayIndex = 0) { bool sdlUpdateScreenDpi(int displayIndex = 0) {
if (SDL_GetDisplayDPI is null) { if (sdlVer < SDLSupport.v2_0_4) {
Log.w("SDL_GetDisplayDPI is not found: cannot detect screen DPI"); Log.w("SDL_GetDisplayDPI is not found: cannot detect screen DPI");
return false; return false;
} }
@ -1654,7 +1657,7 @@ int sdlmain(string[] args) {
import std.exception; import std.exception;
//DerelictSDL2.missingSymbolCallback = &missingSymFunc; //DerelictSDL2.missingSymbolCallback = &missingSymFunc;
// Load the SDL 2 library. // Load the SDL 2 library.
auto sdlVer = loadSDL(); sdlVer = loadSDL();
enforce(sdlVer != SDLSupport.noLibrary && sdlVer != SDLSupport.badLibrary, "bindbc-sdl unable to find SDL2 library"); enforce(sdlVer != SDLSupport.noLibrary && sdlVer != SDLSupport.badLibrary, "bindbc-sdl unable to find SDL2 library");
sdlCheckMissingSymFunc(loader.errors); sdlCheckMissingSymFunc(loader.errors);
} catch (Exception e) { } catch (Exception e) {