Improved main makefile and readme.

Also updated KallistiOS.

Author: DC-SWAT

Makefile

@@ -211,6 +211,32 @@ release: build cdi
 	@echo 
 	@echo "\033[42m Complete $(DS_BASE)/release \033[0m"
 
+update:
+	@echo Fetching DreamShell from GitHub...
+	@git fetch && git checkout origin/master
+	@echo Fetching KallistiOS from GitHub...
+	@cd $(KOS_BASE) && git fetch && git checkout `cat $(DS_BASE)/sdk/doc/KallistiOS.txt`
+	@echo Fetching kos-ports from GitHub...
+	@cd $(KOS_BASE)/../kos-ports && git fetch && git checkout origin/master
+
+update-build:
+	@echo Fetching DreamShell from GitHub...
+	@git fetch && git checkout origin/master
+	@echo Fetching and build KallistiOS from GitHub...
+	@cd $(KOS_BASE) && git fetch && git checkout `cat $(DS_BASE)/sdk/doc/KallistiOS.txt` && make clean && make
+	@echo Fetching and build kos-ports from GitHub...
+	@mv include include_
+	@cd $(KOS_BASE)/../kos-ports && git fetch && git checkout origin/master && ./utils/build-all.sh
+	@mv include_ include
+	@echo Building DreamShell...
+	@make clean-all && make build
+
+toolchain:
+	@cp $(DS_SDK)/toolchain/environ.sh $(KOS_BASE)/environ.sh
+	@cp $(DS_SDK)/toolchain/patches/*.diff $(KOS_BASE)/utils/dc-chain/patches
+	@source $(KOS_BASE)/environ.sh
+	@cd $(KOS_BASE)/utils/dc-chain && cp Makefile.default.cfg Makefile.cfg && make
+
 $(TARGET): libs $(TARGET_BIN) make-build
 
 $(TARGET).elf: $(OBJS)

README.md

@@ -15,8 +15,9 @@ There are also large subproject is the ISO Loader, which contains emulation of B
 sudo apt-get install -y genisoimage squashfs-tools texinfo git
 sudo apt-get install -y libpng-dev libjpeg-dev liblzo2-dev liblua5.2-dev
 sudo apt-get install -y libmpc-dev
-cd /tmp && git clone https://github.com/LuaDist/tolua.git && cd tolua
-mkdir build && cd ./build
+cd /tmp
+git clone https://github.com/LuaDist/tolua.git
+cd /tmp/tolua && mkdir build && cd ./build
 cmake ../ && make && sudo make install
 ```
 ##### Code
@@ -25,7 +26,8 @@ sudo mkdir -p /usr/local/dc/kos
 sudo chown -R $(id -u):$(id -g) /usr/local/dc
 cd /usr/local/dc/kos
 git clone https://github.com/KallistiOS/kos-ports.git
-git clone https://github.com/KallistiOS/KallistiOS.git kos && cd kos
+git clone https://github.com/KallistiOS/KallistiOS.git kos
+cd /usr/local/dc/kos/kos
 git clone https://github.com/DC-SWAT/DreamShell.git ds
 git checkout `cat ds/sdk/doc/KallistiOS.txt`
 cp ds/sdk/toolchain/environ.sh environ.sh
@@ -37,7 +39,7 @@ sudo mkdir -p /opt/toolchains/dc
 sudo chown -R $(id -u):$(id -g) /opt/toolchains/dc
 cd /usr/local/dc/kos/kos/utils/dc-chain
 cp Makefile.default.cfg Makefile.cfg
-make && cd ../../
+make
 ```
 ##### SDK
 ```console
@@ -58,35 +60,52 @@ cd /usr/local/dc/kos/kos/ds && source ../environ.sh
 ```
 
 ### Build code
-##### Core and libraries
+##### Full build
+```console
+make build
+```
+##### Full clean
+```console
+make clean-all
+```
+##### Make release package
+```console
+make release
+```
+##### Update code from GitHub
+```console
+make update
+```
+##### Update code from GitHub and re-build
+```console
+make update-build
+```
+##### Re-build toochain (if updated)
+```console
+make toolchain
+```
+##### Core and libraries only
 ```console
 make
 ```
-##### Modules, applications and commands
+##### Modules, applications and commands only
 ```console
 cd ${KOS_BASE}/ds/modules && make
 cd ${KOS_BASE}/ds/commands && make
 cd ${KOS_BASE}/ds/applications && make
 ```
-##### Firmwares
+##### Firmwares only
 ```console
 cd ${KOS_BASE}/ds/firmware/bootloader && make && make release
 cd ${KOS_BASE}/ds/firmware/isoldr && make && make install
 ```
-##### Full build (modules, apps etc)
-```console
-make build
-```
-##### Make release package
-```console
-make release
-```
 
 ### Running
 - dc-tool-ip: `make run`
 - dc-tool-serial: `make run-serial`
 - lxdream emulator: `make lxdream`
 - nulldc emulator: `make nulldc`
+- flycast emulator: `make flycast`
 - make cdi image: `make cdi`
 
 ## Links

sdk/doc/KallistiOS.txt

@@ -1 +1 @@
-2751f20f40083c856e767b90eff4c64206987b68
+4346a85740d341587fd151cf47475b74fff9eeb4