st/es: Fix build issue after merge.

In c847a13d38d4e8c5f4c386d060dcc8ec09e491a3, auxiliaries becomes a
single library;  In e388d62b4712bcd75cecad53f5ca20a2bb6f89b1, the
default build is changed to have -fvisibility=hidden.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>

diff --git a/src/gallium/state_trackers/es/Makefile b/src/gallium/state_trackers/es/Makefile
index 41d4ccb..b8ee0c8 100644 (file)
--- a/src/gallium/state_trackers/es/Makefile
+++ b/src/gallium/state_trackers/es/Makefile
@@ -26,13 +26,6 @@ ES1_OBJECTS = st_es1.o
 ES2_OBJECTS = st_es2.o
 
 
-# we only need the gallium libs that the state trackers directly use:
-GALLIUM_LIBS = \
-       $(TOP)/src/gallium/auxiliary/cso_cache/libcso_cache.a \
-       $(TOP)/src/gallium/auxiliary/rtasm/librtasm.a \
-       $(TOP)/src/gallium/auxiliary/tgsi/libtgsi.a \
-       $(TOP)/src/gallium/auxiliary/util/libutil.a
-
 ES1_LIBS = \
        $(TOP)/src/mesa/es/libes1gallium.a \
        $(TOP)/src/mesa/es/libes1api.a
@@ -44,35 +37,36 @@ ES2_LIBS = \
 SYS_LIBS = -lm -pthread
 
 
+INCLUDE_DIRS = \
+       -I$(TOP)/src/gallium/include
+
 .c.o:
-       $(CC) -c $(CFLAGS) $< -o $@
+       $(CC) -c $(INCLUDE_DIRS) $(DEFINES) $(CFLAGS) $< -o $@
 
 
 # Default: make both GL ES 1.1 and GL ES 2.0 libraries
 default: $(TOP)/$(LIB_DIR)/$(GLES_1_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLES_2_LIB_NAME)
 
 # Make the shared libs
-$(TOP)/$(LIB_DIR)/$(GLES_1_LIB_NAME): $(ES1_OBJECTS) $(ES1_LIBS)
-       $(TOP)/bin/mklib -o $(GLES_1_LIB) \
+$(TOP)/$(LIB_DIR)/$(GLES_1_LIB_NAME): $(ES1_OBJECTS) $(ES1_LIBS) $(GALLIUM_AUXILIARIES)
+       $(MKLIB) -o $(GLES_1_LIB) \
                -major $(GLES_1_VERSION_MAJOR) \
                -minor $(GLES_1_VERSION_MINOR) \
                -patch $(GLES_1_VERSION_PATCH) \
-               -install $(TOP)/$(LIB_DIR) \
+               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
                $(ES1_OBJECTS) \
                -Wl,--whole-archive $(ES1_LIBS) -Wl,--no-whole-archive \
-               -Wl,--start-group $(GALLIUM_LIBS) -Wl,--end-group  \
-               $(SYS_LIBS)
+               $(GALLIUM_AUXILIARIES) $(SYS_LIBS)
 
-$(TOP)/$(LIB_DIR)/$(GLES_2_LIB_NAME): $(ES2_OBJECTS) $(ES1_LIBS)
-       $(TOP)/bin/mklib -o $(GLES_2_LIB) \
+$(TOP)/$(LIB_DIR)/$(GLES_2_LIB_NAME): $(ES2_OBJECTS) $(ES1_LIBS) $(GALLIUM_AUXILIARIES)
+       $(MKLIB) -o $(GLES_2_LIB) \
                -major $(GLES_2_VERSION_MAJOR) \
                -minor $(GLES_2_VERSION_MINOR) \
                -patch $(GLES_2_VERSION_PATCH) \
-               -install $(TOP)/$(LIB_DIR) \
+               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
                $(ES2_OBJECTS) \
                -Wl,--whole-archive $(ES2_LIBS) -Wl,--no-whole-archive \
-               -Wl,--start-group $(GALLIUM_LIBS) -Wl,--end-group  \
-               $(SYS_LIBS)
+               $(GALLIUM_AUXILIARIES) $(SYS_LIBS)
 
 install: default
        $(INSTALL) -d $(INSTALL_DIR)/include/GLES
@@ -86,3 +80,5 @@ install: default
 clean:
        -rm -f *.o *~
        -rm -f $(TOP)/$(LIB_DIR)/$(GLES_1_LIB_NAME)* $(TOP)/$(LIB_DIR)/$(GLES_2_LIB_NAME)*
+
+depend:

diff --git a/src/gallium/state_trackers/es/st_es1.c b/src/gallium/state_trackers/es/st_es1.c
index 7f0c038..25bc53b 100644 (file)
--- a/src/gallium/state_trackers/es/st_es1.c
+++ b/src/gallium/state_trackers/es/st_es1.c
@@ -1 +1,3 @@
-const int st_api_OpenGL_ES1 = 1;
+#include "pipe/p_compiler.h"
+
+PUBLIC const int st_api_OpenGL_ES1 = 1;

diff --git a/src/gallium/state_trackers/es/st_es2.c b/src/gallium/state_trackers/es/st_es2.c
index 78e3791..171ea62 100644 (file)
--- a/src/gallium/state_trackers/es/st_es2.c
+++ b/src/gallium/state_trackers/es/st_es2.c
@@ -1 +1,3 @@
-const int st_api_OpenGL_ES2 = 1;
+#include "pipe/p_compiler.h"
+
+PUBLIC const int st_api_OpenGL_ES2 = 1;