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 96f71f6868564925313769556e60788781df0818 (commit)
from 85ce519a5c80ef031529adb0fee716b2e0f50e5d (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 96f71f6868564925313769556e60788781df0818
Author: Lawrence Sebald <ljs...@us...>
Date: Fri May 8 23:09:52 2015 -0400
Fix compilation in new kos-ports.
-----------------------------------------------------------------------
Summary of changes:
Makefile | 1 +
tga.c | 4 ++--
tga_texture.c | 5 ++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 0b84269..7e527a3 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@
TARGET = libtga.a
OBJS = tga.o
+KOS_CFLAGS += -Iinclude
all: create_kos_link defaultall
diff --git a/tga.c b/tga.c
index 705cd96..152991b 100644
--- a/tga.c
+++ b/tga.c
@@ -14,8 +14,8 @@
*/
#include <kos.h>
-#include <tga/tga.h>
#include <assert.h>
+#include "tga.h"
typedef struct {
uint8 image_id_length __attribute__((packed)); /* Length of Image ID field */
@@ -91,7 +91,7 @@ int tga_to_img(const char *fn, kos_img_t *rv) {
fs_read(fd, &g, 1);
fs_read(fd, &r, 1);
fs_read(fd, &a, 1);
-
+
/* Cheap scaling to ARGB4444 */
a = a >> 4 & 0x0f;
r = r >> 4 & 0x0f;
diff --git a/tga_texture.c b/tga_texture.c
index 66701d0..1ec0d1c 100644
--- a/tga_texture.c
+++ b/tga_texture.c
@@ -7,9 +7,9 @@
*/
#include <kos.h>
-#include <tga/tga.h>
+#include "tga.h"
-/* Loads a TGA file into texture RAM, potentially twiddling it.
+/* Loads a TGA file into texture RAM, potentially twiddling it.
TGA files already include an alpha channel. */
int tga_load_texture(const char *fn, int twiddle, uint32 *txr_out, int *w, int *h) {
kos_img_t img;
@@ -36,4 +36,3 @@ int tga_load_texture(const char *fn, int twiddle, uint32 *txr_out, int *w, int *
return 0;
}
-
hooks/post-receive
--
UNNAMED PROJECT
|
