Commit Graph

550 Commits

Author SHA1 Message Date
Ivan Tatarinov 4e06ab21f0
Merge pull request #15 from zxdos/master
Merge pull request #30 from ivan-tat/master
2021-04-14 03:16:11 +03:00
Ivan Tatarinov 3eaa6ba154
Merge pull request #30 from ivan-tat/master
readme.md: added Open-Source FPGA Foundation links
2021-04-14 03:12:04 +03:00
Ivan Tatarinov f384ddd090 readme.md: added Open-Source FPGA Foundation links 2021-04-14 03:09:46 +03:00
Ivan Tatarinov a43a9d54e7
Merge pull request #14 from zxdos/master
Merge pull request #29 from ivan-tat/master
2021-04-14 02:48:50 +03:00
Ivan Tatarinov 145a6b8326
Merge pull request #29 from ivan-tat/master
sdk: added Open-Source FPGA Foundation links to `README.md`
2021-04-14 02:45:46 +03:00
Ivan Tatarinov a11fbb619f sdk: added Open-Source FPGA Foundation links to `README.md` 2021-04-14 02:43:45 +03:00
Ivan Tatarinov 1c9369925c
Merge pull request #13 from zxdos/master
sync with upstream
2021-04-13 12:46:10 +03:00
Ivan Tatarinov 0d014f33ab
Merge pull request #28 from ivan-tat/master
various SDK improvements, added `fcut`, `fpad`, `fpoke` tools
2021-04-13 12:36:02 +03:00
Ivan Tatarinov 54370587d3 + sdk: added MinGW build target
+ sdk: added `fcut`, `fpad`, `fpoke` tools
* sdk: updated `zx7b` tool
* sdk: updated `README.md`
- hardware: removed old binaries of `fcut` tool
* updated some .bat-scripts to use SDK
* updated some copyright and licensing information
2021-04-13 12:26:12 +03:00
kounch 8c95034ea2 Manual 1.4.5 de ZXDOS+
Añadido PX XT y CHIP-8
Revisado ancho de tablas
Otras correcciones
2021-04-12 20:49:39 +02:00
Ivan Tatarinov e7c800ab6b
Merge pull request #12 from zxdos/master
Merge pull request #27 from ivan-tat/master
2021-04-12 14:54:54 +03:00
Ivan Tatarinov bacdb6d508
Merge pull request #27 from ivan-tat/master
.gitignore: moved information about ignored SDK files from `.gitignore` into their folders
2021-04-12 14:54:00 +03:00
Ivan Tatarinov 442fc27f2d .gitignore: moved information about ignored SDK files from `.gitignore` into their folders` 2021-04-12 14:51:38 +03:00
Ivan Tatarinov 7f5dc4488d
Merge pull request #11 from zxdos/master
Merge pull request #26 from ivan-tat/master
2021-04-12 14:39:41 +03:00
Ivan Tatarinov 519ca0cc9a
Merge pull request #26 from ivan-tat/master
sdk: update `README.md`
2021-04-12 14:34:51 +03:00
Ivan Tatarinov db2bf6fd7c sdk: update `README.md` 2021-04-12 14:33:05 +03:00
Ivan Tatarinov 4337c43e11
Merge pull request #10 from zxdos/master
Merge pull request #25 from ivan-tat/master
2021-04-12 14:22:34 +03:00
Ivan Tatarinov 463286bd8a
Merge pull request #25 from ivan-tat/master
sdk: moved `hardware/kartusho/roms/zx7b.exe` to `sdk/bin/zx7b.exe`, added sources
2021-04-12 14:19:16 +03:00
Ivan Tatarinov b02f67aef5 sdk: moved `hardware/kartusho/roms/zx7b.exe` to `sdk/bin/zx7b.exe`, added sources 2021-04-12 14:02:10 +03:00
Ivan Tatarinov 0f7aab6bf6
Merge pull request #9 from zxdos/master
sync with upstream
2021-04-12 12:09:31 +03:00
Ivan Tatarinov 92473bc5e5
Merge pull request #24 from ivan-tat/master
sdk: use stable version of `sjasmplus` for building
2021-04-12 11:50:36 +03:00
Ivan Tatarinov f3800013cb sdk: use `sjasmplus` release 20190306.1 for building 2021-04-12 11:46:21 +03:00
antoniovillena 112d1e97e3 Merge branch 'master' of https://github.com/antoniovillena/zxuno 2021-04-11 22:50:46 +02:00
antoniovillena 2b7b64b4ec Arreglo bug en FIRMWARE.ZXD 2021-04-11 22:46:24 +02:00
Ivan Tatarinov dddb51b0dc
Merge pull request #8 from zxdos/master
Merge pull request #22 from ivan-tat/master
2021-04-10 13:25:04 +03:00
Ivan Tatarinov c207b0efaf
Merge pull request #22 from ivan-tat/master
sdk: fix mistake in path resolving in file `sdk/setvars.sh`
2021-04-10 13:23:46 +03:00
Ivan Tatarinov 91e79a2edd Merge branch 'master' of github.com:ivan-tat/zxuno 2021-04-10 13:21:37 +03:00
Ivan Tatarinov c76b3cad2b sdk: fix mistake in path resolving in file `sdk/setvars.sh` 2021-04-10 13:21:04 +03:00
Ivan Tatarinov fb42a7f4de
Merge pull request #7 from zxdos/master
Merge pull request #21 from ivan-tat/master
2021-04-10 12:23:58 +03:00
Ivan Tatarinov 0d5840237d
Merge pull request #21 from ivan-tat/master
update SDK, modflash and licensing information
2021-04-10 12:22:28 +03:00
Ivan Tatarinov 72618ae809 + added files `sdk/README.md`, `sdk/README.md.license`, `sdk/setvars.sh`, `sdk/bin/sjasmplus.exe.license`
* renamed file `modflash/addcore.bat` into `modflash/addcores.bat`
* renamed file `modflash/addrom.bat` into `modflash/addroms.bat`
+ added proper licensing information to some files
2021-04-10 12:15:20 +03:00
Ivan Tatarinov 57dc876a0b
Merge pull request #6 from zxdos/master
sync with upstream
2021-04-08 13:53:52 +03:00
Ivan Tatarinov 51e2532dc0
Merge pull request #20 from ivan-tat/build-process
sdk: added compilation of `sjasmplus` on GNU/Linux and fixed path resolving
2021-04-08 13:45:10 +03:00
Ivan Tatarinov 674cf174c7 sdk: added compilation of `sjasmplus` on GNU/Linux 2021-04-08 13:41:02 +03:00
Ivan Tatarinov 80bf817d35
Merge pull request #5 from zxdos/master
sync with upstream
2021-04-08 01:47:52 +03:00
Ivan Tatarinov 6dc6c31f7a
Merge pull request #4 from ivan-tat/build-process
Build process
2021-04-08 01:31:38 +03:00
Ivan Tatarinov 4201755ff0
Merge pull request #19 from ivan-tat/master
Merge pull request #3 from zxdos/master
2021-04-08 01:22:05 +03:00
Ivan Tatarinov b8d736e1b8
Merge pull request #17 from ivan-tat/build-process
sdk: created `sdk` directory with `common.mk` and `setvars.bat` files
2021-04-08 01:16:56 +03:00
Ivan Tatarinov 4196b86c51 sdk: moved `sjasmplus.exe` to `sdk/bin` directory 2021-04-07 12:16:47 +03:00
Ivan Tatarinov 63c1bbb651 sdk: created `sdk` directory with `common.mk` and `setvars.bat` files 2021-04-07 11:44:00 +03:00
Ivan Tatarinov 679e15e887
Merge pull request #3 from zxdos/master
pull request zxdos#15
2021-04-07 09:51:39 +03:00
antoniovillena 74aeddbb60
Merge pull request #15 from ivan-tat/build-process
modflash: improved scripts (separated shared lists of ROMs and cores into roms.txt and cores.txt)
2021-04-07 07:42:35 +02:00
Ivan Tatarinov c28385ef18
Update Makefile 2021-04-06 22:58:08 +03:00
Ivan Tatarinov 81dd060ff3 Merge branch 'build-process' of github.com:ivan-tat/zxuno into build-process 2021-04-06 22:50:59 +03:00
Ivan Tatarinov 04f8018c5e modflash: improve scripts (separate shared lists of ROMs and cores into roms.txt and cores.txt) 2021-04-06 22:49:17 +03:00
Ivan Tatarinov c203a83f99
Merge pull request #2 from zxdos/master
Merge pull request #14 from ivan-tat/build-process
2021-04-06 21:29:26 +03:00
antoniovillena 7a5060c978
Merge pull request #14 from ivan-tat/build-process
modflash: allow building on GNU/Linux using Makefile
2021-04-06 20:14:44 +02:00
Ivan Tatarinov f5fa775db1
Update README.md 2021-04-06 19:47:54 +03:00
Ivan Tatarinov acbc5efebb modflash: add Makefile and README.md for GNU/Linux and Windows NT hosts 2021-04-06 19:38:29 +03:00
Ivan Tatarinov 054a802f60
Merge pull request #1 from zxdos/master
Windows
2021-04-06 18:32:46 +03:00