smyrna Makefile.am

diff --git a/lib/glcomp/Makefile.am b/lib/glcomp/Makefile.am
index 220b47b538757a3d091d69d0ade48d19e29c479e..c829b0c96273706a86ba2fe7b9c8c964f1e8b392 100644 (file)
--- 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 2e58c279d2d07ef585f686fbd85424a9cab1a3d6..0dc258aa7ec86e69d4c98bebaed9d32b1bcba99c 100644 (file)
--- 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
+}