Quellcode durchsuchen

app: fix build stuff

darkfi vor 1 Jahr
Ursprung
Commit
42f0941c0a
3 geänderte Dateien mit 236 neuen und 165 gelöschten Zeilen
  1. 231 160
      bin/app/Cargo.lock
  2. 1 1
      bin/app/Cargo.toml
  3. 4 4
      bin/app/Makefile

Datei-Diff unterdrückt, da er zu groß ist
+ 231 - 160
bin/app/Cargo.lock


+ 1 - 1
bin/app/Cargo.toml

@@ -15,7 +15,7 @@ miniquad = { git = "https://github.com/not-fl3/miniquad" }
 #harfbuzz-sys = "0.6.1"
 #harfbuzz-sys = { git = "https://github.com/servo/rust-harfbuzz", features = ["bundled"] }
 harfbuzz-sys = { git = "https://github.com/narodnik/rust-harfbuzz2", features = ["bundled"] }
-freetype-rs = { version = "0.38.0", features = ["bundled"] }
+freetype-rs = { version = "0.37.0", features = ["bundled"] }
 
 image = "0.25.5"
 log = { version = "0.4.25", features = ["release_max_level_info"] }

+ 4 - 4
bin/app/Makefile

@@ -73,10 +73,10 @@ dev: $(SRC) fonts
 	-mv target/debug/darkfi-app .
 	./darkfi-app
 
-apk: darkfi-app.apk
-	podman run -v $(shell pwd)/../../:/root/darkfi -w /root/darkfi/bin/app/ -t apk $(CARGO) quad-apk build $(DEV_FEATURES)
-	-mv $(APK) .
-	adb uninstall darkfi.app
+apk: $(SRC) fonts
+	podman run -v $(shell pwd)/../../:/root/darkfi -w /root/darkfi/bin/app/ -t apk cargo quad-apk build $(DEV_FEATURES)
+	-mv $(DEBUG_APK) .
+	-adb uninstall darkfi.app
 	adb install darkfi-app.apk
 	reset
 	adb logcat -c

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.