moved scripts and editor to dev_tools folder, added clean option to t…

…he makefile
jrs0ul · Aug 10, 2024 · 0bd0c01 · 0bd0c01
1 parent 1e878cf
commit 0bd0c01
Show file tree

Hide file tree

Showing 57 changed files with 18 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -1,17 +1,19 @@
+.PHONY: all clean ntsc pal
+
 all: ntsc pal
 
 PalName := Cold\ \&\ Starving\(Europe\)
 NtscName := Cold\ \&\ Starving\(USA,\ Japan\)
 Compress := lz4 -9 -f -B4 --no-frame-crc
 
 ifeq ($(OS), Windows_NT)
-	RM = del /Q /F src\*.o
+	RM = del /Q /F
 else
-	RM = rm -rf src/*.o
+	RM = rm -rf
 endif
 
 define prepare_content
-	python CropMaps.py
+	python dev_tools/CropMaps.py
 	$(Compress) src/intro.chr src/intro.lz4
 	$(Compress) src/title.chr src/title.lz4
 	$(Compress) src/cave_bg_tiles.chr src/cave_bg_tiles.lz4
@@ -28,19 +30,27 @@ define prepare_content
 	$(Compress) src/crashed_plane_tiles.chr src/crashed_plane_tiles.lz4
 	$(Compress) src/title_tiles.chr src/title_tiles.lz4
 	$(Compress) src/gameover_tiles.chr src/gameover_tiles.lz4
-	python CropLZ4bytes.py
+	python dev_tools/CropLZ4bytes.py
 endef
 
 pal:
 	@$(call prepare_content)
 	ca65 src/game.asm   -DFAMISTUDIO_CFG_PAL_SUPPORT=1  -g -o src/game.o
 	ld65 -o $(PalName).nes -m map.txt -C memory.cfg src/game.o --dbgfile $(PalName).dbg -Ln $(PalName).labels.txt
-	$(RM)
-	python fceux_symbols.py $(PalName)
+	$(RM) src/*.o
+	python dev_tools/fceux_symbols.py $(PalName)
 
 ntsc:
 	@$(call prepare_content)
 	ca65 src/game.asm  -DFAMISTUDIO_CFG_NTSC_SUPPORT=1 -g -o src/game.o
 	ld65 -o $(NtscName).nes -m map.txt -C memory.cfg src/game.o --dbgfile $(NtscName).dbg -Ln $(NtscName).labels.txt
-	$(RM)
-	python fceux_symbols.py $(NtscName)
+	$(RM) src/*.o
+	python dev_tools/fceux_symbols.py $(NtscName)
+
+clean:
+	$(RM) src/data/maps/cropped/*.asm
+	$(RM) src/*.lz4
+	$(RM) *.nl
+	$(RM) *.dbg
+	$(RM) *.labels.txt
+	$(RM) map.txt
diff --git a/art_dev/alien_bg_tiles.bmp b/art_dev/alien_bg_tiles.bmp
diff --git a/art_dev/cave0.bmp b/art_dev/cave0.bmp
diff --git a/art_dev/cave_bg_tiles.bmp b/art_dev/cave_bg_tiles.bmp
diff --git a/art_dev/house_bg_tiles.bmp b/art_dev/house_bg_tiles.bmp
diff --git a/art_dev/location_with_cave.bmp b/art_dev/location_with_cave.bmp
diff --git a/art_dev/mine_0.bmp b/art_dev/mine_0.bmp
diff --git a/art_dev/title_comp.bmp b/art_dev/title_comp.bmp
diff --git a/art_dev/title_comp.xcf b/art_dev/title_comp.xcf
diff --git a/ConvertBytes.py → dev_tools/ConvertBytes.py b/ConvertBytes.py → dev_tools/ConvertBytes.py
diff --git a/CropLZ4bytes.py → dev_tools/CropLZ4bytes.py b/CropLZ4bytes.py → dev_tools/CropLZ4bytes.py
diff --git a/CropMaps.py → dev_tools/CropMaps.py b/CropMaps.py → dev_tools/CropMaps.py
diff --git a/editor/.sconsign.dblite → dev_tools/editor/.sconsign.dblite b/editor/.sconsign.dblite → dev_tools/editor/.sconsign.dblite
diff --git a/editor/NESed → dev_tools/editor/NESed b/editor/NESed → dev_tools/editor/NESed
diff --git a/editor/SConstruct → dev_tools/editor/SConstruct b/editor/SConstruct → dev_tools/editor/SConstruct
diff --git a/dev_tools/editor/diagonalSpeedCalc b/dev_tools/editor/diagonalSpeedCalc
diff --git a/editor/diagonalSpeedCalc.cpp → dev_tools/editor/diagonalSpeedCalc.cpp b/editor/diagonalSpeedCalc.cpp → dev_tools/editor/diagonalSpeedCalc.cpp
diff --git a/editor/maps/field_bg_c.asm → dev_tools/editor/maps/field_bg_c.asm b/editor/maps/field_bg_c.asm → dev_tools/editor/maps/field_bg_c.asm
diff --git a/editor/maps/mapas3.map → dev_tools/editor/maps/mapas3.map b/editor/maps/mapas3.map → dev_tools/editor/maps/mapas3.map
diff --git a/editor/maps/mapas3C.map → dev_tools/editor/maps/mapas3C.map b/editor/maps/mapas3C.map → dev_tools/editor/maps/mapas3C.map
diff --git a/editor/nesed.ini → dev_tools/editor/nesed.ini b/editor/nesed.ini → dev_tools/editor/nesed.ini
diff --git a/editor/obj/.gitignore → dev_tools/editor/obj/.gitignore b/editor/obj/.gitignore → dev_tools/editor/obj/.gitignore
diff --git a/editor/obj/.lol → dev_tools/editor/obj/.lol b/editor/obj/.lol → dev_tools/editor/obj/.lol
diff --git a/editor/pics/buttons.tga → dev_tools/editor/pics/buttons.tga b/editor/pics/buttons.tga → dev_tools/editor/pics/buttons.tga
diff --git a/editor/pics/chars.tga → dev_tools/editor/pics/chars.tga b/editor/pics/chars.tga → dev_tools/editor/pics/chars.tga
diff --git a/editor/pics/clist.txt → dev_tools/editor/pics/clist.txt b/editor/pics/clist.txt → dev_tools/editor/pics/clist.txt
diff --git a/editor/pics/pointer.tga → dev_tools/editor/pics/pointer.tga b/editor/pics/pointer.tga → dev_tools/editor/pics/pointer.tga
diff --git a/editor/src/Button.cpp → dev_tools/editor/src/Button.cpp b/editor/src/Button.cpp → dev_tools/editor/src/Button.cpp
diff --git a/editor/src/Button.h → dev_tools/editor/src/Button.h b/editor/src/Button.h → dev_tools/editor/src/Button.h
diff --git a/editor/src/CIniFile.cpp → dev_tools/editor/src/CIniFile.cpp b/editor/src/CIniFile.cpp → dev_tools/editor/src/CIniFile.cpp
diff --git a/editor/src/CIniFile.h → dev_tools/editor/src/CIniFile.h b/editor/src/CIniFile.h → dev_tools/editor/src/CIniFile.h
diff --git a/editor/src/Colors.h → dev_tools/editor/src/Colors.h b/editor/src/Colors.h → dev_tools/editor/src/Colors.h
diff --git a/editor/src/DArray.h → dev_tools/editor/src/DArray.h b/editor/src/DArray.h → dev_tools/editor/src/DArray.h
diff --git a/editor/src/Extensions.cpp → dev_tools/editor/src/Extensions.cpp b/editor/src/Extensions.cpp → dev_tools/editor/src/Extensions.cpp
diff --git a/editor/src/Extensions.h → dev_tools/editor/src/Extensions.h b/editor/src/Extensions.h → dev_tools/editor/src/Extensions.h
diff --git a/editor/src/Image.cpp → dev_tools/editor/src/Image.cpp b/editor/src/Image.cpp → dev_tools/editor/src/Image.cpp
diff --git a/editor/src/Image.h → dev_tools/editor/src/Image.h b/editor/src/Image.h → dev_tools/editor/src/Image.h
diff --git a/editor/src/Map.cpp → dev_tools/editor/src/Map.cpp b/editor/src/Map.cpp → dev_tools/editor/src/Map.cpp
diff --git a/editor/src/Map.h → dev_tools/editor/src/Map.h b/editor/src/Map.h → dev_tools/editor/src/Map.h
diff --git a/editor/src/Matrix.cpp → dev_tools/editor/src/Matrix.cpp b/editor/src/Matrix.cpp → dev_tools/editor/src/Matrix.cpp
diff --git a/editor/src/Matrix.h → dev_tools/editor/src/Matrix.h b/editor/src/Matrix.h → dev_tools/editor/src/Matrix.h
diff --git a/editor/src/Shader.cpp → dev_tools/editor/src/Shader.cpp b/editor/src/Shader.cpp → dev_tools/editor/src/Shader.cpp
diff --git a/editor/src/Shader.h → dev_tools/editor/src/Shader.h b/editor/src/Shader.h → dev_tools/editor/src/Shader.h
diff --git a/editor/src/ShaderProgram.cpp → dev_tools/editor/src/ShaderProgram.cpp b/editor/src/ShaderProgram.cpp → dev_tools/editor/src/ShaderProgram.cpp
diff --git a/editor/src/ShaderProgram.h → dev_tools/editor/src/ShaderProgram.h b/editor/src/ShaderProgram.h → dev_tools/editor/src/ShaderProgram.h
diff --git a/editor/src/TextureLoader.cpp → dev_tools/editor/src/TextureLoader.cpp b/editor/src/TextureLoader.cpp → dev_tools/editor/src/TextureLoader.cpp
diff --git a/editor/src/TextureLoader.h → dev_tools/editor/src/TextureLoader.h b/editor/src/TextureLoader.h → dev_tools/editor/src/TextureLoader.h
diff --git a/editor/src/Utils.cpp → dev_tools/editor/src/Utils.cpp b/editor/src/Utils.cpp → dev_tools/editor/src/Utils.cpp
diff --git a/editor/src/Utils.h → dev_tools/editor/src/Utils.h b/editor/src/Utils.h → dev_tools/editor/src/Utils.h
diff --git a/editor/src/Vectors.cpp → dev_tools/editor/src/Vectors.cpp b/editor/src/Vectors.cpp → dev_tools/editor/src/Vectors.cpp
diff --git a/editor/src/Vectors.h → dev_tools/editor/src/Vectors.h b/editor/src/Vectors.h → dev_tools/editor/src/Vectors.h
diff --git a/editor/src/audio/OggStream.cpp → dev_tools/editor/src/audio/OggStream.cpp b/editor/src/audio/OggStream.cpp → dev_tools/editor/src/audio/OggStream.cpp
diff --git a/editor/src/audio/OggStream.h → dev_tools/editor/src/audio/OggStream.h b/editor/src/audio/OggStream.h → dev_tools/editor/src/audio/OggStream.h
diff --git a/editor/src/audio/SoundSystem.cpp → dev_tools/editor/src/audio/SoundSystem.cpp b/editor/src/audio/SoundSystem.cpp → dev_tools/editor/src/audio/SoundSystem.cpp
diff --git a/editor/src/audio/SoundSystem.h → dev_tools/editor/src/audio/SoundSystem.h b/editor/src/audio/SoundSystem.h → dev_tools/editor/src/audio/SoundSystem.h
diff --git a/editor/src/main.cpp → dev_tools/editor/src/main.cpp b/editor/src/main.cpp → dev_tools/editor/src/main.cpp
diff --git a/fceux_symbols.py → dev_tools/fceux_symbols.py b/fceux_symbols.py → dev_tools/fceux_symbols.py