Browse Source

Get rid of makeheaders

Streetwalrus Einstein 10 years ago
parent
commit
cf65b47c4e
3 changed files with 11 additions and 3 deletions
  1. 1 1
      Makefile
  2. 6 2
      art/Makefile
  3. 4 0
      src/Map.cpp

+ 1 - 1
Makefile

@@ -52,7 +52,7 @@ art/sprites.c: sprites
 
 
 $(ELF): $(OBJS) |sprites
 $(ELF): $(OBJS) |sprites
 	@mkdir -p $(DISTDIR)
 	@mkdir -p $(DISTDIR)
-	@echo "CC: $@"
+	@echo "CCLD: $@"
 	@+$(CC) $(LDFLAGS) $^ -o $(ELF)
 	@+$(CC) $(LDFLAGS) $^ -o $(ELF)
 
 
 $(EXE): $(ELF)
 $(EXE): $(ELF)

+ 6 - 2
art/Makefile

@@ -5,12 +5,16 @@ SPR_DATA = $(patsubst %.png,%.cspr,$(SPRITES))
 	@echo "Converting : $<"
 	@echo "Converting : $<"
 	@ConvertImg --format n2dlib $< > $@
 	@ConvertImg --format n2dlib $< > $@
 
 
-all: | $(SPR_DATA)
+all: sprites.c sprites.h
+	
+sprites.c: | $(SPR_DATA)
 	@echo "Catting sprites into sprites.c"
 	@echo "Catting sprites into sprites.c"
 	@rm -f sprites.c
 	@rm -f sprites.c
 	@cat  $(SPR_DATA)  | sed "s/^static uint16_t/unsigned short/" >> sprites.c
 	@cat  $(SPR_DATA)  | sed "s/^static uint16_t/unsigned short/" >> sprites.c
+
+sprites.h: sprites.c
 	@echo "Making header sprites.h"
 	@echo "Making header sprites.h"
-	@makeheaders sprites.c
+	@cat sprites.c | grep "=" | sed -e "s/ =.*/;/" -e "s/^/extern /" > sprites.h
 
 
 clean:
 clean:
 	rm -f $(SPR_DATA) sprites.c sprites.h
 	rm -f $(SPR_DATA) sprites.c sprites.h

+ 4 - 0
src/Map.cpp

@@ -13,6 +13,10 @@ MAP::Map(int width, int height, unsigned *layer0, unsigned *layer1)
     this->height = height;
     this->height = height;
     this->layer0 = layer0;
     this->layer0 = layer0;
     this->layer1 = layer1;
     this->layer1 = layer1;
+    tinystl::vector<WalrusRPG::Frame> asdf(2);
+    asdf[0] = {2, 20};
+    asdf[1] = {3, 10};
+    tset.add_animation(2, asdf);
 }
 }
 
 
 MAP::~Map()
 MAP::~Map()