Merge https://github.com/MEGA65/open-roms

.gitignore

@@ -5,7 +5,6 @@ kernal_hybrid.rom
 
 # Compilation related files
 
-assembler/KickAss*
 build/*
 
 # Input to the similarity tool - copyrighted material, we can't check it in!

Makefile

@@ -80,7 +80,7 @@ all:
 	$(MAKE) -j64 --output-sync=target $(STD_TARGET_LIST) $(EXT_TARGET_LIST)
 
 clean:
-	@rm -rf build
+	@rm -rf build c64/basic/combined.s c64/kernal/combined.s
 
 updatebin:
 	$(MAKE) -j64 --output-sync=target $(STD_TARGET_LIST) $(TOOL_RELEASE)

assembler/KickAss.cfg

@@ -0,0 +1,3 @@
+# These are the defaults - not needed for Open ROMs build system
+# -showmem
+# -symbolfile

assembler/LICENSE

@@ -0,0 +1,3 @@
+KickAssembler is NOT LGPL:
+
+http://theweb.dk/KickAssembler/Main.html#frontpage

assembler/README.TXT

@@ -1 +0,0 @@
-Put KickAss.jar and KickAss.cfg into this directory.