Preproc py + incbin to include

.gitignore

@@ -1,6 +1,7 @@
 /src/**/*.s
 /data/*
 /sound/direct_sound_samples/*
+/include/extracted/*
 
 *.gba
 *.gba.lz

Makefile

@@ -99,7 +99,7 @@ include make_tools.mk
 GBAFIX = $(TOOLS_DIR)/gbafix/gbafix
 PYTHON = python3
 EXTRACTOR = $(PYTHON) $(TOOLS_DIR)/extractor.py
-PREPROC = $(TOOLS_DIR)/preproc/preproc
+PREPROC = $(PYTHON) $(TOOLS_DIR)/preproc.py
 
 # Flags
 ASFLAGS += -mcpu=arm7tdmi
@@ -202,6 +202,8 @@ ifeq ($(DATA),1)
 	$Q$(RM) -r data
 	$(MSG) RM sound/direct_sound_samples
 	$Q$(RM) -r sound/direct_sound_samples
+	$(MSG) RM include/extracted
+	$Q$(RM) -r include/extracted
 endif
 	$(MSG) RM linker.ld.pp
 	$Q$(RM) linker.ld.pp

include/macros.h

@@ -574,109 +574,6 @@
  */
 #define SHIFT_JIS(x) {0}
 
-/**
- * @private
- * @brief Dummy macro for preproc, do not use
- * 
- */
-#define INCBIN(...) {0}
-
-/**
- * @brief Includes a binary file as an array of @c u8
- * 
- * @param path File path
- */
-#define INCBIN_U8(path)   INCBIN(path)
-
-/**
- * @brief Includes a binary file as an array of @c u16
- * 
- * @param path File path
- */
-#define INCBIN_U16(path)  INCBIN(path)
-
-/**
- * @brief Includes a binary file as an array of @c u32
- * 
- * @param path File path
- */
-#define INCBIN_U32(path)  INCBIN(path)
-
-/**
- * @brief Includes a binary file as an array of @c s8
- * 
- * @param path File path
- */
-#define INCBIN_S8(path)   INCBIN(path)
-
-/**
- * @brief Includes a binary file as an array of @c s8
- * 
- * @param path File path
- */
-#define INCBIN_S16(path)  INCBIN(path)
-
-/**
- * @brief Includes a binary file as an array of @c s32
- * 
- * @param path File path
- */
-#define INCBIN_S32(path)  INCBIN(path)
-
-/**
- * @brief Includes a binary file as an array of @c u8
- * 
- * Does not add curly braces
- * 
- * @param path File path
- */
-#define _INCBIN_U8(path)  INCBIN(path)
-
-/**
- * @brief Includes a binary file as an array of @c u16
- * 
- * Does not add curly braces
- * 
- * @param path File path
- */
-#define _INCBIN_U16(path) INCBIN(path)
-
-/**
- * @brief Includes a binary file as an array of @c u32
- * 
- * Does not add curly braces
- * 
- * @param path File path
- */
-#define _INCBIN_U32(path) INCBIN(path)
-
-/**
- * @brief Includes a binary file as an array of @c s8
- * 
- * Does not add curly braces
- * 
- * @param path File path
- */
-#define _INCBIN_S8(path)  INCBIN(path)
-
-/**
- * @brief Includes a binary file as an array of @c s16
- * 
- * Does not add curly braces
- * 
- * @param path File path
- */
-#define _INCBIN_S16(path) INCBIN(path)
-
-/**
- * @brief Includes a binary file as an array of @c s32
- * 
- * Does not add curly braces
- * 
- * @param path File path
- */
-#define _INCBIN_S32(path) INCBIN(path)
-
 /**
  * @brief Shorthand to specify that something should be in the .rodata section
  * 

make_tools.mk

@@ -11,7 +11,7 @@ MAKEFLAGS += --no-print-directory
 
 TOOLS_DIR := tools
 # Tool executables to build
-TOOLS := gbafix preproc
+TOOLS := gbafix
 
 TOOLDIRS := $(TOOLS:%=$(TOOLS_DIR)/%)