Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

try to fix windows build

Browse Source
This commit is contained in:
Isse 2024-01-08 22:16:10 +01:00 committed by Marcel Märtens
parent 00f527fe8b
commit 82989979a6
2 changed files with 26 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Cargo.lock generated
View File

@ -903,16 +903,6 @@ dependencies = [
"objc_id", "objc_id",
] ]
[[package]]
name = "clipboard_macos"
version = "0.1.0"
source = "git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d#1392da8339c8aebb9849d00eb7383a73ed076f1d"
dependencies = [
"objc",
"objc-foundation",
"objc_id",
]
[[package]] [[package]]
name = "clipboard_wayland" name = "clipboard_wayland"
version = "0.2.0" version = "0.2.0"
@ -922,14 +912,6 @@ dependencies = [
"smithay-clipboard", "smithay-clipboard",
] ]
[[package]]
name = "clipboard_wayland"
version = "0.2.0"
source = "git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d#1392da8339c8aebb9849d00eb7383a73ed076f1d"
dependencies = [
"smithay-clipboard",
]
[[package]] [[package]]
name = "clipboard_x11" name = "clipboard_x11"
version = "0.4.0" version = "0.4.0"
@ -940,15 +922,6 @@ dependencies = [
"x11rb 0.9.0", "x11rb 0.9.0",
] ]
[[package]]
name = "clipboard_x11"
version = "0.4.0"
source = "git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d#1392da8339c8aebb9849d00eb7383a73ed076f1d"
dependencies = [
"thiserror",
"x11rb 0.9.0",
]
[[package]] [[package]]
name = "cloudabi" name = "cloudabi"
version = "0.0.3" version = "0.0.3"
@ -2871,12 +2844,12 @@ dependencies = [
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.4.0" version = "0.4.0"
source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070" source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070" source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
dependencies = [ dependencies = [
"futures", "futures",
"log", "log",
@ -2886,7 +2859,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070" source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"glam", "glam",
@ -2899,7 +2872,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_native" name = "iced_native"
version = "0.4.0" version = "0.4.0"
source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070" source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
dependencies = [ dependencies = [
"iced_core", "iced_core",
"iced_futures", "iced_futures",
@ -2911,7 +2884,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_style" name = "iced_style"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070" source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
dependencies = [ dependencies = [
"iced_core", "iced_core",
] ]
@ -2919,7 +2892,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_winit" name = "iced_winit"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070" source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
dependencies = [ dependencies = [
"iced_futures", "iced_futures",
"iced_graphics", "iced_graphics",
@ -2927,7 +2900,7 @@ dependencies = [
"log", "log",
"thiserror", "thiserror",
"winapi", "winapi",
"window_clipboard 0.2.3", "window_clipboard 0.3.0",
"winit", "winit",
] ]
@ -8064,19 +8037,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "window_clipboard"
version = "0.2.3"
source = "git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d#1392da8339c8aebb9849d00eb7383a73ed076f1d"
dependencies = [
"clipboard-win 4.5.0",
"clipboard_macos 0.1.0 (git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d)",
"clipboard_wayland 0.2.0 (git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d)",
"clipboard_x11 0.4.0 (git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d)",
"raw-window-handle 0.5.2",
"thiserror",
]
[[package]] [[package]]
name = "window_clipboard" name = "window_clipboard"
version = "0.2.4" version = "0.2.4"
@ -8084,13 +8044,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "015dd4474dc6aa96fe19aae3a24587a088bd90331dba5a5cc60fb3a180234c4d" checksum = "015dd4474dc6aa96fe19aae3a24587a088bd90331dba5a5cc60fb3a180234c4d"
dependencies = [ dependencies = [
"clipboard-win 4.5.0", "clipboard-win 4.5.0",
"clipboard_macos 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "clipboard_macos",
"clipboard_wayland 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "clipboard_wayland",
"clipboard_x11 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "clipboard_x11",
"raw-window-handle 0.3.4", "raw-window-handle 0.3.4",
"thiserror", "thiserror",
] ]
[[package]]
name = "window_clipboard"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63287c9c4396ccf5346d035a9b0fcaead9e18377637f5eaa78b7ac65c873ff7d"
dependencies = [
"clipboard-win 4.5.0",
"clipboard_macos",
"clipboard_wayland",
"clipboard_x11",
"raw-window-handle 0.5.2",
"thiserror",
]
[[package]] [[package]]
name = "windows" name = "windows"
version = "0.48.0" version = "0.48.0"

4
voxygen/Cargo.toml
View File

@ -72,8 +72,8 @@ cmake = "=0.1.45"
conrod_core = {git = "https://gitlab.com/veloren/conrod.git", branch="copypasta_0.7"} conrod_core = {git = "https://gitlab.com/veloren/conrod.git", branch="copypasta_0.7"}
conrod_winit = {git = "https://gitlab.com/veloren/conrod.git", branch="copypasta_0.7"} conrod_winit = {git = "https://gitlab.com/veloren/conrod.git", branch="copypasta_0.7"}
euc = "0.5.0" euc = "0.5.0"
iced = {package = "iced_native", git = "https://github.com/JCapucho/iced", branch = "winit-updates"} iced = {package = "iced_native", git = "https://github.com/Imberflur/iced", tag = "veloren-winit-0.28"}
iced_winit = {git = "https://github.com/JCapucho/iced", branch = "winit-updates"} iced_winit = {git = "https://github.com/Imberflur/iced", tag = "veloren-winit-0.28"}
window_clipboard = "0.2" window_clipboard = "0.2"
glyph_brush = "0.7.0" glyph_brush = "0.7.0"
# https://gitlab.com/Frinksy/keyboard-keynames/-/merge_requests/8 # https://gitlab.com/Frinksy/keyboard-keynames/-/merge_requests/8