Allow compiling in Arduino IDE

city41 · Oct 3, 2018 · d5c6eb4 · d5c6eb4
1 parent f974f95
commit d5c6eb4
Show file tree

Hide file tree

Showing 56 changed files with 27 additions and 169 deletions.
diff --git a/Makefile b/Makefile
@@ -0,0 +1,22 @@
+CPPFLAGS += -DSERIAL_LOG=0
+
+ARDUINO_DIR = $(HOME)/.arduino_ide
+ARDMK_DIR = $(HOME)/.arduino_mk
+BOARD_TAG = leonardo
+
+LOCAL_CPP_SRCS = $(wildcard src/*.cpp) $(wildcard src/entities/*.cpp)
+
+include $(ARDMK_DIR)/Arduino.mk
+
+emu: build-leonardo/ardynia.hex
+	pabe build-leonardo/ardynia.hex
+
+bmp:
+	node ./bmptool/ --src spritePngs --dest src/spriteBitmaps.h --type combined && \
+    node ./bmptool/ --src tilePngs --dest src/tileBitmaps.h --type bitmap
+
+map:
+	node ./maptool/ -s tiled -o src
+
+strings:
+	node ./stringtool/ -s strings.json -o src/strings.h
diff --git a/src/arduzel.ino → ardynia.ino b/src/arduzel.ino → ardynia.ino
@@ -3,11 +3,11 @@
 #include <ArduboyPlaytune.h>
 #include <math.h>
 
-#include "game.h"
-#include "renderer.h"
-#include "util.h"
-#include "sfx.h"
-#include "tileBitmaps.h"
+#include "src/game.h"
+#include "src/renderer.h"
+#include "src/util.h"
+#include "src/sfx.h"
+#include "src/tileBitmaps.h"
 
 Arduboy2Base arduboy;
 ArduboyPlaytune tones(arduboy.audio.enabled);

diff --git a/src/spritePngs/bat_8x8.png → spritePngs/bat_8x8.png b/src/spritePngs/bat_8x8.png → spritePngs/bat_8x8.png
diff --git a/src/spritePngs/blobMother_15x16.png → spritePngs/blobMother_15x16.png b/src/spritePngs/blobMother_15x16.png → spritePngs/blobMother_15x16.png
diff --git a/src/spritePngs/blob_8x8.png → spritePngs/blob_8x8.png b/src/spritePngs/blob_8x8.png → spritePngs/blob_8x8.png
diff --git a/src/spritePngs/bomb_8x8.png → spritePngs/bomb_8x8.png b/src/spritePngs/bomb_8x8.png → spritePngs/bomb_8x8.png
diff --git a/src/spritePngs/boomerang_8x8.png → spritePngs/boomerang_8x8.png b/src/spritePngs/boomerang_8x8.png → spritePngs/boomerang_8x8.png
diff --git a/src/spritePngs/bossKey_6x8.png → spritePngs/bossKey_6x8.png b/src/spritePngs/bossKey_6x8.png → spritePngs/bossKey_6x8.png
diff --git a/src/spritePngs/deathPoof_8x8.png → spritePngs/deathPoof_8x8.png b/src/spritePngs/deathPoof_8x8.png → spritePngs/deathPoof_8x8.png
diff --git a/src/spritePngs/ghost_8x16.png → spritePngs/ghost_8x16.png b/src/spritePngs/ghost_8x16.png → spritePngs/ghost_8x16.png
diff --git a/src/spritePngs/giantBat_16x16.png → spritePngs/giantBat_16x16.png b/src/spritePngs/giantBat_16x16.png → spritePngs/giantBat_16x16.png
diff --git a/src/spritePngs/happyFace_6x8.png → spritePngs/happyFace_6x8.png b/src/spritePngs/happyFace_6x8.png → spritePngs/happyFace_6x8.png
diff --git a/src/spritePngs/heart_7x8.png → spritePngs/heart_7x8.png b/src/spritePngs/heart_7x8.png → spritePngs/heart_7x8.png
diff --git a/src/spritePngs/key_3x8.png → spritePngs/key_3x8.png b/src/spritePngs/key_3x8.png → spritePngs/key_3x8.png
diff --git a/src/spritePngs/map_8x8.png → spritePngs/map_8x8.png b/src/spritePngs/map_8x8.png → spritePngs/map_8x8.png
diff --git a/src/spritePngs/player_16x16.png → spritePngs/player_16x16.png b/src/spritePngs/player_16x16.png → spritePngs/player_16x16.png
diff --git a/src/spritePngs/ring_7x8.png → spritePngs/ring_7x8.png b/src/spritePngs/ring_7x8.png → spritePngs/ring_7x8.png
diff --git a/src/spritePngs/sadFace_6x8.png → spritePngs/sadFace_6x8.png b/src/spritePngs/sadFace_6x8.png → spritePngs/sadFace_6x8.png
diff --git a/src/spritePngs/skeleton_13x16.png → spritePngs/skeleton_13x16.png b/src/spritePngs/skeleton_13x16.png → spritePngs/skeleton_13x16.png
diff --git a/src/spritePngs/swordIcon_6x16.png → spritePngs/swordIcon_6x16.png b/src/spritePngs/swordIcon_6x16.png → spritePngs/swordIcon_6x16.png
diff --git a/src/spritePngs/sword_15x16.png → spritePngs/sword_15x16.png b/src/spritePngs/sword_15x16.png → spritePngs/sword_15x16.png
diff --git a/src/Makefile b/src/Makefile
diff --git a/src/arduboyBeep.cpp b/src/arduboyBeep.cpp
diff --git a/src/arduboyBeep.h b/src/arduboyBeep.h
diff --git a/src/midi/test.c b/src/midi/test.c
diff --git a/src/midi/test.mid b/src/midi/test.mid
diff --git a/src/strings.json → strings.json b/src/strings.json → strings.json
diff --git a/src/tilePngs/bossLock_16x16.png → tilePngs/bossLock_16x16.png b/src/tilePngs/bossLock_16x16.png → tilePngs/bossLock_16x16.png
diff --git a/src/tilePngs/chest_12x8.png → tilePngs/chest_12x8.png b/src/tilePngs/chest_12x8.png → tilePngs/chest_12x8.png
diff --git a/src/tilePngs/explosion_14x16.png → tilePngs/explosion_14x16.png b/src/tilePngs/explosion_14x16.png → tilePngs/explosion_14x16.png
diff --git a/src/tilePngs/heartDot_3x8.png → tilePngs/heartDot_3x8.png b/src/tilePngs/heartDot_3x8.png → tilePngs/heartDot_3x8.png
diff --git a/src/tilePngs/horizontalTriggerDoor_16x8.png → tilePngs/horizontalTriggerDoor_16x8.png b/src/tilePngs/horizontalTriggerDoor_16x8.png → tilePngs/horizontalTriggerDoor_16x8.png
diff --git a/src/tilePngs/hudBFrame_5x8.png → tilePngs/hudBFrame_5x8.png b/src/tilePngs/hudBFrame_5x8.png → tilePngs/hudBFrame_5x8.png
diff --git a/src/tilePngs/lock_16x16.png → tilePngs/lock_16x16.png b/src/tilePngs/lock_16x16.png → tilePngs/lock_16x16.png
diff --git a/src/tilePngs/logo_16x8.png → tilePngs/logo_16x8.png b/src/tilePngs/logo_16x8.png → tilePngs/logo_16x8.png
diff --git a/src/tilePngs/map_16x16.png → tilePngs/map_16x16.png b/src/tilePngs/map_16x16.png → tilePngs/map_16x16.png
diff --git a/src/tilePngs/pot_8x8.png → tilePngs/pot_8x8.png b/src/tilePngs/pot_8x8.png → tilePngs/pot_8x8.png
diff --git a/src/tilePngs/projectile_8x8.png → tilePngs/projectile_8x8.png b/src/tilePngs/projectile_8x8.png → tilePngs/projectile_8x8.png
diff --git a/src/tilePngs/secretWall_16x16.png → tilePngs/secretWall_16x16.png b/src/tilePngs/secretWall_16x16.png → tilePngs/secretWall_16x16.png
diff --git a/src/tilePngs/spike_8x8.png → tilePngs/spike_8x8.png b/src/tilePngs/spike_8x8.png → tilePngs/spike_8x8.png
diff --git a/src/tilePngs/squareIcon_3x8.png → tilePngs/squareIcon_3x8.png b/src/tilePngs/squareIcon_3x8.png → tilePngs/squareIcon_3x8.png
diff --git a/src/tilePngs/switch_8x8.png → tilePngs/switch_8x8.png b/src/tilePngs/switch_8x8.png → tilePngs/switch_8x8.png
diff --git a/src/tilePngs/tinyFont_4x8.png → tilePngs/tinyFont_4x8.png b/src/tilePngs/tinyFont_4x8.png → tilePngs/tinyFont_4x8.png
diff --git a/src/tilePngs/titleKey_9x24.png → tilePngs/titleKey_9x24.png b/src/tilePngs/titleKey_9x24.png → tilePngs/titleKey_9x24.png
diff --git a/src/tilePngs/titleText_55x16.png → tilePngs/titleText_55x16.png b/src/tilePngs/titleText_55x16.png → tilePngs/titleText_55x16.png
diff --git a/src/tilePngs/torch_8x8.png → tilePngs/torch_8x8.png b/src/tilePngs/torch_8x8.png → tilePngs/torch_8x8.png
diff --git a/src/tilePngs/verticalTriggerDoor_8x16.png → tilePngs/verticalTriggerDoor_8x16.png b/src/tilePngs/verticalTriggerDoor_8x16.png → tilePngs/verticalTriggerDoor_8x16.png
diff --git a/src/tiled/dungeonColors.png → tiled/dungeonColors.png b/src/tiled/dungeonColors.png → tiled/dungeonColors.png
diff --git a/src/tiled/dungeonOverlay.png → tiled/dungeonOverlay.png b/src/tiled/dungeonOverlay.png → tiled/dungeonOverlay.png
diff --git a/src/tiled/dungeons.json → tiled/dungeons.json b/src/tiled/dungeons.json → tiled/dungeons.json
diff --git a/src/tiled/dungeons.tmx → tiled/dungeons.tmx b/src/tiled/dungeons.tmx → tiled/dungeons.tmx
diff --git a/src/tiled/overworld.json → tiled/overworld.json b/src/tiled/overworld.json → tiled/overworld.json
diff --git a/src/tiled/overworld.png → tiled/overworld.png b/src/tiled/overworld.png → tiled/overworld.png
diff --git a/src/tiled/overworld.tmx → tiled/overworld.tmx b/src/tiled/overworld.tmx → tiled/overworld.tmx
diff --git a/src/tiled/overworld.tsx → tiled/overworld.tsx b/src/tiled/overworld.tsx → tiled/overworld.tsx
diff --git a/src/tiled/tiles.png → tiled/tiles.png b/src/tiled/tiles.png → tiled/tiles.png