Menu
▾
▴
[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-553-g44e6e77
|
From: Lawrence S. <ljs...@us...> - 2021-12-13 01:52:58
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".
The branch, master has been updated
via 44e6e771d564ffeab15d1d70415e282c547f6e5e (commit)
via fc9c3acd39ea292d5c5108c7ba3c3efc04477ca2 (commit)
via b16b5901c13537dd6d058fe65daf80f01602444c (commit)
via d25eae15cffc96dcf9c8633c4303e34483d7ac09 (commit)
via 39cbb7dba873090c5b340b3edbb83816462f6f45 (commit)
via a8d2db71999ce5556ca88349c023fa275ed8155d (commit)
via cc2c662504ca1cfe77262c49ca3b23a44cb30bdd (commit)
via 866d00668f75e37cb2bd1aa20e3b9593637c4f80 (commit)
via 18e126974a5f0ac17930b7674a8561b583c3beb3 (commit)
via 2de05be85c4549e7d98df9f9f4e53a99d9e55c34 (commit)
via cfd99ef109c23b913b3f72f38e7774d787f75fd0 (commit)
via cd55e1e562ecab9cf73c5e1391ebd2e4918048b1 (commit)
via bb9fbc563c1cc55af6e0dbc7eed73d43ff618699 (commit)
via d0aa07277eb49816f24e26dc3173b6cc309e186e (commit)
via eba532567c8845e3bcf102f4b09e6dc4a95df2e9 (commit)
via 864930e9bc2be2edb926cbcab72e4715dd06d0d5 (commit)
via 3ccfa603111ad6c8c289091ec447528d771d58ef (commit)
via ca69adea9311e0df7e924f45c62d82ed7ef698fa (commit)
via c668eded2cbead4de30fca285179b2d1b041e1db (commit)
via 097bf1caf67e2444018384f19c2f14e962a005e9 (commit)
via b78231d913550302b293997e6a858ce71da93273 (commit)
via ba8dad1d4eb58a2cb3660cee06608c82a131e3f5 (commit)
via 60ef03fa48affb758704f28ecbf592fff7bb7b4a (commit)
via cfef44a9fe0c0153009966eff92ae8117be3ef0e (commit)
via 72208de195d287682d9bf5c8cc8493dc8d078cfa (commit)
via 27dac9d64e21996ac26abf213d745b71ecf2f245 (commit)
via aebc643efed188397d24726656c5180c40683724 (commit)
via 9d38dc08fc32e997a8e90ea62e9eeb5915744f7a (commit)
via 6dff03492ca9c485f4bc9fd4e8bea9af39f7a452 (commit)
via 0aaf86349a084761fd4216a624dd5dfdb40feed9 (commit)
via 5c331ded1fdb31140f24a8f6eff2cbd70fb8bfda (commit)
via 8ca4ed1fa6060aa90f14b60523a736bd1129e4ff (commit)
via a53a12fb61065d82d63fd39da1ff94f6450da84f (commit)
via 251d217808882310ff3561ada2fe47f895972bd9 (commit)
via 52b91514db14bda9f69ead6e422107ba10265cad (commit)
via 52915f40ac79ffb595d66e84fd64914ee0843205 (commit)
via a25ecfa3d9565ed4a4963f2169e83566fbda2bd0 (commit)
via c87fccf479af4fe93047b26719f58f46673784f8 (commit)
via b862e52f84e41e169753f7c58e06ca2c7d06603c (commit)
via 2b951ed5ce334747e15f04691e09ab8877ba4da6 (commit)
via 8014ecde4d2665dd8a9ba7fe5e7f4f8013657684 (commit)
via 2a2a53be782db849d032319f6b6080da3a203ff3 (commit)
via 761ee2368766e028d693a8971939f39d13904061 (commit)
via 0deed124bf210d67233d22b60f33669960a2c1ac (commit)
via 5260227f8cb13c1c040daf6efaf1c4c9728f5d5a (commit)
via 1b14fdfc821d23d7ba78a07a4e0a9d04849fd8d5 (commit)
via 1695582b4f2889ea21d866e2bcdc3c301bb2cd99 (commit)
via bc076de1da946076ebe478d8372f5c9a313c281d (commit)
from ae3d5ec3ed7bbc0f0ea8fdd9f8d25e68ba7e8673 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 44e6e771d564ffeab15d1d70415e282c547f6e5e
Merge: fc9c3ac d25eae1
Author: Lawrence Sebald <ljs...@us...>
Date: Sun Dec 12 16:10:20 2021 -0500
Merge pull request #63 from Tchan0/Add_DC_ARM_Wrappers
Add dc arm wrappers
commit fc9c3acd39ea292d5c5108c7ba3c3efc04477ca2
Merge: b16b590 cc2c662
Author: Lawrence Sebald <ljs...@us...>
Date: Sun Dec 12 16:09:34 2021 -0500
Merge pull request #62 from Tchan0/Clean_SDL_Sound_Example
Clean sdl sound example
commit b16b5901c13537dd6d058fe65daf80f01602444c
Merge: cd55e1e 2de05be
Author: Lawrence Sebald <ljs...@us...>
Date: Sun Dec 12 16:09:03 2021 -0500
Merge pull request #61 from Tchan0/Improve_Consistency_Of_PVR_Texture_Render_Example
Improve consistency of pvr texture render example
commit d25eae15cffc96dcf9c8633c4303e34483d7ac09
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 21:09:15 2021 +0100
dc-arm gnu wrappers
gnu wrappers for the SPU.
Not useful for a lot of people, but very useful for people wanting to write their own driver & co
commit 39cbb7dba873090c5b340b3edbb83816462f6f45
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 21:07:30 2021 +0100
add extra DC_ARM defines
add extra DC_ARM defines to be more in line with the KOS (sh-elf) defines.
Won't be used by a lot of people, but can be handy for people who want to write their own driver.
commit a8d2db71999ce5556ca88349c023fa275ed8155d
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 21:04:52 2021 +0100
move arch kernel dir define to earlier in file
It's more handy to define the arch kernel folder before the include of environ_${KOS_ARCH}.sh,
so that it can be used in there
commit cc2c662504ca1cfe77262c49ca3b23a44cb30bdd
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 19:46:39 2021 +0100
Update and rename example.c to sdl_sound.c
Rename to sdl_sound.c to have it match the target .elf file name
commit 866d00668f75e37cb2bd1aa20e3b9593637c4f80
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 19:46:00 2021 +0100
Rename object to sdl_sound
rename object to sdl_sound to have a matching name for the main .c & target .elf file
commit 18e126974a5f0ac17930b7674a8561b583c3beb3
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 19:44:39 2021 +0100
Add sdl subfolder
add sdl subfolder to include it in the make all of the examples
commit 2de05be85c4549e7d98df9f9f4e53a99d9e55c34
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 19:34:29 2021 +0100
Rename ta.c to texture_render.c
renamed the main file so that it corrsponds to the .elf file name, to be consistent with all the other examples.
commit cfd99ef109c23b913b3f72f38e7774d787f75fd0
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 19:33:40 2021 +0100
Update Makefile
- texture_render is the only example that defines a TARGET_ELF, and also outputs a .bin file. This was removed to be more consistent with all the other examples, since it's quite unnecessary...
- name of the object renamed so that the main file name corresponds to the .elf file name, to be consistent with all the other examples.
commit cd55e1e562ecab9cf73c5e1391ebd2e4918048b1
Merge: bb9fbc5 bc076de
Author: Lawrence Sebald <ljs...@us...>
Date: Sun Dec 12 13:11:30 2021 -0500
Merge pull request #58 from Tchan0/Add_Missing_Utils_In_Make
Add missing utilities in /utils/Makefile
commit bb9fbc563c1cc55af6e0dbc7eed73d43ff618699
Merge: d0aa072 eba5325
Author: Lawrence Sebald <ljs...@us...>
Date: Sun Dec 12 13:11:04 2021 -0500
Merge pull request #60 from Tchan0/Add_Missing_Examples_In_Make_All
Add missing examples in make all
commit d0aa07277eb49816f24e26dc3173b6cc309e186e
Merge: ae3d5ec 3ccfa60
Author: Lawrence Sebald <ljs...@us...>
Date: Sun Dec 12 13:10:37 2021 -0500
Merge pull request #59 from Tchan0/Rename_Main_c_files_in_Examples
Improve consistency in the examples by using the same name for the main file and the target
commit eba532567c8845e3bcf102f4b09e6dc4a95df2e9
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 19:04:51 2021 +0100
Update Makefile
Add example serpent_dma to make all
commit 864930e9bc2be2edb926cbcab72e4715dd06d0d5
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 19:04:05 2021 +0100
Update Makefile
Add examples httpd and isp-settings to the make all
commit 3ccfa603111ad6c8c289091ec447528d771d58ef
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:34:30 2021 +0100
Update Makefile
Improve consistency in the examples by using the same name for the main file and the target
commit ca69adea9311e0df7e924f45c62d82ed7ef698fa
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:16:55 2021 +0100
Update and rename main.c to specular.c
Improve consistency in the examples by using the same name for the main file and the target
commit c668eded2cbead4de30fca285179b2d1b041e1db
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:16:23 2021 +0100
Update Makefile
Improve consistency in the examples by using the same name for the main file and the target
commit 097bf1caf67e2444018384f19c2f14e962a005e9
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:15:51 2021 +0100
Update and rename main.c to gl-multitex-elements.c
Improve consistency in the examples by using the same name for the main file and the target
commit b78231d913550302b293997e6a858ce71da93273
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:15:28 2021 +0100
Update Makefile
Improve consistency in the examples by using the same name for the main file and the target
commit ba8dad1d4eb58a2cb3660cee06608c82a131e3f5
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:14:55 2021 +0100
Update and rename main.c to gl-multitex-arrays.c
Improve consistency in the examples by using the same name for the main file and the target
commit 60ef03fa48affb758704f28ecbf592fff7bb7b4a
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:14:29 2021 +0100
Update Makefile
Improve consistency in the examples by using the same name for the main file and the target
commit cfef44a9fe0c0153009966eff92ae8117be3ef0e
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:13:52 2021 +0100
Update and rename main.c to gl-mipmap.c
Improve consistency in the examples by using the same name for the main file and the target
commit 72208de195d287682d9bf5c8cc8493dc8d078cfa
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:13:29 2021 +0100
Update Makefile
Improve consistency in the examples by using the same name for the main file and the target
commit 27dac9d64e21996ac26abf213d745b71ecf2f245
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:12:53 2021 +0100
Update and rename main.c to radial_blur.c
Improve consistency in the examples by using the same name for the main file and the target
commit aebc643efed188397d24726656c5180c40683724
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:12:32 2021 +0100
Update Makefile
Improve consistency in the examples by using the same name for the main file and the target
commit 9d38dc08fc32e997a8e90ea62e9eeb5915744f7a
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:11:45 2021 +0100
Rename main.c to nehe26.c
Improve consistency in the examples by using the same name for the main file and the target
commit 6dff03492ca9c485f4bc9fd4e8bea9af39f7a452
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:11:27 2021 +0100
Update Makefile
Improve consistency in the examples by using the same name for the main file and the target
commit 0aaf86349a084761fd4216a624dd5dfdb40feed9
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:10:51 2021 +0100
Rename main.c to nehe09.c
Improve consistency in the examples by using the same name for the main file and the target
commit 5c331ded1fdb31140f24a8f6eff2cbd70fb8bfda
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:10:33 2021 +0100
Update Makefile
Improve consistency in the examples by using the same name for the main file and the target
commit 8ca4ed1fa6060aa90f14b60523a736bd1129e4ff
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:10:01 2021 +0100
Rename main.c to nehe08.c
Improve consistency in the examples by using the same name for the main file and the target
commit a53a12fb61065d82d63fd39da1ff94f6450da84f
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:09:40 2021 +0100
Update Makefile
Improve consistency in the examples by using the same name for the main file and the target
commit 251d217808882310ff3561ada2fe47f895972bd9
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:09:10 2021 +0100
Rename main.c to nehe06.c
Improve consistency in the examples by using the same name for the main file and the target
commit 52b91514db14bda9f69ead6e422107ba10265cad
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:08:50 2021 +0100
Update Makefile
Improve consistency in the examples by using the same name for the main file and the target
commit 52915f40ac79ffb595d66e84fd64914ee0843205
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:08:17 2021 +0100
Rename main.c to nehe05.c
Improve consistency in the examples by using the same name for the main file and the target
commit a25ecfa3d9565ed4a4963f2169e83566fbda2bd0
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:07:54 2021 +0100
Update Makefile
Improve consistency in the examples by using the same name for the main file and the target
commit c87fccf479af4fe93047b26719f58f46673784f8
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:07:23 2021 +0100
Rename main.c to nehe02.c
Improve consistency in the examples by using the same name for the main file and the target
commit b862e52f84e41e169753f7c58e06ca2c7d06603c
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:06:58 2021 +0100
Update Makefile
Improve consistency in the examples by using the same name for the main file and the target
commit 2b951ed5ce334747e15f04691e09ab8877ba4da6
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:06:14 2021 +0100
Update and rename main.c to gl-arrays.c
Improve consistency in the examples by using the same name for the main file and the target
commit 8014ecde4d2665dd8a9ba7fe5e7f4f8013657684
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:05:50 2021 +0100
Update Makefile
Improve consistency in the examples by using the same name for the main file and the target
commit 2a2a53be782db849d032319f6b6080da3a203ff3
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:04:54 2021 +0100
Update and rename main.c to gltest.c
Improve consistency in the examples by using the same name for the main file and the target
commit 761ee2368766e028d693a8971939f39d13904061
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:04:26 2021 +0100
Update Makefile
Improve consistency in the examples by using the same name for the main file and the target
commit 0deed124bf210d67233d22b60f33669960a2c1ac
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:03:31 2021 +0100
Update and rename main.c to gl-elements.c
Improve consistency in the examples by using the same name for the main file and the target
commit 5260227f8cb13c1c040daf6efaf1c4c9728f5d5a
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:03:00 2021 +0100
Update Makefile
Improve consistency in the examples by using the same name for the main file and the target
commit 1b14fdfc821d23d7ba78a07a4e0a9d04849fd8d5
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:02:05 2021 +0100
Update and rename main.c to adventure.c
Improve consistency in the examples by using the same name for the main file and the target
commit 1695582b4f2889ea21d866e2bcdc3c301bb2cd99
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 18:01:09 2021 +0100
Update Makefile
Improve consistency in the examples by using the same name for the main file and the target
commit bc076de1da946076ebe478d8372f5c9a313c281d
Author: Tchan0 <617...@us...>
Date: Sun Dec 12 11:30:35 2021 +0100
Add missing utils in Makefile
A few small utilities are missing from the /utils/Makefile, forcing people to manually compile them after the installation of kos: bin2c, bincnv, isotest, kmgenc, makejitter, rdtest.
Also, sorted the DIRS alphabetically.
-----------------------------------------------------------------------
Summary of changes:
environ_base.sh | 5 +++--
environ_dreamcast.sh | 5 +++++
examples/dreamcast/Makefile | 2 +-
examples/dreamcast/conio/adventure/Makefile | 2 +-
.../conio/adventure/{main.c => adventure.c} | 4 ++--
examples/dreamcast/dreameye/basic/Makefile | 20 ++++++++++----------
examples/dreamcast/kgl/basic/elements/Makefile | 2 +-
.../kgl/basic/elements/{main.c => gl-elements.c} | 2 +-
examples/dreamcast/kgl/basic/txrenv/Makefile | 2 +-
.../dreamcast/kgl/basic/txrenv/{main.c => gltest.c} | 2 +-
examples/dreamcast/kgl/basic/zclip_arrays/Makefile | 2 +-
.../kgl/basic/zclip_arrays/{main.c => gl-arrays.c} | 2 +-
examples/dreamcast/kgl/demos/blur/Makefile | 2 +-
.../kgl/demos/blur/{main.c => radial_blur.c} | 2 +-
examples/dreamcast/kgl/demos/mipmap/Makefile | 2 +-
.../kgl/demos/mipmap/{main.c => gl-mipmap.c} | 2 +-
.../dreamcast/kgl/demos/multitexture-arrays/Makefile | 2 +-
.../{main.c => gl-multitex-arrays.c} | 2 +-
.../kgl/demos/multitexture-elements/Makefile | 2 +-
.../{main.c => gl-multitex-elements.c} | 2 +-
examples/dreamcast/kgl/demos/specular/Makefile | 2 +-
.../kgl/demos/specular/{main.c => specular.c} | 2 +-
examples/dreamcast/kgl/nehe/nehe02/Makefile | 2 +-
.../dreamcast/kgl/nehe/nehe02/{main.c => nehe02.c} | 0
examples/dreamcast/kgl/nehe/nehe05/Makefile | 2 +-
.../dreamcast/kgl/nehe/nehe05/{main.c => nehe05.c} | 0
examples/dreamcast/kgl/nehe/nehe06/Makefile | 2 +-
.../dreamcast/kgl/nehe/nehe06/{main.c => nehe06.c} | 0
examples/dreamcast/kgl/nehe/nehe08/Makefile | 2 +-
.../dreamcast/kgl/nehe/nehe08/{main.c => nehe08.c} | 0
examples/dreamcast/kgl/nehe/nehe09/Makefile | 2 +-
.../dreamcast/kgl/nehe/nehe09/{main.c => nehe09.c} | 0
examples/dreamcast/kgl/nehe/nehe26/Makefile | 2 +-
.../dreamcast/kgl/nehe/nehe26/{main.c => nehe26.c} | 0
examples/dreamcast/network/Makefile | 6 ++++++
examples/dreamcast/parallax/Makefile | 2 +-
examples/dreamcast/pvr/texture_render/Makefile | 12 ++++--------
.../pvr/texture_render/{ta.c => texture_render.c} | 0
examples/dreamcast/sdl/sound/Makefile | 2 +-
.../dreamcast/sdl/sound/{example.c => sdl_sound.c} | 2 +-
utils/Makefile | 2 +-
utils/gnu_wrappers/dc-arm-ar | 3 +++
utils/gnu_wrappers/dc-arm-as | 3 +++
utils/gnu_wrappers/{kos-cc => dc-arm-cc} | 12 ++++++------
utils/gnu_wrappers/dc-arm-ld | 3 +++
utils/gnu_wrappers/dc-arm-make | 3 +++
utils/gnu_wrappers/{kos-objcopy => dc-arm-objcopy} | 2 +-
47 files changed, 77 insertions(+), 57 deletions(-)
rename examples/dreamcast/conio/adventure/{main.c => adventure.c} (99%)
rename examples/dreamcast/kgl/basic/elements/{main.c => gl-elements.c} (96%)
rename examples/dreamcast/kgl/basic/txrenv/{main.c => gltest.c} (95%)
rename examples/dreamcast/kgl/basic/zclip_arrays/{main.c => gl-arrays.c} (96%)
rename examples/dreamcast/kgl/demos/blur/{main.c => radial_blur.c} (96%)
rename examples/dreamcast/kgl/demos/mipmap/{main.c => gl-mipmap.c} (95%)
rename examples/dreamcast/kgl/demos/multitexture-arrays/{main.c => gl-multitex-arrays.c} (96%)
rename examples/dreamcast/kgl/demos/multitexture-elements/{main.c => gl-multitex-elements.c} (96%)
rename examples/dreamcast/kgl/demos/specular/{main.c => specular.c} (96%)
rename examples/dreamcast/kgl/nehe/nehe02/{main.c => nehe02.c} (100%)
rename examples/dreamcast/kgl/nehe/nehe05/{main.c => nehe05.c} (100%)
rename examples/dreamcast/kgl/nehe/nehe06/{main.c => nehe06.c} (100%)
rename examples/dreamcast/kgl/nehe/nehe08/{main.c => nehe08.c} (100%)
rename examples/dreamcast/kgl/nehe/nehe09/{main.c => nehe09.c} (100%)
rename examples/dreamcast/kgl/nehe/nehe26/{main.c => nehe26.c} (100%)
rename examples/dreamcast/pvr/texture_render/{ta.c => texture_render.c} (100%)
rename examples/dreamcast/sdl/sound/{example.c => sdl_sound.c} (99%)
create mode 100644 utils/gnu_wrappers/dc-arm-ar
create mode 100644 utils/gnu_wrappers/dc-arm-as
copy utils/gnu_wrappers/{kos-cc => dc-arm-cc} (71%)
mode change 100755 => 100644
create mode 100644 utils/gnu_wrappers/dc-arm-ld
create mode 100644 utils/gnu_wrappers/dc-arm-make
copy utils/gnu_wrappers/{kos-objcopy => dc-arm-objcopy} (87%)
mode change 100755 => 100644
diff --git a/environ_base.sh b/environ_base.sh
index 29bc4f7..46f781f 100644
--- a/environ_base.sh
+++ b/environ_base.sh
@@ -6,6 +6,9 @@ if [ -z "${KOS_PORTS}" ] ; then
export KOS_PORTS="${KOS_BASE}/../kos-ports"
fi
+# Arch kernel folder
+export KOS_ARCH_DIR="${KOS_BASE}/kernel/arch/${KOS_ARCH}"
+
# Pull in the arch environ file
. ${KOS_BASE}/environ_${KOS_ARCH}.sh
@@ -49,8 +52,6 @@ case $KOS_GCCVER in
esac
# Some extra vars based on architecture
-export KOS_ARCH_DIR="${KOS_BASE}/kernel/arch/${KOS_ARCH}"
-
case $KOS_GCCVER in
2* | 3*)
export KOS_START="${KOS_ARCH_DIR}/kernel/startup.o" ;;
diff --git a/environ_dreamcast.sh b/environ_dreamcast.sh
index bf47375..3182bc6 100644
--- a/environ_dreamcast.sh
+++ b/environ_dreamcast.sh
@@ -21,4 +21,9 @@ if [ x${KOS_ARCH} = xdreamcast ]; then
export DC_ARM_LD="${DC_ARM_BASE}/bin/${DC_ARM_PREFIX}-ld"
export DC_ARM_CFLAGS="-mcpu=arm7di -Wall -O2 -fno-strict-aliasing -Wl,--fix-v4bx -Wa,--fix-v4bx"
export DC_ARM_AFLAGS="-mcpu=arm7di --fix-v4bx"
+ export DC_ARM_MAKE="make"
+ export DC_ARM_START="${KOS_ARCH_DIR}/sound/arm/crt0.s"
+ export DC_ARM_LDFLAGS="${DC_ARM_LDFLAGS} -Wl,-Ttext=0x00000000,-N -nostartfiles -nostdlib -e reset"
+ export DC_ARM_LIB_PATHS=""
+ export DC_ARM_LIBS="-Wl,--start-group -lgcc -Wl,--end-group"
fi
diff --git a/examples/dreamcast/Makefile b/examples/dreamcast/Makefile
index b9c7dcc..7ff5a70 100644
--- a/examples/dreamcast/Makefile
+++ b/examples/dreamcast/Makefile
@@ -5,7 +5,7 @@
#
DIRS = 2ndmix basic libdream kgl hello sound png network vmu conio pvr video \
- lua parallax modem dreameye sd g1ata lightgun keyboard
+ lua parallax modem dreameye sd g1ata lightgun keyboard sdl
ifdef KOS_CCPLUS
DIRS += cpp tsunami
endif
diff --git a/examples/dreamcast/conio/adventure/Makefile b/examples/dreamcast/conio/adventure/Makefile
index f192fc8..30cbbda 100644
--- a/examples/dreamcast/conio/adventure/Makefile
+++ b/examples/dreamcast/conio/adventure/Makefile
@@ -29,7 +29,7 @@ all: rm-elf $(TARGET)
include $(KOS_BASE)/Makefile.rules
-OBJS = porthelper.o crc.o done.o init.o io.o main.o save.o subr.o vocab.o wizard.o data.o
+OBJS = porthelper.o crc.o done.o init.o io.o adventure.o save.o subr.o vocab.o wizard.o data.o
$(DATA_TARGET):
$(HOST_CC) -o $(SETUP_TARGET) $(SETUP_SOURCE) $(SETUP_CFLAGS)
diff --git a/examples/dreamcast/conio/adventure/main.c b/examples/dreamcast/conio/adventure/adventure.c
similarity index 99%
rename from examples/dreamcast/conio/adventure/main.c
rename to examples/dreamcast/conio/adventure/adventure.c
index 5f734f3..0344541 100644
--- a/examples/dreamcast/conio/adventure/main.c
+++ b/examples/dreamcast/conio/adventure/adventure.c
@@ -44,10 +44,10 @@ static const char copyright[] =
#ifndef lint
#if 0
-static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/2/93";
+static char sccsid[] = "@(#)adventure.c 8.1 (Berkeley) 6/2/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/games/adventure/main.c,v 1.9.2.1 2001/03/05 11:43:11 kris Exp $";
+ "$FreeBSD: src/games/adventure/adventure.c,v 1.9.2.1 2001/03/05 11:43:11 kris Exp $";
#endif /* not lint */
/* Re-coding of advent in C: main program */
diff --git a/examples/dreamcast/dreameye/basic/Makefile b/examples/dreamcast/dreameye/basic/Makefile
index 5e0a6aa..d43b116 100644
--- a/examples/dreamcast/dreameye/basic/Makefile
+++ b/examples/dreamcast/dreameye/basic/Makefile
@@ -4,26 +4,26 @@
# Copyright (C) 2009 Lawrence Sebald
#
-all: rm-elf dreameye_test.elf
+TARGET = dreameye.elf
+OBJS = dreameye.o
-include $(KOS_BASE)/Makefile.rules
+all: rm-elf $(TARGET)
-OBJS = dreameye.o
+include $(KOS_BASE)/Makefile.rules
clean: rm-elf
-rm -f $(OBJS)
rm-elf:
- -rm -f dreameye_test.elf
+ -rm -f $(TARGET)
-dreameye_test.elf: $(OBJS)
- $(KOS_CC) $(KOS_CFLAGS) $(KOS_LDFLAGS) -o dreameye_test.elf $(KOS_START) \
+$(TARGET): $(OBJS)
+ $(KOS_CC) $(KOS_CFLAGS) $(KOS_LDFLAGS) -o $(TARGET) $(KOS_START) \
$(OBJS) $(DATAOBJS) $(OBJEXTRA) $(KOS_LIBS)
-
-run: dreameye_test.elf
- $(KOS_LOADER) dreameye_test.elf
+run: $(TARGET).elf
+ $(KOS_LOADER) $(TARGET).elf
dist:
rm -f $(OBJS)
- $(KOS_STRIP) dreameye_test.elf
+ $(KOS_STRIP) $(TARGET).elf
diff --git a/examples/dreamcast/kgl/basic/elements/Makefile b/examples/dreamcast/kgl/basic/elements/Makefile
index c162a08..3fb208a 100644
--- a/examples/dreamcast/kgl/basic/elements/Makefile
+++ b/examples/dreamcast/kgl/basic/elements/Makefile
@@ -5,7 +5,7 @@
TARGET = gl-elements.elf
-OBJS = main.o pvr-texture.o
+OBJS = gl-elements.o pvr-texture.o
OBJS += romdisk.o
diff --git a/examples/dreamcast/kgl/basic/elements/main.c b/examples/dreamcast/kgl/basic/elements/gl-elements.c
similarity index 96%
rename from examples/dreamcast/kgl/basic/elements/main.c
rename to examples/dreamcast/kgl/basic/elements/gl-elements.c
index f8315e0..c03d5b2 100644
--- a/examples/dreamcast/kgl/basic/elements/main.c
+++ b/examples/dreamcast/kgl/basic/elements/gl-elements.c
@@ -1,7 +1,7 @@
/*
KallistiOS 2.0.0
- main.c
+ gl-elements.c
(c)2014 Josh Pearson
Open GL example using Vertex Array Submission and GL Lighting.
diff --git a/examples/dreamcast/kgl/basic/txrenv/Makefile b/examples/dreamcast/kgl/basic/txrenv/Makefile
index 73b8b01..1be21e1 100644
--- a/examples/dreamcast/kgl/basic/txrenv/Makefile
+++ b/examples/dreamcast/kgl/basic/txrenv/Makefile
@@ -5,7 +5,7 @@
TARGET = gltest.elf
-OBJS = main.o pvr-texture.o
+OBJS = gltest.o pvr-texture.o
OBJS += romdisk.o
diff --git a/examples/dreamcast/kgl/basic/txrenv/main.c b/examples/dreamcast/kgl/basic/txrenv/gltest.c
similarity index 95%
rename from examples/dreamcast/kgl/basic/txrenv/main.c
rename to examples/dreamcast/kgl/basic/txrenv/gltest.c
index c589ec0..0966a29 100644
--- a/examples/dreamcast/kgl/basic/txrenv/main.c
+++ b/examples/dreamcast/kgl/basic/txrenv/gltest.c
@@ -1,7 +1,7 @@
/*
KallistiOS 2.0.0
- main.c
+ gltest.c
(C) 2014 Josh Pearson
OpenGL Texture Environment Example.
diff --git a/examples/dreamcast/kgl/basic/zclip_arrays/Makefile b/examples/dreamcast/kgl/basic/zclip_arrays/Makefile
index b4a0845..b88d614 100644
--- a/examples/dreamcast/kgl/basic/zclip_arrays/Makefile
+++ b/examples/dreamcast/kgl/basic/zclip_arrays/Makefile
@@ -5,7 +5,7 @@
TARGET = gl-arrays.elf
-OBJS = main.o pvr-texture.o
+OBJS = gl-arrays.o pvr-texture.o
OBJS += romdisk.o
diff --git a/examples/dreamcast/kgl/basic/zclip_arrays/main.c b/examples/dreamcast/kgl/basic/zclip_arrays/gl-arrays.c
similarity index 96%
rename from examples/dreamcast/kgl/basic/zclip_arrays/main.c
rename to examples/dreamcast/kgl/basic/zclip_arrays/gl-arrays.c
index 0597ab3..d32bed5 100644
--- a/examples/dreamcast/kgl/basic/zclip_arrays/main.c
+++ b/examples/dreamcast/kgl/basic/zclip_arrays/gl-arrays.c
@@ -1,7 +1,7 @@
/*
KallistiOS 2.0.0
- main.c
+ gl-arrays.c
(c)2014 Josh Pearson
Open GL example using Vertex Array Submission with Near Z Clipping.
diff --git a/examples/dreamcast/kgl/demos/blur/Makefile b/examples/dreamcast/kgl/demos/blur/Makefile
index 9a19c3e..74c3542 100644
--- a/examples/dreamcast/kgl/demos/blur/Makefile
+++ b/examples/dreamcast/kgl/demos/blur/Makefile
@@ -5,7 +5,7 @@
TARGET = radial_blur.elf
-OBJS = main.o pvr-texture.o
+OBJS = radial_blur.o pvr-texture.o
OBJS += romdisk.o
diff --git a/examples/dreamcast/kgl/demos/blur/main.c b/examples/dreamcast/kgl/demos/blur/radial_blur.c
similarity index 96%
rename from examples/dreamcast/kgl/demos/blur/main.c
rename to examples/dreamcast/kgl/demos/blur/radial_blur.c
index 33991ce..57eabfd 100644
--- a/examples/dreamcast/kgl/demos/blur/main.c
+++ b/examples/dreamcast/kgl/demos/blur/radial_blur.c
@@ -1,7 +1,7 @@
/*
KallistiOS 2.0.0
- main.c
+ radial_blur.c
(c)2014 Josh Pearson
(c)2001 Benoit Miller
(c)2000 Tom Stanis/Jeff Molofee
diff --git a/examples/dreamcast/kgl/demos/mipmap/Makefile b/examples/dreamcast/kgl/demos/mipmap/Makefile
index eef50a2..04b27bd 100644
--- a/examples/dreamcast/kgl/demos/mipmap/Makefile
+++ b/examples/dreamcast/kgl/demos/mipmap/Makefile
@@ -5,7 +5,7 @@
TARGET = gl-mipmap.elf
-OBJS = main.o pvr-texture.o
+OBJS = gl-mipmap.o pvr-texture.o
OBJS += romdisk.o
diff --git a/examples/dreamcast/kgl/demos/mipmap/main.c b/examples/dreamcast/kgl/demos/mipmap/gl-mipmap.c
similarity index 95%
rename from examples/dreamcast/kgl/demos/mipmap/main.c
rename to examples/dreamcast/kgl/demos/mipmap/gl-mipmap.c
index 840b56b..1448ec6 100644
--- a/examples/dreamcast/kgl/demos/mipmap/main.c
+++ b/examples/dreamcast/kgl/demos/mipmap/gl-mipmap.c
@@ -1,7 +1,7 @@
/*
KallistiOS 2.0.0
- main.c
+ gl-mipmap.c
(c)2014 Josh Pearson
Open GL Mip-Map example.
diff --git a/examples/dreamcast/kgl/demos/multitexture-arrays/Makefile b/examples/dreamcast/kgl/demos/multitexture-arrays/Makefile
index 77ddf2f..ab47609 100644
--- a/examples/dreamcast/kgl/demos/multitexture-arrays/Makefile
+++ b/examples/dreamcast/kgl/demos/multitexture-arrays/Makefile
@@ -5,7 +5,7 @@
TARGET = gl-multitex-arrays.elf
-OBJS = main.o pvr-texture.o
+OBJS = gl-multitex-arrays.o pvr-texture.o
OBJS += romdisk.o
diff --git a/examples/dreamcast/kgl/demos/multitexture-arrays/main.c b/examples/dreamcast/kgl/demos/multitexture-arrays/gl-multitex-arrays.c
similarity index 96%
rename from examples/dreamcast/kgl/demos/multitexture-arrays/main.c
rename to examples/dreamcast/kgl/demos/multitexture-arrays/gl-multitex-arrays.c
index 64a61ab..6a839ca 100644
--- a/examples/dreamcast/kgl/demos/multitexture-arrays/main.c
+++ b/examples/dreamcast/kgl/demos/multitexture-arrays/gl-multitex-arrays.c
@@ -1,7 +1,7 @@
/*
KallistiOS 2.0.0
- main.c
+ gl-multitex-arrays.c
(c)2014 Josh Pearson
Open GL Multi-Texture example using Vertex Array Submission.
diff --git a/examples/dreamcast/kgl/demos/multitexture-elements/Makefile b/examples/dreamcast/kgl/demos/multitexture-elements/Makefile
index 3fa7fca..6580e24 100644
--- a/examples/dreamcast/kgl/demos/multitexture-elements/Makefile
+++ b/examples/dreamcast/kgl/demos/multitexture-elements/Makefile
@@ -5,7 +5,7 @@
TARGET = gl-multitex-elements.elf
-OBJS = main.o pvr-texture.o
+OBJS = gl-multitex-elements.o pvr-texture.o
OBJS += romdisk.o
diff --git a/examples/dreamcast/kgl/demos/multitexture-elements/main.c b/examples/dreamcast/kgl/demos/multitexture-elements/gl-multitex-elements.c
similarity index 96%
rename from examples/dreamcast/kgl/demos/multitexture-elements/main.c
rename to examples/dreamcast/kgl/demos/multitexture-elements/gl-multitex-elements.c
index 80d3669..101e437 100644
--- a/examples/dreamcast/kgl/demos/multitexture-elements/main.c
+++ b/examples/dreamcast/kgl/demos/multitexture-elements/gl-multitex-elements.c
@@ -1,7 +1,7 @@
/*
KallistiOS 2.0.0
- main.c
+ gl-multitex-elements.c
(c)2014 Josh Pearson
Open GL Multi-Texture example using Vertex Array Submission.
diff --git a/examples/dreamcast/kgl/demos/specular/Makefile b/examples/dreamcast/kgl/demos/specular/Makefile
index d73f3cb..390c80f 100644
--- a/examples/dreamcast/kgl/demos/specular/Makefile
+++ b/examples/dreamcast/kgl/demos/specular/Makefile
@@ -4,7 +4,7 @@
TARGET = specular.elf
-OBJS = main.o vector.o input.o pvr-texture.o font.o timer.o
+OBJS = specular.o vector.o input.o pvr-texture.o font.o timer.o
OBJS += romdisk.o
diff --git a/examples/dreamcast/kgl/demos/specular/main.c b/examples/dreamcast/kgl/demos/specular/specular.c
similarity index 96%
rename from examples/dreamcast/kgl/demos/specular/main.c
rename to examples/dreamcast/kgl/demos/specular/specular.c
index 36aa6ec..793f388 100644
--- a/examples/dreamcast/kgl/demos/specular/main.c
+++ b/examples/dreamcast/kgl/demos/specular/specular.c
@@ -1,7 +1,7 @@
/*
KallistiOS 2.0.0
- main.c
+ specular.c
(c)2014 Josh Pearson
Open GL Specular Lighting Example .
diff --git a/examples/dreamcast/kgl/nehe/nehe02/Makefile b/examples/dreamcast/kgl/nehe/nehe02/Makefile
index b9f5c7e..b398a66 100644
--- a/examples/dreamcast/kgl/nehe/nehe02/Makefile
+++ b/examples/dreamcast/kgl/nehe/nehe02/Makefile
@@ -6,7 +6,7 @@
TARGET = nehe02.elf
-OBJS = main.o
+OBJS = nehe02.o
all: rm-elf $(TARGET)
diff --git a/examples/dreamcast/kgl/nehe/nehe02/main.c b/examples/dreamcast/kgl/nehe/nehe02/nehe02.c
similarity index 100%
rename from examples/dreamcast/kgl/nehe/nehe02/main.c
rename to examples/dreamcast/kgl/nehe/nehe02/nehe02.c
diff --git a/examples/dreamcast/kgl/nehe/nehe05/Makefile b/examples/dreamcast/kgl/nehe/nehe05/Makefile
index 980db0b..38d5140 100644
--- a/examples/dreamcast/kgl/nehe/nehe05/Makefile
+++ b/examples/dreamcast/kgl/nehe/nehe05/Makefile
@@ -6,7 +6,7 @@
TARGET = nehe05.elf
-OBJS = main.o
+OBJS = nehe05.o
all: rm-elf $(TARGET)
diff --git a/examples/dreamcast/kgl/nehe/nehe05/main.c b/examples/dreamcast/kgl/nehe/nehe05/nehe05.c
similarity index 100%
rename from examples/dreamcast/kgl/nehe/nehe05/main.c
rename to examples/dreamcast/kgl/nehe/nehe05/nehe05.c
diff --git a/examples/dreamcast/kgl/nehe/nehe06/Makefile b/examples/dreamcast/kgl/nehe/nehe06/Makefile
index c199d00..43effa1 100644
--- a/examples/dreamcast/kgl/nehe/nehe06/Makefile
+++ b/examples/dreamcast/kgl/nehe/nehe06/Makefile
@@ -6,7 +6,7 @@
TARGET = nehe06.elf
-OBJS = main.o pvr-texture.o
+OBJS = nehe06.o pvr-texture.o
OBJS += romdisk.o
diff --git a/examples/dreamcast/kgl/nehe/nehe06/main.c b/examples/dreamcast/kgl/nehe/nehe06/nehe06.c
similarity index 100%
rename from examples/dreamcast/kgl/nehe/nehe06/main.c
rename to examples/dreamcast/kgl/nehe/nehe06/nehe06.c
diff --git a/examples/dreamcast/kgl/nehe/nehe08/Makefile b/examples/dreamcast/kgl/nehe/nehe08/Makefile
index 45f4f33..3509eef 100644
--- a/examples/dreamcast/kgl/nehe/nehe08/Makefile
+++ b/examples/dreamcast/kgl/nehe/nehe08/Makefile
@@ -6,7 +6,7 @@
TARGET = nehe08.elf
-OBJS = main.o pvr-texture.o
+OBJS = nehe08.o pvr-texture.o
OBJS += romdisk.o
diff --git a/examples/dreamcast/kgl/nehe/nehe08/main.c b/examples/dreamcast/kgl/nehe/nehe08/nehe08.c
similarity index 100%
rename from examples/dreamcast/kgl/nehe/nehe08/main.c
rename to examples/dreamcast/kgl/nehe/nehe08/nehe08.c
diff --git a/examples/dreamcast/kgl/nehe/nehe09/Makefile b/examples/dreamcast/kgl/nehe/nehe09/Makefile
index 07cb639..92acda4 100644
--- a/examples/dreamcast/kgl/nehe/nehe09/Makefile
+++ b/examples/dreamcast/kgl/nehe/nehe09/Makefile
@@ -6,7 +6,7 @@
TARGET = nehe09.elf
-OBJS = main.o pvr-texture.o
+OBJS = nehe09.o pvr-texture.o
OBJS += romdisk.o
diff --git a/examples/dreamcast/kgl/nehe/nehe09/main.c b/examples/dreamcast/kgl/nehe/nehe09/nehe09.c
...<truncated>...
hooks/post-receive
--
A pseudo Operating System for the Dreamcast.
|
