[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1090-gd7ccfb2

[darcagn <da...@us...>]

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  d7ccfb255387c3c8c97367e1203588ae34a10721 (commit)
       via  531663982cbef4b265ffd8cb79918687837e0c40 (commit)
      from  6da37bf27613e8cb64db4ae00f46af20ed98330e (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 d7ccfb255387c3c8c97367e1203588ae34a10721
Merge: 6da37bf 5316639
Author: darcagn <da...@pr...>
Date:   Tue Oct 24 21:55:23 2023 -0500

    Merge pull request #330 from KallistiOS/maple_fix
    
    Fixed broken KGL examples

commit 531663982cbef4b265ffd8cb79918687837e0c40
Author: Falco Girgis <gyr...@gm...>
Date:   Tue Oct 24 21:51:41 2023 -0500

    Fixed broken KGL examples
    
    - When we added "press start to exit," we forgot to include controller.h
      in a few places

-----------------------------------------------------------------------

Summary of changes:
 examples/dreamcast/kgl/basic/elements/gl-elements.c   | 1 +
 examples/dreamcast/kgl/basic/zclip_arrays/gl-arrays.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/examples/dreamcast/kgl/basic/elements/gl-elements.c b/examples/dreamcast/kgl/basic/elements/gl-elements.c
index 2a2fd2e..fd70fe4 100644
--- a/examples/dreamcast/kgl/basic/elements/gl-elements.c
+++ b/examples/dreamcast/kgl/basic/elements/gl-elements.c
@@ -16,6 +16,7 @@
 #include <GL/glut.h>
 
 #include <kos/init.h>
+#include <dc/maple/controller.h>
 
 /* Load a PVR texture - located in pvr-texture.c */
 extern GLuint glTextureLoadPVR(char *fname, unsigned char isMipMapped, unsigned char glMipMap);
diff --git a/examples/dreamcast/kgl/basic/zclip_arrays/gl-arrays.c b/examples/dreamcast/kgl/basic/zclip_arrays/gl-arrays.c
index a18e829..49fa666 100644
--- a/examples/dreamcast/kgl/basic/zclip_arrays/gl-arrays.c
+++ b/examples/dreamcast/kgl/basic/zclip_arrays/gl-arrays.c
@@ -16,6 +16,7 @@
 #include <GL/glut.h>
 
 #include <kos/init.h>
+#include <dc/maple/controller.h>
 
 /* Load a PVR texture - located in pvr-texture.c */
 extern GLuint glTextureLoadPVR(char *fname, unsigned char isMipMapped, unsigned char glMipMap);


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.