survivor

commit

0583e29df4d25592f6311137faca04dbcc14e82e

parent

23ec563928c1b01107aaa54592f26bd7f2f07111

Author

Tobias Bengfort <tobias.bengfort@posteo.de>

Date

2023-02-19 11:23

mv ppm to proper crate location

Diffstat

19 files changed, 3 insertions, 3 deletions

diff --git a/Makefile b/Makefile

@@ -5,5 +5,5 @@ survivor: src/main.rs src/input.rs src/random.rs src/term.rs src/enemies.rs src/
    5     5 lib%.rlib: src/%.rs
    6     6 	rustc $< --crate-type lib
    7     7 
    8    -1 libppm.so: ppm.rs
    9    -1 	rustc ppm.rs --crate-type proc-macro
   -1     8 libppm.so: ppm/src/lib.rs
   -1     9 	rustc ppm/src/lib.rs --crate-type proc-macro --crate-name=ppm

diff --git a/ppm/bat.ppm b/img/bat.ppm

diff --git a/ppm/bat2.ppm b/img/bat2.ppm

diff --git a/ppm/crawl.ppm b/img/crawl.ppm

diff --git a/ppm/diamond.ppm b/img/diamond.ppm

diff --git a/ppm/eye.ppm b/img/eye.ppm

diff --git a/ppm/ghost.ppm b/img/ghost.ppm

diff --git a/ppm/hero.ppm b/img/hero.ppm

diff --git a/ppm/hood.ppm b/img/hood.ppm

diff --git a/ppm/hood2.ppm b/img/hood2.ppm

diff --git a/ppm/mummy.ppm b/img/mummy.ppm

diff --git a/ppm/plantguy.ppm b/img/plantguy.ppm

diff --git a/ppm/raddish.ppm b/img/raddish.ppm

diff --git a/ppm/shadow.ppm b/img/shadow.ppm

diff --git a/ppm/skeleton.ppm b/img/skeleton.ppm

diff --git a/ppm/skeleton2.ppm b/img/skeleton2.ppm

diff --git a/ppm/snake.ppm b/img/snake.ppm

diff --git a/ppm/zombie.ppm b/img/zombie.ppm

diff --git a/ppm.rs b/ppm/src/lib.rs

@@ -24,7 +24,7 @@ fn group(items: Vec<TokenTree>) -> TokenTree {
   24    24 pub fn include_ppm(input: TokenStream) -> TokenStream {
   25    25     let s = input.into_iter().next().unwrap().to_string();
   26    26     let name = s.strip_prefix('"').unwrap().strip_suffix('"').unwrap();
   27    -1     let p = format!("ppm/{}.ppm", name);
   -1    27     let p = format!("img/{}.ppm", name);
   28    28 
   29    29     let path = std::path::Path::new(&p);
   30    30     let file = File::open(path).unwrap();