diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..79420d4 --- /dev/null +++ b/Makefile @@ -0,0 +1,48 @@ +CLEAN=rm +CLEANARGS=-f +BUILDPATH=build +BUILD=c64-devkit.prg +SOURCEPATH=source +SOURCE=main.asm +COMPILERPATH=compiler/linux +COMPILER=acme +COMPILERREPORT=buildreport +COMPILERSYMBOLS=symbols +COMPILERARGS=-r $(BUILDPATH)/$(COMPILERREPORT) --vicelabels $(BUILDPATH)/$(COMPILERSYMBOLS) --msvc --color --format cbm -v3 --outfile +CRUNCHERPATH=cruncher/linux +CRUNCHER=pucrunch +CRUNCHERARGS=-x0x0801 -c64 -g55 -fshort +EMULATORPATH=emulator/linux +EMULATOR=x64 +EMULATORARGS= +GENOSINEPATH=genosine/linux +GENOSINE=genosine +TABLESPATH=tables +TABLE1=sin1.dat +TABLE1ARGS=256 63 81 0 720 80 3 0 +TABLE2=sin2.dat +TABLE2ARGS=256 0 255 0 180 20 3 1 +TABLE3=sin3.dat +TABLE3ARGS=256 80 255 0 360 60 2 1 +TABLE4=sin4.dat +TABLE4ARGS=256 90 255 0 720 80 1 0 + +all: luts compile crunch run + +clean: + $(CLEAN) $(CLEANARGS) $(BUILDPATH)/* $(TABLESPATH)/* + +luts: + $(GENOSINEPATH)/$(GENOSINE) $(TABLE1ARGS) > $(TABLESPATH)/$(TABLE1) + $(GENOSINEPATH)/$(GENOSINE) $(TABLE2ARGS) > $(TABLESPATH)/$(TABLE2) + $(GENOSINEPATH)/$(GENOSINE) $(TABLE3ARGS) > $(TABLESPATH)/$(TABLE3) + $(GENOSINEPATH)/$(GENOSINE) $(TABLE4ARGS) > $(TABLESPATH)/$(TABLE4) + +compile: + $(COMPILERPATH)/$(COMPILER) $(COMPILERARGS) $(BUILDPATH)/$(BUILD) $(SOURCEPATH)/$(SOURCE) + +crunch: + $(CRUNCHERPATH)/$(CRUNCHER) $(CRUNCHERARGS) $(BUILDPATH)/$(BUILD) $(BUILDPATH)/$(BUILD) + +run: + $(EMULATORPATH)/$(EMULATOR) $(EMULATORARGS) $(BUILDPATH)/$(BUILD) diff --git a/build.bat b/build.bat index 94512c4..d0f68c7 100644 --- a/build.bat +++ b/build.bat @@ -1,27 +1,23 @@ @echo off setlocal EnableDelayedExpansion -SET makedir=mkdir -SET makedirArgs= -SET removedir=rmdir -SET removedirArgs=/S /Q SET clean=del SET cleanArgs=/F /Q SET buildPath=build SET build=c64-devkit.prg SET sourcePath=source -for %%F in (%sourcePath%\*.asm) do call SET sources=%%sources%% "%%F" -SET compilerPath=compiler +SET source=main.asm +SET compilerPath=compiler\win32 SET compiler=acme.exe SET compilerReport=buildreport SET compilerSymbols=symbols SET compilerArgs=-r %buildPath%\%compilerReport% --vicelabels %buildPath%\%compilerSymbols% --msvc --color --format cbm -v3 --outfile -SET cruncherPath=cruncher +SET cruncherPath=cruncher\win32 SET cruncher=pucrunch.exe SET cruncherArgs=-x$0801 -c64 -g55 -fshort -SET emulatorPath=emulator +SET emulatorPath=emulator\win32 SET emulator=x64.exe SET emulatorArgs= -SET genosinePath=genosine +SET genosinePath=genosine\win32 SET genosine=genosine.exe SET tablesPath=tables SET table1=sin1.dat @@ -33,9 +29,6 @@ SET table3Args=256 80 255 0 360 60 2 1 SET table4=sin4.dat SET table4Args=256 90 255 0 720 80 1 0 -IF NOT EXIST %buildPath% %makedir% %makedirArgs% %buildPath% -IF NOT EXIST %tablesPath% %makedir% %makedirArgs% %tablesPath% - %clean% %cleanArgs% %buildPath%\*.* %clean% %cleanArgs% %tablesPath%\*.* @@ -43,6 +36,6 @@ IF NOT EXIST %tablesPath% %makedir% %makedirArgs% %tablesPath% %genosinePath%\%genosine% %table2Args% > %tablesPath%\%table2% %genosinePath%\%genosine% %table3Args% > %tablesPath%\%table3% %genosinePath%\%genosine% %table4Args% > %tablesPath%\%table4% -%compilerPath%\%compiler% %compilerArgs% %buildPath%\%build% %sources% +%compilerPath%\%compiler% %compilerArgs% %buildPath%\%build% %sourcePath%\%source% %cruncherPath%\%cruncher% %cruncherArgs% %buildPath%\%build% %buildPath%\%build% -%emulatorPath%\%emulator% %emulatorArgs% %buildPath%\%build% \ No newline at end of file +%emulatorPath%\%emulator% %emulatorArgs% %buildPath%\%build% diff --git a/build/buildreport b/build/buildreport index 8e01a56..eca8f5b 100644 --- a/build/buildreport +++ b/build/buildreport @@ -1,5 +1,5 @@ -; ******** Source: source\main.asm +; ******** Source: source/main.asm 1 screen = $0400 2 screenScroller = $0400+40*24 3 code = $0801 @@ -34,7 +34,7 @@ 32 *= tables 33 sinTable1: -; ******** Source: tables\sin1.dat +; ******** Source: tables/sin1.dat 1 5000 4848494a4b4c4c4d !byte $48,$48,$49,$4a,$4b,$4c,$4c,$4d 2 5008 4e4e4e4f4f4f4f4e !byte $4e,$4e,$4e,$4f,$4f,$4f,$4f,$4e 3 5010 4e4e4d4d4c4b4b4a !byte $4e,$4e,$4d,$4d,$4c,$4b,$4b,$4a @@ -68,11 +68,11 @@ 31 50f0 4140404040414141 !byte $41,$40,$40,$40,$40,$41,$41,$41 32 50f8 4243434445464747 !byte $42,$43,$43,$44,$45,$46,$47,$47 -; ******** Source: source\main.asm +; ******** Source: source/main.asm 35 36 sinTable2: -; ******** Source: tables\sin2.dat +; ******** Source: tables/sin2.dat 1 5100 9998989897969594 !byte $99,$98,$98,$98,$97,$96,$95,$94 2 5108 9391908e8c8a8886 !byte $93,$91,$90,$8e,$8c,$8a,$88,$86 3 5110 84827f7d7b797775 !byte $84,$82,$7f,$7d,$7b,$79,$77,$75 @@ -106,9 +106,9 @@ 31 51f0 78767472706e6d6b !byte $78,$76,$74,$72,$70,$6e,$6d,$6b 32 51f8 6a69686766666666 !byte $6a,$69,$68,$67,$66,$66,$66,$66 -; ******** Source: source\main.asm +; ******** Source: source/main.asm -; ******** Source: tables\sin2.dat +; ******** Source: tables/sin2.dat 1 5200 9998989897969594 !byte $99,$98,$98,$98,$97,$96,$95,$94 2 5208 9391908e8c8a8886 !byte $93,$91,$90,$8e,$8c,$8a,$88,$86 3 5210 84827f7d7b797775 !byte $84,$82,$7f,$7d,$7b,$79,$77,$75 @@ -142,11 +142,11 @@ 31 52f0 78767472706e6d6b !byte $78,$76,$74,$72,$70,$6e,$6d,$6b 32 52f8 6a69686766666666 !byte $6a,$69,$68,$67,$66,$66,$66,$66 -; ******** Source: source\main.asm +; ******** Source: source/main.asm 39 40 sinTable3: -; ******** Source: tables\sin3.dat +; ******** Source: tables/sin3.dat 1 5300 dcdbdbdad9d8d6d5 !byte $dc,$db,$db,$da,$d9,$d8,$d6,$d5 2 5308 d3d0cecbc8c5c2be !byte $d3,$d0,$ce,$cb,$c8,$c5,$c2,$be 3 5310 bbb7b3b0aca8a4a0 !byte $bb,$b7,$b3,$b0,$ac,$a8,$a4,$a0 @@ -180,11 +180,11 @@ 31 53f0 bec2c5c8cbced0d3 !byte $be,$c2,$c5,$c8,$cb,$ce,$d0,$d3 32 53f8 d5d6d8d9dadbdbdc !byte $d5,$d6,$d8,$d9,$da,$db,$db,$dc -; ******** Source: source\main.asm +; ******** Source: source/main.asm 42 43 sinTable4: -; ******** Source: tables\sin4.dat +; ******** Source: tables/sin4.dat 1 5400 acb1b6bbbfc4c8cd !byte $ac,$b1,$b6,$bb,$bf,$c4,$c8,$cd 2 5408 d1d5d8dcdfe2e5e7 !byte $d1,$d5,$d8,$dc,$df,$e2,$e5,$e7 3 5410 e9ebecedeeeeeeed !byte $e9,$eb,$ec,$ed,$ee,$ee,$ee,$ed @@ -218,7 +218,7 @@ 31 54f0 717376797c808387 !byte $71,$73,$76,$79,$7c,$80,$83,$87 32 54f8 8b9094999da2a7ac !byte $8b,$90,$94,$99,$9d,$a2,$a7,$ac -; ******** Source: source\main.asm +; ******** Source: source/main.asm 45 46 colorTable: 47 5500 06060e030d070f01 !byte $06,$06,$0e,$03,$0d,$07,$0f,$01 @@ -271,7 +271,7 @@ 94 0835 8dffff sta $ffff 95 96 0838 200070 jsr music - 97 083b 20be0b jsr timerSetup + 97 083b 20a80b jsr timerSetup 98 99 083e a900 lda #$00 100 0840 8d20d0 sta $d020 @@ -331,7 +331,7 @@ 154 0892 a9ff lda #$ff 155 0894 8d19d0 sta $d019 156 - 157 0897 20b30b jsr graphicsMode + 157 0897 20c80b jsr graphicsMode 158 089a 200370 jsr musicPlay 159 089d 200a0b jsr moveSprites 160 08a0 20910b jsr colorCycle @@ -385,7 +385,7 @@ 208 08d7 ea nop 209 08d8 ea nop 210 - 211 08d9 20a80b jsr textMode + 211 08d9 20bd0b jsr textMode 212 213 08dc a900 lda #line1 214 08de 8d12d0 sta $d012 @@ -588,25 +588,31 @@ 411 0ba2 e8 inx 412 0ba3 e024 cpx #36 413 0ba5 d0f2 bne cl - 1 0ba7 60 rts˙textMode: - 2 0ba8 a9c8 lda #%11001000 - 3 0baa 8d16d0 sta $d016 - 4 - 5 0bad a91b lda #%00011011 - 6 0baf 8d11d0 sta $d011 - 7 0bb2 60 rts - 8 - 9 graphicsMode: - 10 0bb3 a9d8 lda #%11011000 - 11 0bb5 8d16d0 sta $d016 - 12 - 13 0bb8 a93b lda #%00111011 - 14 0bba 8d11d0 sta $d011 - 1 0bbd 60 rts˙timerSetup: - 2 0bbe a900 lda #$00 - 3 0bc0 8d0edc sta $dc0e - 4 0bc3 8d0fdc sta $dc0f - 5 0bc6 8d0bdc sta $dc0b - 6 0bc9 8d0adc sta $dc0a - 7 0bcc 8d09dc sta $dc09 - 8 0bcf 8d08dc sta $dc08 + 414 0ba7 60 rts + 415 + 416 timerSetup: + 417 0ba8 a900 lda #$00 + 418 0baa 8d0edc sta $dc0e + 419 0bad 8d0fdc sta $dc0f + 420 0bb0 8d0bdc sta $dc0b + 421 0bb3 8d0adc sta $dc0a + 422 0bb6 8d09dc sta $dc09 + 423 0bb9 8d08dc sta $dc08 + 424 0bbc 60 rts + 425 + 426 textMode: + 427 0bbd a9c8 lda #%11001000 + 428 0bbf 8d16d0 sta $d016 + 429 + 430 0bc2 a91b lda #%00011011 + 431 0bc4 8d11d0 sta $d011 + 432 0bc7 60 rts + 433 + 434 graphicsMode: + 435 0bc8 a9d8 lda #%11011000 + 436 0bca 8d16d0 sta $d016 + 437 + 438 0bcd a93b lda #%00111011 + 439 0bcf 8d11d0 sta $d011 + 440 0bd2 60 rts + 441 diff --git a/build/c64-devkit.prg b/build/c64-devkit.prg index 98fea57..03d8fcb 100644 Binary files a/build/c64-devkit.prg and b/build/c64-devkit.prg differ diff --git a/build/symbols b/build/symbols index baaa805..79bf5e1 100644 --- a/build/symbols +++ b/build/symbols @@ -32,8 +32,8 @@ al C:5100 .sinTable2 al C:5400 .sinTable4 al C:5500 .colorTable al C:0b91 .colorCycle -al C:0bbe .timerSetup -al C:0bb3 .graphicsMode -al C:0ba8 .textMode +al C:0ba8 .timerSetup +al C:0bc8 .graphicsMode +al C:0bbd .textMode al C:0b99 .cl al C:0aa1 .initSprites diff --git a/compiler/linux/acme b/compiler/linux/acme new file mode 100755 index 0000000..2751d46 Binary files /dev/null and b/compiler/linux/acme differ diff --git a/compiler/acme.exe b/compiler/win32/acme.exe similarity index 100% rename from compiler/acme.exe rename to compiler/win32/acme.exe diff --git a/cruncher/linux/pucrunch b/cruncher/linux/pucrunch new file mode 100755 index 0000000..b373d4f Binary files /dev/null and b/cruncher/linux/pucrunch differ diff --git a/cruncher/pucrunch.exe b/cruncher/win32/pucrunch.exe similarity index 100% rename from cruncher/pucrunch.exe rename to cruncher/win32/pucrunch.exe diff --git a/emulator/linux/readme.txt b/emulator/linux/readme.txt new file mode 100644 index 0000000..83ca387 --- /dev/null +++ b/emulator/linux/readme.txt @@ -0,0 +1,3 @@ +Create a symbolic link here called x64 that points to the VICE x64 binary. The default location for this under Debian-based distributions is /usr/bin/x64. + +Or change the Makefile variables EMULATORPATH and EMULATOR. diff --git a/emulator/linux/x64 b/emulator/linux/x64 new file mode 120000 index 0000000..1394312 --- /dev/null +++ b/emulator/linux/x64 @@ -0,0 +1 @@ +/usr/bin/x64 \ No newline at end of file diff --git a/emulator/C64/basic b/emulator/win32/C64/basic similarity index 100% rename from emulator/C64/basic rename to emulator/win32/C64/basic diff --git a/emulator/C64/c64hq.vpl b/emulator/win32/C64/c64hq.vpl similarity index 100% rename from emulator/C64/c64hq.vpl rename to emulator/win32/C64/c64hq.vpl diff --git a/emulator/C64/c64mem.sym b/emulator/win32/C64/c64mem.sym similarity index 100% rename from emulator/C64/c64mem.sym rename to emulator/win32/C64/c64mem.sym diff --git a/emulator/C64/c64s.vpl b/emulator/win32/C64/c64s.vpl similarity index 100% rename from emulator/C64/c64s.vpl rename to emulator/win32/C64/c64s.vpl diff --git a/emulator/C64/ccs64.vpl b/emulator/win32/C64/ccs64.vpl similarity index 100% rename from emulator/C64/ccs64.vpl rename to emulator/win32/C64/ccs64.vpl diff --git a/emulator/C64/chargen b/emulator/win32/C64/chargen similarity index 100% rename from emulator/C64/chargen rename to emulator/win32/C64/chargen diff --git a/emulator/C64/community-colors.vpl b/emulator/win32/C64/community-colors.vpl similarity index 100% rename from emulator/C64/community-colors.vpl rename to emulator/win32/C64/community-colors.vpl diff --git a/emulator/C64/deekay.vpl b/emulator/win32/C64/deekay.vpl similarity index 100% rename from emulator/C64/deekay.vpl rename to emulator/win32/C64/deekay.vpl diff --git a/emulator/C64/default.vrs b/emulator/win32/C64/default.vrs similarity index 100% rename from emulator/C64/default.vrs rename to emulator/win32/C64/default.vrs diff --git a/emulator/C64/edkernal b/emulator/win32/C64/edkernal similarity index 100% rename from emulator/C64/edkernal rename to emulator/win32/C64/edkernal diff --git a/emulator/C64/frodo.vpl b/emulator/win32/C64/frodo.vpl similarity index 100% rename from emulator/C64/frodo.vpl rename to emulator/win32/C64/frodo.vpl diff --git a/emulator/C64/godot.vpl b/emulator/win32/C64/godot.vpl similarity index 100% rename from emulator/C64/godot.vpl rename to emulator/win32/C64/godot.vpl diff --git a/emulator/C64/gskernal b/emulator/win32/C64/gskernal similarity index 100% rename from emulator/C64/gskernal rename to emulator/win32/C64/gskernal diff --git a/emulator/C64/jpchrgen b/emulator/win32/C64/jpchrgen similarity index 100% rename from emulator/C64/jpchrgen rename to emulator/win32/C64/jpchrgen diff --git a/emulator/C64/jpkernal b/emulator/win32/C64/jpkernal similarity index 100% rename from emulator/C64/jpkernal rename to emulator/win32/C64/jpkernal diff --git a/emulator/C64/kernal b/emulator/win32/C64/kernal similarity index 100% rename from emulator/C64/kernal rename to emulator/win32/C64/kernal diff --git a/emulator/C64/pc64.vpl b/emulator/win32/C64/pc64.vpl similarity index 100% rename from emulator/C64/pc64.vpl rename to emulator/win32/C64/pc64.vpl diff --git a/emulator/C64/pepto-ntsc-sony.vpl b/emulator/win32/C64/pepto-ntsc-sony.vpl similarity index 100% rename from emulator/C64/pepto-ntsc-sony.vpl rename to emulator/win32/C64/pepto-ntsc-sony.vpl diff --git a/emulator/C64/pepto-ntsc.vpl b/emulator/win32/C64/pepto-ntsc.vpl similarity index 100% rename from emulator/C64/pepto-ntsc.vpl rename to emulator/win32/C64/pepto-ntsc.vpl diff --git a/emulator/C64/pepto-pal.vpl b/emulator/win32/C64/pepto-pal.vpl similarity index 100% rename from emulator/C64/pepto-pal.vpl rename to emulator/win32/C64/pepto-pal.vpl diff --git a/emulator/C64/pepto-palold.vpl b/emulator/win32/C64/pepto-palold.vpl similarity index 100% rename from emulator/C64/pepto-palold.vpl rename to emulator/win32/C64/pepto-palold.vpl diff --git a/emulator/C64/ptoing.vpl b/emulator/win32/C64/ptoing.vpl similarity index 100% rename from emulator/C64/ptoing.vpl rename to emulator/win32/C64/ptoing.vpl diff --git a/emulator/C64/rgb.vpl b/emulator/win32/C64/rgb.vpl similarity index 100% rename from emulator/C64/rgb.vpl rename to emulator/win32/C64/rgb.vpl diff --git a/emulator/C64/sxkernal b/emulator/win32/C64/sxkernal similarity index 100% rename from emulator/C64/sxkernal rename to emulator/win32/C64/sxkernal diff --git a/emulator/C64/vice.vpl b/emulator/win32/C64/vice.vpl similarity index 100% rename from emulator/C64/vice.vpl rename to emulator/win32/C64/vice.vpl diff --git a/emulator/C64/win_hotkeys.vhk b/emulator/win32/C64/win_hotkeys.vhk similarity index 100% rename from emulator/C64/win_hotkeys.vhk rename to emulator/win32/C64/win_hotkeys.vhk diff --git a/emulator/C64/win_pos.vkm b/emulator/win32/C64/win_pos.vkm similarity index 100% rename from emulator/C64/win_pos.vkm rename to emulator/win32/C64/win_pos.vkm diff --git a/emulator/C64/win_pos_de.vkm b/emulator/win32/C64/win_pos_de.vkm similarity index 100% rename from emulator/C64/win_pos_de.vkm rename to emulator/win32/C64/win_pos_de.vkm diff --git a/emulator/C64/win_shortcuts.vsc b/emulator/win32/C64/win_shortcuts.vsc similarity index 100% rename from emulator/C64/win_shortcuts.vsc rename to emulator/win32/C64/win_shortcuts.vsc diff --git a/emulator/C64/win_sym.vkm b/emulator/win32/C64/win_sym.vkm similarity index 100% rename from emulator/C64/win_sym.vkm rename to emulator/win32/C64/win_sym.vkm diff --git a/emulator/C64/win_sym_de.vkm b/emulator/win32/C64/win_sym_de.vkm similarity index 100% rename from emulator/C64/win_sym_de.vkm rename to emulator/win32/C64/win_sym_de.vkm diff --git a/emulator/C64/win_sym_it.vkm b/emulator/win32/C64/win_sym_it.vkm similarity index 100% rename from emulator/C64/win_sym_it.vkm rename to emulator/win32/C64/win_sym_it.vkm diff --git a/emulator/DRIVES/d1541II b/emulator/win32/DRIVES/d1541II similarity index 100% rename from emulator/DRIVES/d1541II rename to emulator/win32/DRIVES/d1541II diff --git a/emulator/DRIVES/d1571cr b/emulator/win32/DRIVES/d1571cr similarity index 100% rename from emulator/DRIVES/d1571cr rename to emulator/win32/DRIVES/d1571cr diff --git a/emulator/DRIVES/dos1001 b/emulator/win32/DRIVES/dos1001 similarity index 100% rename from emulator/DRIVES/dos1001 rename to emulator/win32/DRIVES/dos1001 diff --git a/emulator/DRIVES/dos1540 b/emulator/win32/DRIVES/dos1540 similarity index 100% rename from emulator/DRIVES/dos1540 rename to emulator/win32/DRIVES/dos1540 diff --git a/emulator/DRIVES/dos1541 b/emulator/win32/DRIVES/dos1541 similarity index 100% rename from emulator/DRIVES/dos1541 rename to emulator/win32/DRIVES/dos1541 diff --git a/emulator/DRIVES/dos1551 b/emulator/win32/DRIVES/dos1551 similarity index 100% rename from emulator/DRIVES/dos1551 rename to emulator/win32/DRIVES/dos1551 diff --git a/emulator/DRIVES/dos1570 b/emulator/win32/DRIVES/dos1570 similarity index 100% rename from emulator/DRIVES/dos1570 rename to emulator/win32/DRIVES/dos1570 diff --git a/emulator/DRIVES/dos1571 b/emulator/win32/DRIVES/dos1571 similarity index 100% rename from emulator/DRIVES/dos1571 rename to emulator/win32/DRIVES/dos1571 diff --git a/emulator/DRIVES/dos1581 b/emulator/win32/DRIVES/dos1581 similarity index 100% rename from emulator/DRIVES/dos1581 rename to emulator/win32/DRIVES/dos1581 diff --git a/emulator/DRIVES/dos2031 b/emulator/win32/DRIVES/dos2031 similarity index 100% rename from emulator/DRIVES/dos2031 rename to emulator/win32/DRIVES/dos2031 diff --git a/emulator/DRIVES/dos2040 b/emulator/win32/DRIVES/dos2040 similarity index 100% rename from emulator/DRIVES/dos2040 rename to emulator/win32/DRIVES/dos2040 diff --git a/emulator/DRIVES/dos3040 b/emulator/win32/DRIVES/dos3040 similarity index 100% rename from emulator/DRIVES/dos3040 rename to emulator/win32/DRIVES/dos3040 diff --git a/emulator/DRIVES/dos4040 b/emulator/win32/DRIVES/dos4040 similarity index 100% rename from emulator/DRIVES/dos4040 rename to emulator/win32/DRIVES/dos4040 diff --git a/emulator/autostart-C64.d64 b/emulator/win32/autostart-C64.d64 similarity index 100% rename from emulator/autostart-C64.d64 rename to emulator/win32/autostart-C64.d64 diff --git a/emulator/autostart-C64SC.d64 b/emulator/win32/autostart-C64SC.d64 similarity index 100% rename from emulator/autostart-C64SC.d64 rename to emulator/win32/autostart-C64SC.d64 diff --git a/emulator/doc/vice.chm b/emulator/win32/doc/vice.chm similarity index 100% rename from emulator/doc/vice.chm rename to emulator/win32/doc/vice.chm diff --git a/emulator/doc/vice.hlp b/emulator/win32/doc/vice.hlp similarity index 100% rename from emulator/doc/vice.hlp rename to emulator/win32/doc/vice.hlp diff --git a/emulator/doc/vice.pdf b/emulator/win32/doc/vice.pdf similarity index 100% rename from emulator/doc/vice.pdf rename to emulator/win32/doc/vice.pdf diff --git a/emulator/fonts/CBM.ttf b/emulator/win32/fonts/CBM.ttf similarity index 100% rename from emulator/fonts/CBM.ttf rename to emulator/win32/fonts/CBM.ttf diff --git a/emulator/fonts/cbm-directory-charset.fon b/emulator/win32/fonts/cbm-directory-charset.fon similarity index 100% rename from emulator/fonts/cbm-directory-charset.fon rename to emulator/win32/fonts/cbm-directory-charset.fon diff --git a/emulator/fonts/vice-cbm.bdf b/emulator/win32/fonts/vice-cbm.bdf similarity index 100% rename from emulator/fonts/vice-cbm.bdf rename to emulator/win32/fonts/vice-cbm.bdf diff --git a/emulator/libgcc_s_seh-1.dll b/emulator/win32/libgcc_s_seh-1.dll similarity index 100% rename from emulator/libgcc_s_seh-1.dll rename to emulator/win32/libgcc_s_seh-1.dll diff --git a/emulator/libstdc++-6.dll b/emulator/win32/libstdc++-6.dll similarity index 100% rename from emulator/libstdc++-6.dll rename to emulator/win32/libstdc++-6.dll diff --git a/emulator/libwinpthread-1.dll b/emulator/win32/libwinpthread-1.dll similarity index 100% rename from emulator/libwinpthread-1.dll rename to emulator/win32/libwinpthread-1.dll diff --git a/emulator/vice.ini b/emulator/win32/vice.ini similarity index 100% rename from emulator/vice.ini rename to emulator/win32/vice.ini diff --git a/emulator/x64.exe b/emulator/win32/x64.exe similarity index 100% rename from emulator/x64.exe rename to emulator/win32/x64.exe diff --git a/emulator/x64sc.exe b/emulator/win32/x64sc.exe similarity index 100% rename from emulator/x64sc.exe rename to emulator/win32/x64sc.exe diff --git a/emulator/zlib1.dll b/emulator/win32/zlib1.dll similarity index 100% rename from emulator/zlib1.dll rename to emulator/win32/zlib1.dll diff --git a/genosine/linux/genosine b/genosine/linux/genosine new file mode 100755 index 0000000..232cfaa Binary files /dev/null and b/genosine/linux/genosine differ diff --git a/genosine/genosine.exe b/genosine/win32/genosine.exe similarity index 100% rename from genosine/genosine.exe rename to genosine/win32/genosine.exe diff --git a/source/main.asm b/source/main.asm index 9f4fcc8..8f4c981 100644 --- a/source/main.asm +++ b/source/main.asm @@ -94,7 +94,7 @@ infoText: sta $ffff jsr music - jsr timerSetup + jsr timerSetup lda #$00 sta $d020 @@ -411,4 +411,31 @@ cl: inx cpx #36 bne cl - rts \ No newline at end of file + rts + +timerSetup: + lda #$00 + sta $dc0e + sta $dc0f + sta $dc0b + sta $dc0a + sta $dc09 + sta $dc08 + rts + +textMode: + lda #%11001000 + sta $d016 + + lda #%00011011 + sta $d011 + rts + +graphicsMode: + lda #%11011000 + sta $d016 + + lda #%00111011 + sta $d011 + rts + diff --git a/source/screen.asm b/source/screen.asm deleted file mode 100644 index e0754c0..0000000 --- a/source/screen.asm +++ /dev/null @@ -1,15 +0,0 @@ -textMode: - lda #%11001000 - sta $d016 - - lda #%00011011 - sta $d011 - rts - -graphicsMode: - lda #%11011000 - sta $d016 - - lda #%00111011 - sta $d011 - rts \ No newline at end of file diff --git a/source/timer.asm b/source/timer.asm deleted file mode 100644 index 2112e6c..0000000 --- a/source/timer.asm +++ /dev/null @@ -1,9 +0,0 @@ -timerSetup: - lda #$00 - sta $dc0e - sta $dc0f - sta $dc0b - sta $dc0a - sta $dc09 - sta $dc08 - rts \ No newline at end of file diff --git a/tools/GangEd2-Beta1/Bin/C64Chars.bin b/tools/win32/GangEd2-Beta1/Bin/C64Chars.bin similarity index 100% rename from tools/GangEd2-Beta1/Bin/C64Chars.bin rename to tools/win32/GangEd2-Beta1/Bin/C64Chars.bin diff --git a/tools/GangEd2-Beta1/Bin/C64Raw.bin b/tools/win32/GangEd2-Beta1/Bin/C64Raw.bin similarity index 100% rename from tools/GangEd2-Beta1/Bin/C64Raw.bin rename to tools/win32/GangEd2-Beta1/Bin/C64Raw.bin diff --git a/tools/GangEd2-Beta1/GangEd.exe b/tools/win32/GangEd2-Beta1/GangEd.exe similarity index 100% rename from tools/GangEd2-Beta1/GangEd.exe rename to tools/win32/GangEd2-Beta1/GangEd.exe diff --git a/tools/GangEd2-Beta1/Help/ganged_help.chm b/tools/win32/GangEd2-Beta1/Help/ganged_help.chm similarity index 100% rename from tools/GangEd2-Beta1/Help/ganged_help.chm rename to tools/win32/GangEd2-Beta1/Help/ganged_help.chm diff --git a/tools/GangEd2-Beta1/bmpview.prg b/tools/win32/GangEd2-Beta1/bmpview.prg similarity index 100% rename from tools/GangEd2-Beta1/bmpview.prg rename to tools/win32/GangEd2-Beta1/bmpview.prg diff --git a/tools/pixcen/Pixcen.exe b/tools/win32/pixcen/Pixcen.exe similarity index 100% rename from tools/pixcen/Pixcen.exe rename to tools/win32/pixcen/Pixcen.exe diff --git a/tools/vchar64/D3Dcompiler_47.dll b/tools/win32/vchar64/D3Dcompiler_47.dll similarity index 100% rename from tools/vchar64/D3Dcompiler_47.dll rename to tools/win32/vchar64/D3Dcompiler_47.dll diff --git a/tools/vchar64/Qt5Core.dll b/tools/win32/vchar64/Qt5Core.dll similarity index 100% rename from tools/vchar64/Qt5Core.dll rename to tools/win32/vchar64/Qt5Core.dll diff --git a/tools/vchar64/Qt5Gui.dll b/tools/win32/vchar64/Qt5Gui.dll similarity index 100% rename from tools/vchar64/Qt5Gui.dll rename to tools/win32/vchar64/Qt5Gui.dll diff --git a/tools/vchar64/Qt5Network.dll b/tools/win32/vchar64/Qt5Network.dll similarity index 100% rename from tools/vchar64/Qt5Network.dll rename to tools/win32/vchar64/Qt5Network.dll diff --git a/tools/vchar64/Qt5Svg.dll b/tools/win32/vchar64/Qt5Svg.dll similarity index 100% rename from tools/vchar64/Qt5Svg.dll rename to tools/win32/vchar64/Qt5Svg.dll diff --git a/tools/vchar64/Qt5Widgets.dll b/tools/win32/vchar64/Qt5Widgets.dll similarity index 100% rename from tools/vchar64/Qt5Widgets.dll rename to tools/win32/vchar64/Qt5Widgets.dll diff --git a/tools/vchar64/bearer/qgenericbearer.dll b/tools/win32/vchar64/bearer/qgenericbearer.dll similarity index 100% rename from tools/vchar64/bearer/qgenericbearer.dll rename to tools/win32/vchar64/bearer/qgenericbearer.dll diff --git a/tools/vchar64/bearer/qnativewifibearer.dll b/tools/win32/vchar64/bearer/qnativewifibearer.dll similarity index 100% rename from tools/vchar64/bearer/qnativewifibearer.dll rename to tools/win32/vchar64/bearer/qnativewifibearer.dll diff --git a/tools/vchar64/examples/c64_loader/Makefile b/tools/win32/vchar64/examples/c64_loader/Makefile similarity index 100% rename from tools/vchar64/examples/c64_loader/Makefile rename to tools/win32/vchar64/examples/c64_loader/Makefile diff --git a/tools/vchar64/examples/c64_loader/loader.prg b/tools/win32/vchar64/examples/c64_loader/loader.prg similarity index 100% rename from tools/vchar64/examples/c64_loader/loader.prg rename to tools/win32/vchar64/examples/c64_loader/loader.prg diff --git a/tools/vchar64/examples/c64_loader/logo-charset.s b/tools/win32/vchar64/examples/c64_loader/logo-charset.s similarity index 100% rename from tools/vchar64/examples/c64_loader/logo-charset.s rename to tools/win32/vchar64/examples/c64_loader/logo-charset.s diff --git a/tools/vchar64/examples/c64_loader/logo-colors.s b/tools/win32/vchar64/examples/c64_loader/logo-colors.s similarity index 100% rename from tools/vchar64/examples/c64_loader/logo-colors.s rename to tools/win32/vchar64/examples/c64_loader/logo-colors.s diff --git a/tools/vchar64/examples/c64_loader/logo-map.s b/tools/win32/vchar64/examples/c64_loader/logo-map.s similarity index 100% rename from tools/vchar64/examples/c64_loader/logo-map.s rename to tools/win32/vchar64/examples/c64_loader/logo-map.s diff --git a/tools/vchar64/examples/c64_loader/main.s b/tools/win32/vchar64/examples/c64_loader/main.s similarity index 100% rename from tools/vchar64/examples/c64_loader/main.s rename to tools/win32/vchar64/examples/c64_loader/main.s diff --git a/tools/vchar64/examples/c64_loader/pvm_logo.vchar64proj b/tools/win32/vchar64/examples/c64_loader/pvm_logo.vchar64proj similarity index 100% rename from tools/vchar64/examples/c64_loader/pvm_logo.vchar64proj rename to tools/win32/vchar64/examples/c64_loader/pvm_logo.vchar64proj diff --git a/tools/vchar64/examples/font_astra_2x2.vchar64proj b/tools/win32/vchar64/examples/font_astra_2x2.vchar64proj similarity index 100% rename from tools/vchar64/examples/font_astra_2x2.vchar64proj rename to tools/win32/vchar64/examples/font_astra_2x2.vchar64proj diff --git a/tools/vchar64/examples/font_boulderdash_1x2.vchar64proj b/tools/win32/vchar64/examples/font_boulderdash_1x2.vchar64proj similarity index 100% rename from tools/vchar64/examples/font_boulderdash_1x2.vchar64proj rename to tools/win32/vchar64/examples/font_boulderdash_1x2.vchar64proj diff --git a/tools/vchar64/examples/font_broadway_2x2.vchar64proj b/tools/win32/vchar64/examples/font_broadway_2x2.vchar64proj similarity index 100% rename from tools/vchar64/examples/font_broadway_2x2.vchar64proj rename to tools/win32/vchar64/examples/font_broadway_2x2.vchar64proj diff --git a/tools/vchar64/examples/font_caren_1x2.vchar64proj b/tools/win32/vchar64/examples/font_caren_1x2.vchar64proj similarity index 100% rename from tools/vchar64/examples/font_caren_1x2.vchar64proj rename to tools/win32/vchar64/examples/font_caren_1x2.vchar64proj diff --git a/tools/vchar64/examples/font_cuneiform_2x2.vchar64proj b/tools/win32/vchar64/examples/font_cuneiform_2x2.vchar64proj similarity index 100% rename from tools/vchar64/examples/font_cuneiform_2x2.vchar64proj rename to tools/win32/vchar64/examples/font_cuneiform_2x2.vchar64proj diff --git a/tools/vchar64/examples/font_doppel_2x2.vchar64proj b/tools/win32/vchar64/examples/font_doppel_2x2.vchar64proj similarity index 100% rename from tools/vchar64/examples/font_doppel_2x2.vchar64proj rename to tools/win32/vchar64/examples/font_doppel_2x2.vchar64proj diff --git a/tools/vchar64/examples/font_ianmic02_2x2.vchar64proj b/tools/win32/vchar64/examples/font_ianmic02_2x2.vchar64proj similarity index 100% rename from tools/vchar64/examples/font_ianmic02_2x2.vchar64proj rename to tools/win32/vchar64/examples/font_ianmic02_2x2.vchar64proj diff --git a/tools/vchar64/examples/font_rambo_2x2.vchar64proj b/tools/win32/vchar64/examples/font_rambo_2x2.vchar64proj similarity index 100% rename from tools/vchar64/examples/font_rambo_2x2.vchar64proj rename to tools/win32/vchar64/examples/font_rambo_2x2.vchar64proj diff --git a/tools/vchar64/examples/font_reset04_2x3.vchar64proj b/tools/win32/vchar64/examples/font_reset04_2x3.vchar64proj similarity index 100% rename from tools/vchar64/examples/font_reset04_2x3.vchar64proj rename to tools/win32/vchar64/examples/font_reset04_2x3.vchar64proj diff --git a/tools/vchar64/examples/font_reset06_3x3.vchar64proj b/tools/win32/vchar64/examples/font_reset06_3x3.vchar64proj similarity index 100% rename from tools/vchar64/examples/font_reset06_3x3.vchar64proj rename to tools/win32/vchar64/examples/font_reset06_3x3.vchar64proj diff --git a/tools/vchar64/examples/font_reset07_2x2.vchar64proj b/tools/win32/vchar64/examples/font_reset07_2x2.vchar64proj similarity index 100% rename from tools/vchar64/examples/font_reset07_2x2.vchar64proj rename to tools/win32/vchar64/examples/font_reset07_2x2.vchar64proj diff --git a/tools/vchar64/examples/font_subchrist_chrome_2x2.vchar64proj b/tools/win32/vchar64/examples/font_subchrist_chrome_2x2.vchar64proj similarity index 100% rename from tools/vchar64/examples/font_subchrist_chrome_2x2.vchar64proj rename to tools/win32/vchar64/examples/font_subchrist_chrome_2x2.vchar64proj diff --git a/tools/vchar64/examples/font_unknown_2x2.vchar64proj b/tools/win32/vchar64/examples/font_unknown_2x2.vchar64proj similarity index 100% rename from tools/vchar64/examples/font_unknown_2x2.vchar64proj rename to tools/win32/vchar64/examples/font_unknown_2x2.vchar64proj diff --git a/tools/vchar64/examples/game_commando_l1.vchar64proj b/tools/win32/vchar64/examples/game_commando_l1.vchar64proj similarity index 100% rename from tools/vchar64/examples/game_commando_l1.vchar64proj rename to tools/win32/vchar64/examples/game_commando_l1.vchar64proj diff --git a/tools/vchar64/iconengines/qsvgicon.dll b/tools/win32/vchar64/iconengines/qsvgicon.dll similarity index 100% rename from tools/vchar64/iconengines/qsvgicon.dll rename to tools/win32/vchar64/iconengines/qsvgicon.dll diff --git a/tools/vchar64/imageformats/qdds.dll b/tools/win32/vchar64/imageformats/qdds.dll similarity index 100% rename from tools/vchar64/imageformats/qdds.dll rename to tools/win32/vchar64/imageformats/qdds.dll diff --git a/tools/vchar64/imageformats/qgif.dll b/tools/win32/vchar64/imageformats/qgif.dll similarity index 100% rename from tools/vchar64/imageformats/qgif.dll rename to tools/win32/vchar64/imageformats/qgif.dll diff --git a/tools/vchar64/imageformats/qicns.dll b/tools/win32/vchar64/imageformats/qicns.dll similarity index 100% rename from tools/vchar64/imageformats/qicns.dll rename to tools/win32/vchar64/imageformats/qicns.dll diff --git a/tools/vchar64/imageformats/qico.dll b/tools/win32/vchar64/imageformats/qico.dll similarity index 100% rename from tools/vchar64/imageformats/qico.dll rename to tools/win32/vchar64/imageformats/qico.dll diff --git a/tools/vchar64/imageformats/qjpeg.dll b/tools/win32/vchar64/imageformats/qjpeg.dll similarity index 100% rename from tools/vchar64/imageformats/qjpeg.dll rename to tools/win32/vchar64/imageformats/qjpeg.dll diff --git a/tools/vchar64/imageformats/qsvg.dll b/tools/win32/vchar64/imageformats/qsvg.dll similarity index 100% rename from tools/vchar64/imageformats/qsvg.dll rename to tools/win32/vchar64/imageformats/qsvg.dll diff --git a/tools/vchar64/imageformats/qtga.dll b/tools/win32/vchar64/imageformats/qtga.dll similarity index 100% rename from tools/vchar64/imageformats/qtga.dll rename to tools/win32/vchar64/imageformats/qtga.dll diff --git a/tools/vchar64/imageformats/qtiff.dll b/tools/win32/vchar64/imageformats/qtiff.dll similarity index 100% rename from tools/vchar64/imageformats/qtiff.dll rename to tools/win32/vchar64/imageformats/qtiff.dll diff --git a/tools/vchar64/imageformats/qwbmp.dll b/tools/win32/vchar64/imageformats/qwbmp.dll similarity index 100% rename from tools/vchar64/imageformats/qwbmp.dll rename to tools/win32/vchar64/imageformats/qwbmp.dll diff --git a/tools/vchar64/imageformats/qwebp.dll b/tools/win32/vchar64/imageformats/qwebp.dll similarity index 100% rename from tools/vchar64/imageformats/qwebp.dll rename to tools/win32/vchar64/imageformats/qwebp.dll diff --git a/tools/vchar64/libEGL.dll b/tools/win32/vchar64/libEGL.dll similarity index 100% rename from tools/vchar64/libEGL.dll rename to tools/win32/vchar64/libEGL.dll diff --git a/tools/vchar64/libGLESV2.dll b/tools/win32/vchar64/libGLESV2.dll similarity index 100% rename from tools/vchar64/libGLESV2.dll rename to tools/win32/vchar64/libGLESV2.dll diff --git a/tools/vchar64/libgcc_s_dw2-1.dll b/tools/win32/vchar64/libgcc_s_dw2-1.dll similarity index 100% rename from tools/vchar64/libgcc_s_dw2-1.dll rename to tools/win32/vchar64/libgcc_s_dw2-1.dll diff --git a/tools/vchar64/libstdc++-6.dll b/tools/win32/vchar64/libstdc++-6.dll similarity index 100% rename from tools/vchar64/libstdc++-6.dll rename to tools/win32/vchar64/libstdc++-6.dll diff --git a/tools/vchar64/libwinpthread-1.dll b/tools/win32/vchar64/libwinpthread-1.dll similarity index 100% rename from tools/vchar64/libwinpthread-1.dll rename to tools/win32/vchar64/libwinpthread-1.dll diff --git a/tools/vchar64/opengl32sw.dll b/tools/win32/vchar64/opengl32sw.dll similarity index 100% rename from tools/vchar64/opengl32sw.dll rename to tools/win32/vchar64/opengl32sw.dll diff --git a/tools/vchar64/platforms/qwindows.dll b/tools/win32/vchar64/platforms/qwindows.dll similarity index 100% rename from tools/vchar64/platforms/qwindows.dll rename to tools/win32/vchar64/platforms/qwindows.dll diff --git a/tools/vchar64/translations/Makefile b/tools/win32/vchar64/translations/Makefile similarity index 100% rename from tools/vchar64/translations/Makefile rename to tools/win32/vchar64/translations/Makefile diff --git a/tools/vchar64/translations/Makefile.Debug b/tools/win32/vchar64/translations/Makefile.Debug similarity index 100% rename from tools/vchar64/translations/Makefile.Debug rename to tools/win32/vchar64/translations/Makefile.Debug diff --git a/tools/vchar64/translations/Makefile.Release b/tools/win32/vchar64/translations/Makefile.Release similarity index 100% rename from tools/vchar64/translations/Makefile.Release rename to tools/win32/vchar64/translations/Makefile.Release diff --git a/tools/vchar64/translations/qt_ca.qm b/tools/win32/vchar64/translations/qt_ca.qm similarity index 100% rename from tools/vchar64/translations/qt_ca.qm rename to tools/win32/vchar64/translations/qt_ca.qm diff --git a/tools/vchar64/translations/qt_cs.qm b/tools/win32/vchar64/translations/qt_cs.qm similarity index 100% rename from tools/vchar64/translations/qt_cs.qm rename to tools/win32/vchar64/translations/qt_cs.qm diff --git a/tools/vchar64/translations/qt_de.qm b/tools/win32/vchar64/translations/qt_de.qm similarity index 100% rename from tools/vchar64/translations/qt_de.qm rename to tools/win32/vchar64/translations/qt_de.qm diff --git a/tools/vchar64/translations/qt_en.qm b/tools/win32/vchar64/translations/qt_en.qm similarity index 100% rename from tools/vchar64/translations/qt_en.qm rename to tools/win32/vchar64/translations/qt_en.qm diff --git a/tools/vchar64/translations/qt_fi.qm b/tools/win32/vchar64/translations/qt_fi.qm similarity index 100% rename from tools/vchar64/translations/qt_fi.qm rename to tools/win32/vchar64/translations/qt_fi.qm diff --git a/tools/vchar64/translations/qt_fr.qm b/tools/win32/vchar64/translations/qt_fr.qm similarity index 100% rename from tools/vchar64/translations/qt_fr.qm rename to tools/win32/vchar64/translations/qt_fr.qm diff --git a/tools/vchar64/translations/qt_he.qm b/tools/win32/vchar64/translations/qt_he.qm similarity index 100% rename from tools/vchar64/translations/qt_he.qm rename to tools/win32/vchar64/translations/qt_he.qm diff --git a/tools/vchar64/translations/qt_hu.qm b/tools/win32/vchar64/translations/qt_hu.qm similarity index 100% rename from tools/vchar64/translations/qt_hu.qm rename to tools/win32/vchar64/translations/qt_hu.qm diff --git a/tools/vchar64/translations/qt_it.qm b/tools/win32/vchar64/translations/qt_it.qm similarity index 100% rename from tools/vchar64/translations/qt_it.qm rename to tools/win32/vchar64/translations/qt_it.qm diff --git a/tools/vchar64/translations/qt_ja.qm b/tools/win32/vchar64/translations/qt_ja.qm similarity index 100% rename from tools/vchar64/translations/qt_ja.qm rename to tools/win32/vchar64/translations/qt_ja.qm diff --git a/tools/vchar64/translations/qt_ko.qm b/tools/win32/vchar64/translations/qt_ko.qm similarity index 100% rename from tools/vchar64/translations/qt_ko.qm rename to tools/win32/vchar64/translations/qt_ko.qm diff --git a/tools/vchar64/translations/qt_lv.qm b/tools/win32/vchar64/translations/qt_lv.qm similarity index 100% rename from tools/vchar64/translations/qt_lv.qm rename to tools/win32/vchar64/translations/qt_lv.qm diff --git a/tools/vchar64/translations/qt_pl.qm b/tools/win32/vchar64/translations/qt_pl.qm similarity index 100% rename from tools/vchar64/translations/qt_pl.qm rename to tools/win32/vchar64/translations/qt_pl.qm diff --git a/tools/vchar64/translations/qt_ru.qm b/tools/win32/vchar64/translations/qt_ru.qm similarity index 100% rename from tools/vchar64/translations/qt_ru.qm rename to tools/win32/vchar64/translations/qt_ru.qm diff --git a/tools/vchar64/translations/qt_sk.qm b/tools/win32/vchar64/translations/qt_sk.qm similarity index 100% rename from tools/vchar64/translations/qt_sk.qm rename to tools/win32/vchar64/translations/qt_sk.qm diff --git a/tools/vchar64/translations/qt_uk.qm b/tools/win32/vchar64/translations/qt_uk.qm similarity index 100% rename from tools/vchar64/translations/qt_uk.qm rename to tools/win32/vchar64/translations/qt_uk.qm diff --git a/tools/vchar64/translations/vchar64_es.qm b/tools/win32/vchar64/translations/vchar64_es.qm similarity index 100% rename from tools/vchar64/translations/vchar64_es.qm rename to tools/win32/vchar64/translations/vchar64_es.qm diff --git a/tools/vchar64/vchar64.exe b/tools/win32/vchar64/vchar64.exe similarity index 100% rename from tools/vchar64/vchar64.exe rename to tools/win32/vchar64/vchar64.exe