From: ljsebald <ljs...@us...> - 2023-09-02 20:24:04
|
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 "UNNAMED PROJECT". The branch, master has been updated via 81329435db6b2c747ee1bde2d3359e78344e0b63 (commit) via 3b708ec4bff95a6c52bf31409c00136e6a65b81d (commit) from ab4993aa4ff611690f777fdf29e5747392c13482 (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 81329435db6b2c747ee1bde2d3359e78344e0b63 Author: Lawrence Sebald <ljs...@us...> Date: Sat Sep 2 16:23:42 2023 -0400 Clean up Makefile for building outside of kos-ports. commit 3b708ec4bff95a6c52bf31409c00136e6a65b81d Author: Lawrence Sebald <ljs...@us...> Date: Sat Sep 2 16:23:25 2023 -0400 Update copyrights ----------------------------------------------------------------------- Summary of changes: Makefile | 14 ++++---------- doc/readme.txt | 7 +++---- include/color.h | 3 +-- include/context.h | 2 +- include/dr.h | 3 +-- include/font.h | 5 ++--- include/list.h | 3 +-- include/matrix.h | 3 +-- include/prim.h | 19 +++++++++---------- include/sprite.h | 3 +-- include/texture.h | 3 +-- src/context.c | 2 +- src/font.c | 2 +- src/mat3d.c | 4 ++-- src/texture.c | 2 +- 15 files changed, 30 insertions(+), 45 deletions(-) diff --git a/Makefile b/Makefile index da1a372..119bc55 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,11 @@ # Parallax for KallistiOS ##version## # # Makefile -# (c)2002 Dan Potter +# Copyright (C) 2002 Megan Potter -TARGET = libparallax.a -OBJS := $(patsubst %.c,%.o,$(wildcard src/*.c)) - -defaultall: create_kos_link $(OBJS) subdirs linklib - -# creates the kos link to the headers -create_kos_link: - rm -f ../include/plx - ln -s ../libparallax/include ../include/plx +TARGET = libparallax.a +OBJS := $(patsubst %.c,%.o,$(wildcard src/*.c)) +KOS_CFLAGS += -Iinclude # Grab the shared Makefile pieces include $(KOS_BASE)/addons/Makefile.prefab diff --git a/doc/readme.txt b/doc/readme.txt index 584f492..6c44430 100644 --- a/doc/readme.txt +++ b/doc/readme.txt @@ -1,5 +1,5 @@ Parallax for KOS ##version## -(c)2002 Dan Potter +Copyright (C) 2002 Megan Potter What is it? @@ -8,7 +8,7 @@ What is it? Parallax is my answer to wanting a nice, simple API with which to write mostly-2D games for KOS. Brian Peek and I both needed something like this which is faster (and cuts around much of the properness of things like KGL) -for our projects, and so we sat down and came up with a basic list of +for our projects, and so we sat down and came up with a basic list of requirements and specs, and I got to coding. @@ -23,7 +23,7 @@ These are the basic requirements we shared: - Speed is an essential priority for things like submitting sprites and vertices; thus anything in the main code path needs to be inlined or made into macros if at all possible, and even use DR where possible. - + - Everything should be based around supporting and enhancing the native libraries rather than replacing them. Thus Parallax can be used with the PVR API or inside a KGL program as if it were all straight PVR calls. @@ -44,4 +44,3 @@ License Parallax is licensed under the same license as KOS (BSD-style). See README.KOS for more specific information. - diff --git a/include/color.h b/include/color.h index fe89f43..41c7380 100644 --- a/include/color.h +++ b/include/color.h @@ -2,7 +2,7 @@ color.h - (c)2002 Dan Potter + Copyright (C) 2002 Megan Potter */ @@ -26,4 +26,3 @@ static inline uint32 plx_pack_color(float a, float r, float g, float b) { __END_DECLS #endif /* __PARALLAX_COLOR */ - diff --git a/include/context.h b/include/context.h index 844b310..6e5d101 100644 --- a/include/context.h +++ b/include/context.h @@ -2,7 +2,7 @@ context.h - (c)2002 Dan Potter + Copyright (C) 2002 Megan Potter */ diff --git a/include/dr.h b/include/dr.h index 7b0a45e..538e34b 100644 --- a/include/dr.h +++ b/include/dr.h @@ -2,7 +2,7 @@ dr.h - (c)2002 Dan Potter + Copyright (C) 2002 Megan Potter */ @@ -49,4 +49,3 @@ static inline void plx_scene_end() { __END_DECLS #endif /* __PARALLAX_DR */ - diff --git a/include/font.h b/include/font.h index 98e5c87..e4ee548 100644 --- a/include/font.h +++ b/include/font.h @@ -2,7 +2,7 @@ font.h - (c)2002 Dan Potter + Copyright (C) 2002 Megan Potter */ @@ -15,7 +15,7 @@ __BEGIN_DECLS /** \file Texture-based font routines. These are equivalent to DCPLIB's - fntTxf routines, but are written entirely in C. + fntTxf routines, but are written entirely in C. */ #include <kos/vector.h> @@ -197,4 +197,3 @@ void plx_fcxt_end(plx_fcxt_t * cxt); __END_DECLS #endif /* __PARALLAX_FONT */ - diff --git a/include/list.h b/include/list.h index a0384b8..fc412a5 100644 --- a/include/list.h +++ b/include/list.h @@ -2,7 +2,7 @@ list.h - (c)2002 Dan Potter + Copyright (C) 2002 Megan Potter */ @@ -31,4 +31,3 @@ __BEGIN_DECLS __END_DECLS #endif /* __PARALLAX_LIST */ - diff --git a/include/matrix.h b/include/matrix.h index c5f12e9..9f6baaf 100644 --- a/include/matrix.h +++ b/include/matrix.h @@ -2,7 +2,7 @@ matrix.h - (c)2002 Dan Potter + Copyright (C) 2002 Megan Potter */ @@ -116,4 +116,3 @@ void plx_mat3d_apply_all(); __END_DECLS #endif /* __PARALLAX_MATRIX */ - diff --git a/include/prim.h b/include/prim.h index bac70a2..6b87564 100644 --- a/include/prim.h +++ b/include/prim.h @@ -2,7 +2,7 @@ prim.h - (c)2002 Dan Potter + Copyright (C) 2002 Megan Potter */ @@ -105,7 +105,7 @@ static inline void plx_vert_fnd(plx_dr_state_t * state, int flags, float x, floa float a, float r, float g, float b) { plx_vertex_t * vert = plx_dr_target(state); - + vert->flags = flags; vert->x = x; vert->y = y; @@ -124,7 +124,7 @@ static inline void plx_vert_ind(plx_dr_state_t * state, int flags, float x, floa uint32 color) { plx_vertex_t * vert = plx_dr_target(state); - + vert->flags = flags; vert->x = x; vert->y = y; @@ -143,7 +143,7 @@ static inline void plx_vert_ffd(plx_dr_state_t * state, int flags, float x, floa float a, float r, float g, float b, float u, float v) { plx_vertex_t * vert = plx_dr_target(state); - + vert->flags = flags; vert->x = x; vert->y = y; @@ -163,7 +163,7 @@ static inline void plx_vert_ifd(plx_dr_state_t * state, int flags, float x, floa uint32 color, float u, float v) { plx_vertex_t * vert = plx_dr_target(state); - + vert->flags = flags; vert->x = x; vert->y = y; @@ -206,7 +206,7 @@ static inline void plx_vert_fnp(int flags, float x, float y, float z, float a, float r, float g, float b) { plx_vertex_t vert; - + vert.flags = flags; vert.x = x; vert.y = y; @@ -223,7 +223,7 @@ static inline void plx_vert_fnp(int flags, float x, float y, float z, */ static inline void plx_vert_inp(int flags, float x, float y, float z, uint32 color) { plx_vertex_t vert; - + vert.flags = flags; vert.x = x; vert.y = y; @@ -250,7 +250,7 @@ static inline void plx_vert_ffp(int flags, float x, float y, float z, float a, float r, float g, float b, float u, float v) { plx_vertex_t vert; - + vert.flags = flags; vert.x = x; vert.y = y; @@ -270,7 +270,7 @@ static inline void plx_vert_ifp(int flags, float x, float y, float z, uint32 color, float u, float v) { plx_vertex_t vert; - + vert.flags = flags; vert.x = x; vert.y = y; @@ -286,4 +286,3 @@ static inline void plx_vert_ifp(int flags, float x, float y, float z, __END_DECLS #endif /* __PARALLAX_PRIM */ - diff --git a/include/sprite.h b/include/sprite.h index 2803ffb..24ecf62 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -2,7 +2,7 @@ sprite.h - (c)2002 Dan Potter + Copyright (C) 2002 Megan Potter */ @@ -329,4 +329,3 @@ static inline void plx_spr_imp( __END_DECLS #endif /* __PARALLAX_SPRITE */ - diff --git a/include/texture.h b/include/texture.h index 4266b2d..7acd51c 100644 --- a/include/texture.h +++ b/include/texture.h @@ -2,7 +2,7 @@ texture.h - (c)2002 Dan Potter + Copyright (C) 2002 Megan Potter */ @@ -103,4 +103,3 @@ void plx_txr_send_hdr(plx_texture_t * txr, int list, int flush); __END_DECLS #endif /* __PARALLAX_TEXTURE */ - diff --git a/src/context.c b/src/context.c index cdefc15..1cb5724 100644 --- a/src/context.c +++ b/src/context.c @@ -2,7 +2,7 @@ context.c - (c)2002 Dan Potter + Copyright (C) 2002 Megan Potter */ diff --git a/src/font.c b/src/font.c index 6ae612f..8cdde08 100644 --- a/src/font.c +++ b/src/font.c @@ -2,7 +2,7 @@ font.c - (c)2002 Dan Potter + Copyright (C) 2002 Megan Potter */ diff --git a/src/mat3d.c b/src/mat3d.c index 240c03f..f674e7a 100644 --- a/src/mat3d.c +++ b/src/mat3d.c @@ -1,8 +1,8 @@ /* Parallax for KallistiOS ##version## mat3d.c - (c)2001-2002 Dan Potter - (c)2002 Benoit Miller and Paul Boese + Copyright (C) 2001-2002 Megan Potter + Copyright (C) 2002 Benoit Miller and Paul Boese */ #include <assert.h> diff --git a/src/texture.c b/src/texture.c index db09bae..59be19e 100644 --- a/src/texture.c +++ b/src/texture.c @@ -2,7 +2,7 @@ texture.c - (c)2002 Dan Potter + Copyright (C) 2002 Megan Potter */ hooks/post-receive -- UNNAMED PROJECT |