From: ellson <devnull@localhost>
Date: Tue, 26 Feb 2008 19:59:38 +0000 (+0000)
Subject: smyrna Makefile.am
X-Git-Tag: LAST_LIBGRAPH~32^2~4674
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c55f29e4342c9b63580494db37e93c2d360983ab;p=graphviz

smyrna Makefile.am
---

diff --git a/lib/glcomp/Makefile.am b/lib/glcomp/Makefile.am
index 220b47b53..c829b0c96 100644
--- a/lib/glcomp/Makefile.am
+++ b/lib/glcomp/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
 
 if WITH_SMYRNA
 noinst_HEADERS = glcompset.h glcomptexture.h glutils.h
-noinst_LTLIBRARIES = libglcomp.la
+noinst_LTLIBRARIES = libglcomp_C.la
 endif
 
 libglcomp_C_la_SOURCES = glcompset.c glcomptexture.c glutils.c
diff --git a/lib/glcomp/glcomptexture.c b/lib/glcomp/glcomptexture.c
index 2e58c279d..0dc258aa7 100644
--- a/lib/glcomp/glcomptexture.c
+++ b/lib/glcomp/glcomptexture.c
@@ -3,7 +3,11 @@
 glCompTexture* glCompCreateTextureFromRaw(char* filename,int width,int height,int wrap)
 {
 	glCompTexture* t;	
+#ifdef _WIN32
 	BYTE * data;
+#else
+	unsigned char *data;
+#endif
 	FILE * file;
 	t=malloc(sizeof(glCompTexture));
 	glGenTextures( 1, &t->id );
@@ -57,4 +61,4 @@ glCompTexture* glCompCreateTextureFromRaw(char* filename,int width,int height,in
 int glCompDeleteTexture(glCompTexture* t)
 {
 	return 0;
-}
\ No newline at end of file
+}