Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cmake compilation errors #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix cmake compilation errors #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
[submodule "cuckoo-miner/src/cuckoo_sys/plugins/cuckoo"]
path = cuckoo-miner/src/cuckoo_sys/plugins/cuckoo
url = https://github.com/tromp/cuckoo.git
[submodule "randomx-rust"]
path = randomx-rust
url = ../randomx-rust.git
[submodule "progpow-rust"]
path = progpow-rust
url = ../progpow-rust.git
77 changes: 41 additions & 36 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 14 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = "Mining software for Epic, supports CPU and CUDA GPUs."
build = "src/build/build.rs"
license = "Apache-2.0"
repository = "https://github.com/mimblewimble/epic-miner"
keywords = [ "crypto", "epic", "mimblewimble", "mining"]
keywords = ["crypto", "epic", "mimblewimble", "mining"]
autobins = false

[workspace]
Expand All @@ -30,7 +30,10 @@ native-tls = "0.2"
serde = "1"
serde_derive = "1"
serde_json = "1"
slog = { version = "~2.1", features = ["max_level_trace", "release_max_level_trace"] }
slog = { version = "~2.1", features = [
"max_level_trace",
"release_max_level_trace",
] }
term = "0.4"
time = "0.1"
rand = "^0.3.16"
Expand All @@ -41,12 +44,14 @@ epic_miner_util = { path = "./util", version = "1.0.2" }
epic_miner_plugin = { path = "./plugin", version = "1.0.2" }
epic_miner_config = { path = "./config", version = "1.0.2" }
#use this alternative inclusion below to build cuda plugins
ocl_cuckatoo = { path = "./ocl_cuckatoo", version = "1.0.2", optional = true}
randomx = { path = "./randomx-rust", version = "0.1.0" }
ocl_cuckatoo = { path = "./ocl_cuckatoo", version = "1.0.2", optional = true }
randomx = { git = "https://github.com/EpicCash/randomx-rust.git", version = "0.1.1" }
randomx_miner = { path = "./randomx-miner", version = "0.1.0" }

[target.'cfg(windows)'.dependencies]
cursive = { version = "0.14", default-features = false, features = ["pancurses-backend"] }
cursive = { version = "0.14", default-features = false, features = [
"pancurses-backend",
] }
[target.'cfg(windows)'.dependencies.pancurses]
version = "0.16.0"
features = ["win32"]
Expand Down Expand Up @@ -87,13 +92,15 @@ optional = true

[dependencies.progpow_opencl]
package = "progpow"
path = "./progpow-rust"
git = "https://github.com/EpicCash/progpow-rust.git"
version = "0.1.0"
features = ["opencl"]
optional = true

[dependencies.progpow_cuda]
package = "progpow"
path = "./progpow-rust"
git = "https://github.com/EpicCash/progpow-rust.git"
version = "0.1.0"
features = ["cuda"]
optional = true

Expand Down
2 changes: 1 addition & 1 deletion cuckoo-miner/src/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ fn main() {
let dst = Config::new("src/cuckoo_sys/plugins")
.define("BUILD_CUDA_PLUGINS",BUILD_CUDA_PLUGINS) //whatever flags go here
//.cflag("-foo") //and here
.build_target("")
.no_build_target(true)
.build();

println!("Plugin path: {:?}", plugin_path);
Expand Down
13 changes: 9 additions & 4 deletions progpow-miner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,28 @@ version = "0.1.0"
lazy_static = "1.3.0"
bigint = "4.4.1"
keccak-hash = "0.2.0"
slog = { version = "~2.1", features = ["max_level_trace", "release_max_level_trace"] }
slog = { version = "~2.1", features = [
"max_level_trace",
"release_max_level_trace",
] }

epic_miner_core = { path = "../core", version = "0.1.0" }
epic_miner_util = { path = "../util", version = "1.0.2" }

[dependencies.progpow_opencl]
package = "progpow"
path = "../progpow-rust"
git = "https://github.com/EpicCash/progpow-rust.git"
version = "0.1.0"
features = ["opencl"]
optional = true

[dependencies.progpow_cuda]
package = "progpow"
path = "../progpow-rust"
git = "https://github.com/EpicCash/progpow-rust.git"
version = "0.1.0"
features = ["cuda"]
optional = true

[features]
opencl = ["progpow_opencl"]
cuda = ["progpow_cuda"]
cuda = ["progpow_cuda"]
1 change: 0 additions & 1 deletion progpow-rust
Open in desktop
Submodule progpow-rust deleted from 1f9100
7 changes: 5 additions & 2 deletions randomx-miner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ version = "0.1.0"
lazy_static = "1.3.0"
bigint = "4.4.1"
log = "^0.3"
slog = { version = "~2.1", features = ["max_level_trace", "release_max_level_trace"] }
slog = { version = "~2.1", features = [
"max_level_trace",
"release_max_level_trace",
] }

epic_miner_core = { path = "../core", version = "0.1.0" }
epic_miner_util = { path = "../util", version = "1.0.2" }
randomx = { path = "../randomx-rust", version = "0.1.0" }
randomx = { git = "https://github.com/EpicCash/randomx-rust.git", version = "0.1.1" }
1 change: 0 additions & 1 deletion randomx-rust
Open in desktop
Submodule randomx-rust deleted from 1f55ab