Added modules and changed makefile locations

mateoconlechuga · mateoconlechuga · commit d89a641b796d · 2017-03-24T02:15:22.000-07:00
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "src/tools/spasm"]
+	path = src/tools/spasm
+	url = https://github.com/alberthdev/spasm-ng
+[submodule "src/tools/convtile"]
+	path = src/tools/convtile
+	url = https://github.com/MattWaltz/convtile
+[submodule "src/tools/convhex"]
+	path = src/tools/convhex
+	url = https://github.com/MattWaltz/convhex
+[submodule "src/tools/convpng"]
+	path = src/tools/convpng
+	url = https://github.com/MattWaltz/convpng
diff --git a/examples/debugging/makefile b/examples/debugging/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/fileio_detect/makefile b/examples/fileio_detect/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/fileio_factorize/makefile b/examples/fileio_factorize/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/fileio_os_vars/makefile b/examples/fileio_os_vars/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/fileio_read_write/makefile b/examples/fileio_read_write/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/fileio_tokens/makefile b/examples/fileio_tokens/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/gfx_buffered_cube/makefile b/examples/gfx_buffered_cube/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/gfx_buffering/makefile b/examples/gfx_buffering/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/gfx_char/makefile b/examples/gfx_char/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/gfx_clipping/makefile b/examples/gfx_clipping/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/gfx_hello_world/makefile b/examples/gfx_hello_world/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/gfx_light_dark/makefile b/examples/gfx_light_dark/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/gfx_shapes_shift/makefile b/examples/gfx_shapes_shift/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/gfx_sprite/makefile b/examples/gfx_sprite/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/gfx_sprite_compress/makefile b/examples/gfx_sprite_compress/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/gfx_sprite_rotate/makefile b/examples/gfx_sprite_rotate/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/gfx_tilemap/makefile b/examples/gfx_tilemap/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/gfx_tilemap_compress/makefile b/examples/gfx_tilemap_compress/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/hello_world/makefile b/examples/hello_world/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/interrupt_counter/makefile b/examples/interrupt_counter/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/interrupt_on/makefile b/examples/interrupt_on/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/keypad_arrows/makefile b/examples/keypad_arrows/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/keypad_interrupt/makefile b/examples/keypad_interrupt/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/keypad_interrupt2/makefile b/examples/keypad_interrupt2/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/keypad_multiple_keys/makefile b/examples/keypad_multiple_keys/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/lcd_fade/makefile b/examples/lcd_fade/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/lcd_fill/makefile b/examples/lcd_fill/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/real_time_clock/makefile b/examples/real_time_clock/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/second_counter/makefile b/examples/second_counter/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/second_counter2/makefile b/examples/second_counter2/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/examples/template/makefile b/examples/template/makefile
@@ -45,4 +45,4 @@ INIT_LOC := D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 #----------------------------
 
-include $(CEDEV)/bin/main_makefile
+include $(CEDEV)/include/make/main_makefile
diff --git a/src/tools/convhex b/src/tools/convhex
@@ -0,0 +1 @@
+Subproject commit 08fd9a3a2a51d044321a5b8be995654bed012987
diff --git a/src/tools/convpng b/src/tools/convpng
@@ -0,0 +1 @@
+Subproject commit 6348507aec1129a9040050db30cb78d186932388
diff --git a/src/tools/convtile b/src/tools/convtile
@@ -0,0 +1 @@
+Subproject commit c8e274293cd700b9f81ecc32d5938326a09d9afd
diff --git a/src/tools/spasm b/src/tools/spasm
@@ -0,0 +1 @@
+Subproject commit 19235dfb28f945d61d8afed7d4f95070dabfd81e
