Ubuntu fix

yowidin · Sep 11, 2023 · 8def6fe · 8def6fe
1 parent afe7cac
commit 8def6fe
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/conan.lock b/conan.lock
@@ -2,17 +2,47 @@
     "version": "0.5",
     "requires": [
         "zlib/1.2.13#e377bee636333ae348d51ca90874e353%1682597484.674",
+        "xz_utils/5.4.0#186e94237b66f785e4ea095f2f621a56%1678279440.056",
+        "xorg/system#de8fc1917bb3d11cf7a1d15eccf79c16%1681842477.341",
+        "xkeyboard-config/system#493c19865261899b6633ecb43ce536d6%1672760927.706",
+        "xkbcommon/1.4.1#4bb0a36120398a6b84def10dd3f51f82%1680618058.216",
+        "wayland/1.21.0#19b20330f8177672377bd400c0990833%1676551827.016",
         "sdl/2.26.1#152c43fdd07f187f0b2a9150596c9c63%1681205276.792",
+        "opengl/system#b29589c04d6df84c110d6acb066ab653%1681425065.802",
+        "libxml2/2.10.3#1cbaf81341e07fcb0e61dadee882a193%1678328553.703",
+        "libunwind/1.6.2#3fd3894a7a2dc2413b3284a7f53029b9%1676404465.159",
         "libiconv/1.17#fa54397801cd96911a8294bc5fc76335%1675449822.495",
+        "libffi/3.4.3#280be66b6614f257140e5ff0c982cc01%1682699083.727",
+        "libbacktrace/cci.20210118#ec1aa63bbc10145c6a299e68e711670c%1676205469.545",
+        "libalsa/1.2.7.2#a309f03299c0b19b0d39c81ec4b93f5f%1676403994.293",
         "implot/0.16#c25309dd442617c2a48be5e3a0757294%1693108677.51",
         "imgui/1.89.8#aca90b5254026e5261ad533d53a807e7%1691062405.992",
         "glad/0.1.36#c926453afdd9d5f72cc4ee6a8fff7d73%1678839632.23",
+        "expat/2.5.0#7fde619c77c77a50ca72364bc92c4907%1678277250.98",
+        "egl/system#068ac3037d8cf01f768d0e001e6dcd76%1681426530.637",
         "bzip2/1.0.8#411fc05e80d47a89045edc1ee6f23c1d%1678293522.814",
         "boost/1.80.0#7ce52a0e4f06404d91edc32cf7a79daa%1682803249.895"
     ],
     "build_requires": [
+        "zlib/1.2.13#e377bee636333ae348d51ca90874e353%1682597484.674",
+        "wayland-protocols/1.31#52be073a4183abb8dcdeaa1e8626bcef%1679950893.432",
+        "wayland/1.21.0#19b20330f8177672377bd400c0990833%1676551827.016",
+        "pkgconf/1.9.3#a920b5c7f8d04f22b9fe03db91a864dd%1677509382.92",
+        "ninja/1.11.1#63bca91350508f335754f5f9e17ec989%1681981792.086",
+        "meson/1.0.0#15586c0ac6f682805875ef903dbe7ee2%1673885561.647",
+        "m4/1.4.19#c1c4b1ee919e34630bb9b50046253d3c%1676610086.39",
+        "libxml2/2.10.3#1cbaf81341e07fcb0e61dadee882a193%1678328553.703",
+        "libtool/2.4.7#d55a3c2435c19e830fa77aa5c6c19350%1677509454.216",
+        "libiconv/1.17#fa54397801cd96911a8294bc5fc76335%1675449822.495",
+        "libffi/3.4.3#280be66b6614f257140e5ff0c982cc01%1682699083.727",
+        "gnu-config/cci.20210814#15c3bf7dfdb743977b84d0321534ad90%1681250000.747",
+        "flex/2.6.4#e35bc44b3fcbcd661e0af0dc5b5b1ad4%1674818991.113",
+        "expat/2.5.0#7fde619c77c77a50ca72364bc92c4907%1678277250.98",
         "cmake/3.25.3#586c962fa58ccc886a7b2667f7c19ab9%1678699428.979",
-        "b2/4.9.6#2e02945ad41739b8051247d14fe8297d%1679927934.674"
+        "bison/3.8.2#a8e86b304f8085ddbb22395c99a9a0a8%1671620227.654",
+        "b2/4.9.6#2e02945ad41739b8051247d14fe8297d%1679927934.674",
+        "automake/1.16.5#891f585a736bce951cc0e7109aa5ffee%1674664460.353",
+        "autoconf/2.71#f4e2bd681d49b4b80761aa587bde94d5%1676387919.088"
     ],
     "python_requires": []
-}
+}
diff --git a/src/ui/window.cpp b/src/ui/window.cpp
@@ -97,9 +97,9 @@ window::window(const asp::options &opts,
    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2);
 #elif ASP_TARGET_OS(UNIX)
-   SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+   SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
 
-   SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
+   SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2);
 #endif