| summaryrefslogtreecommitdiff |
diff options
| author | nsensfel <SpamShield0@noot-noot.org> | 2018-08-28 17:05:26 +0200 |
|---|---|---|
| committer | nsensfel <SpamShield0@noot-noot.org> | 2018-08-28 17:05:26 +0200 |
| commit | 7ac984d3f88f8cf0352830fabaadce362b4271d5 (patch) | |
| tree | ff39ac7ddbf121be05314abc3c3318f36d05ee39 | |
| parent | b3fd9613c298e1af44f025d9d95021eec8c72a59 (diff) | |
Starting to add omnimods to the client.
| -rw-r--r-- | mk/preprocessor.mk | 3 | ||||
| -rw-r--r-- | src/asset/www/data/armors.json.m4 | 1 | ||||
| -rw-r--r-- | src/asset/www/data/glyph_boards.json.m4 | 7 | ||||
| -rw-r--r-- | src/asset/www/data/glyphs.json.m4 | 7 | ||||
| -rw-r--r-- | src/asset/www/data/tile_patterns.json.m4 | 1 | ||||
| -rw-r--r-- | src/asset/www/data/tiles.json.m4 | 1 | ||||
| -rw-r--r-- | src/asset/www/data/weapons.json.m4 | 1 |
7 files changed, 16 insertions, 5 deletions
diff --git a/mk/preprocessor.mk b/mk/preprocessor.mk index 9046fb0..028e020 100644 --- a/mk/preprocessor.mk +++ b/mk/preprocessor.mk @@ -10,7 +10,8 @@ PREPROCESSOR_FILES = $(shell find ${CURDIR} -name "*.m4") PREPROCESSED_FILES = $(patsubst %.m4,%,$(PREPROCESSOR_FILES)) MAKEFILE_TO_M4 = \ - --define=__MAKEFILE_DATA_DIR=$(DATA_DIR) + --define=__MAKEFILE_DATA_DIR=$(DATA_DIR) \ + --define=__CODE_STYLE=json ################################################################################ ## SANITY CHECKS ############################################################### diff --git a/src/asset/www/data/armors.json.m4 b/src/asset/www/data/armors.json.m4 index 2c34772..f79eb3b 100644 --- a/src/asset/www/data/armors.json.m4 +++ b/src/asset/www/data/armors.json.m4 @@ -1,6 +1,5 @@ [ m4_include(__MAKEFILE_DATA_DIR/armor/global.m4.conf)m4_dnl -__ARMOR_USE_JSON_STYLE m4_include(__MAKEFILE_DATA_DIR/armor/basic.m4d)m4_dnl { "msg": "okay" diff --git a/src/asset/www/data/glyph_boards.json.m4 b/src/asset/www/data/glyph_boards.json.m4 new file mode 100644 index 0000000..6b60fa9 --- /dev/null +++ b/src/asset/www/data/glyph_boards.json.m4 @@ -0,0 +1,7 @@ +[ +m4_include(__MAKEFILE_DATA_DIR/glyph_board/global.m4.conf)m4_dnl +m4_include(__MAKEFILE_DATA_DIR/glyph_board/basic.m4d)m4_dnl + { + "msg": "okay" + } +] diff --git a/src/asset/www/data/glyphs.json.m4 b/src/asset/www/data/glyphs.json.m4 new file mode 100644 index 0000000..362c2c0 --- /dev/null +++ b/src/asset/www/data/glyphs.json.m4 @@ -0,0 +1,7 @@ +[ +m4_include(__MAKEFILE_DATA_DIR/glyph/global.m4.conf)m4_dnl +m4_include(__MAKEFILE_DATA_DIR/glyph/basic.m4d)m4_dnl + { + "msg": "okay" + } +] diff --git a/src/asset/www/data/tile_patterns.json.m4 b/src/asset/www/data/tile_patterns.json.m4 index 30bea4e..94361d1 100644 --- a/src/asset/www/data/tile_patterns.json.m4 +++ b/src/asset/www/data/tile_patterns.json.m4 @@ -1,6 +1,5 @@ [ m4_include(__MAKEFILE_DATA_DIR/tile/pattern/global.m4.conf)m4_dnl -__TILE_PATTERN_USE_JSON_STYLE m4_include(__MAKEFILE_DATA_DIR/tile/pattern/frontier.m4d)m4_dnl { "msg": "okay" diff --git a/src/asset/www/data/tiles.json.m4 b/src/asset/www/data/tiles.json.m4 index 641a80f..7eb6a4b 100644 --- a/src/asset/www/data/tiles.json.m4 +++ b/src/asset/www/data/tiles.json.m4 @@ -1,6 +1,5 @@ [ m4_include(__MAKEFILE_DATA_DIR/tile/global.m4.conf)m4_dnl -__TILE_CLASS_USE_JSON_STYLE m4_include(__MAKEFILE_DATA_DIR/tile/error.m4d)m4_dnl m4_include(__MAKEFILE_DATA_DIR/tile/grassland.m4d)m4_dnl m4_include(__MAKEFILE_DATA_DIR/tile/mud.m4d)m4_dnl diff --git a/src/asset/www/data/weapons.json.m4 b/src/asset/www/data/weapons.json.m4 index 8445871..713c5f6 100644 --- a/src/asset/www/data/weapons.json.m4 +++ b/src/asset/www/data/weapons.json.m4 @@ -1,6 +1,5 @@ [ m4_include(__MAKEFILE_DATA_DIR/weapon/global.m4.conf)m4_dnl -__WEAPON_USE_JSON_STYLE m4_include(__MAKEFILE_DATA_DIR/weapon/basic.m4d)m4_dnl { "msg": "okay" |