Skip to content
This repository has been archived by the owner on Mar 7, 2024. It is now read-only.

Adding GLUT Shapes support #27

Merged
merged 6 commits into from
Apr 15, 2020
Merged

Adding GLUT Shapes support #27

merged 6 commits into from
Apr 15, 2020

Conversation

iyenal
Copy link
Contributor

@iyenal iyenal commented Apr 15, 2020

PSPGL is missing GLUT shapes support, so this change adds it.
More details on supported shapes on https://github.com/iyenal/PSPGL-OpenGL-Shapes

Copy link
Member

@dbeef dbeef left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good work, once you resolve following discussions (really minor ones) we can merge this

pspgl/glut.c Outdated
@@ -5,6 +5,7 @@
#include <pspkerneltypes.h>
#include <pspctrl.h>
#include <psploadexec.h>
#include "glut_shapes.c" // Disable this if you don't want GLUT shapes support
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.c files are not really intended for including ;)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this include, and instead, in /pspgl/Makefile,
append glut_shapes.c to glut target, like this:

libglut.a_OBJS = \
	glut.o
        glut_shapes.o

@iyenal
Copy link
Contributor Author

iyenal commented Apr 15, 2020

Sure thing

@iyenal
Copy link
Contributor Author

iyenal commented Apr 15, 2020

Should be all good now

@dbeef dbeef merged commit c508bf4 into pspdev:master Apr 15, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants