Merge branch 'master' of slp-info.sec.samsung.net:slp/pkgs/c/coregl

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..96a73e0
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,49 @@
+CC = gcc
+
+CFLAGS = -g -O2 -fvisibility=hidden -fPIC -Wall -std=c99 \
+       -D_COREGL_EMBEDDED_GL\
+
+LDFLAGS = -g -O2 -fvisibility=hidden -Wall -std=c99 -fPIC -ldl -lpthread -lGLESv2 -lEGL
+
+SOURCES = \
+               src/coregl.c \
+               src/coregl_thread_pthread.c \
+               src/coregl_trace.c \
+               src/coregl_override.c \
+               src/coregl_wrappath.c \
+               src/coregl_wrappath_egl.c \
+               src/coregl_wrappath_gl.c \
+               src/coregl_fastpath.c \
+               src/coregl_fastpath_egl.c \
+               src/coregl_fastpath_gl.c
+
+BIN = libCOREGL.so.1.1
+
+OBJECTS = $(SOURCES:.c=.o)
+
+all : $(BIN)
+       ln -sf $(BIN) lib/libCOREGL.so
+       ln -sf $(BIN) lib/libCOREGL.so.1
+       ln -sf $(BIN) lib/libEGL.so
+       ln -sf $(BIN) lib/libEGL.so.1
+       ln -sf $(BIN) lib/libEGL.so.1.4
+       ln -sf $(BIN) lib/libGLESv2.so
+       ln -sf $(BIN) lib/libGLESv2.so.2
+       ln -sf $(BIN) lib/libGLESv2.so.2.0
+       cp src/headers/egl.h include/EGL/def_egl.h
+       cp src/headers/gl.h include/GLES2/def_gl.h
+       cp src/headers/sym_egl.h include/EGL/sym_egl.h
+       cp src/headers/sym_gl.h include/GLES2/sym_gl.h
+#      ln -sf `readlink -f /usr/lib/libEGL.so` lib/libEGL_drv.so
+#      ln -sf `readlink -f /usr/lib/libGLESv2.so` lib/libGLESv2_drv.so
+
+$(BIN) : $(OBJECTS)
+       @mkdir -p lib
+       $(CC) -shared -o lib/$(BIN) $(OBJECTS) $(LDFLAGS)
+
+%.o : %.c
+       $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+
+clean:
+       rm -f $(OBJECTS) lib/*
+

diff --git a/src/coregl_internal.h b/src/coregl_internal.h
index b973b50..e295554 100644 (file)
--- a/src/coregl_internal.h
+++ b/src/coregl_internal.h
@@ -46,7 +46,7 @@ typedef GLuint       GLuintmask;
 //#define COREGL_TRACE_ALL
 #define COREGL_TRACE_CONTEXT_INFO
 #define COREGL_TRACE_STATE_INFO
-#define COREGL_TRACE_APICALL_INFO
+//#define COREGL_TRACE_APICALL_INFO
 
 #ifdef COREGL_TRACE_ALL
 #define COREGL_TRACE_CONTEXT_INFO   // Context state & thread state & Glue-context info