--- /dev/null
+TOP = ../../../../..
+include $(TOP)/configs/current
+
+LIBNAME = xvmctracker
+
+LIBRARY_INCLUDES = \
+ $(shell pkg-config --cflags-only-I xvmc) \
+ -I$(TOP)/src/gallium/winsys/g3dvl
+
+C_SOURCES = block.c \
+ surface.c \
+ context.c \
+ subpicture.c \
+ attributes.c
+
+include ../../../Makefile.template
--- /dev/null
+#######################################################################
+# SConscript for xvmc state_tracker
+
+Import('*')
+
+if 'xorg/xvmc' in env['statetrackers']:
+
+ env = env.Clone()
+
+ env.Append(CPPPATH = [
+ '#/src/gallium/include',
+ '#/src/gallium/auxiliary',
+ '#/src/gallium/winsys/g3dvl',
+ ])
+
+ env.ParseConfig('pkg-config --cflags --libs xvmc')
+
+ st_xvmc = env.ConvenienceLibrary(
+ target = 'st_xvmc',
+ source = [ 'block.c',
+ 'surface.c',
+ 'context.c',
+ 'subpicture.c',
+ 'attributes.c',
+ ]
+ )
+ Export('st_xvmc')
-TOP = ../../..
+TOP = ../../../../../..
include $(TOP)/configs/current
LIBS = -lXvMCW -lXvMC -lXv -lX11
SOURCES = xsp_winsys.c
-# XXX: Hack, if we include libXvMCapi.a in LIBS none of the symbols are
+# XXX: Hack, if we include libxvmctracker.a in LIBS none of the symbols are
# pulled in by the linker because xsp_winsys.c doesn't refer to them
-OBJECTS = $(SOURCES:.c=.o) $(TOP)/src/xvmc/*.o
+OBJECTS = $(SOURCES:.c=.o) $(TOP)/src/gallium/state_trackers/xorg/xvmc/*.o
LIBS = $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
$(TOP)/src/gallium/auxiliary/vl/libvl.a \
+++ /dev/null
-TOP = ../..
-include $(TOP)/configs/current
-
-#DEFINES += -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\"
-
-SOURCES = block.c \
- surface.c \
- context.c \
- subpicture.c \
- attributes.c
-
-OBJECTS = $(SOURCES:.c=.o)
-
-INCLUDES = -I$(TOP)/src/gallium/include \
- -I$(TOP)/src/gallium/auxiliary \
- -I$(TOP)/src/gallium/winsys/g3dvl
-
-##### RULES #####
-
-.c.o:
- $(CC) -c $(INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@
-
-.S.o:
- $(CC) -c $(INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@
-
-##### TARGETS #####
-
-.PHONY: default clean
-
-default: depend libXvMCapi.a
-
-libXvMCapi.a: $(OBJECTS) Makefile
- $(MKLIB) -o XvMCapi $(MKLIB_OPTIONS) -static $(OBJECTS)
-
-depend: $(SOURCES) Makefile
- $(RM) depend
- touch depend
- $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDES) $(SOURCES)
-
-clean: Makefile
- $(RM) libXvMCapi.a
- $(RM) *.o *~
- $(RM) depend depend.bak
-
--include depend
+++ /dev/null
-Import('*')
-
-if env['platform'] not in ['linux']:
- Return()
-
-env = env.Clone()
-
-env.AppendUnique(CPPPATH = [
- '#/src/gallium/winsys/g3dvl',
-])
-
-XvMCapi = env.StaticLibrary(
- target = 'XvMCapi',
- source = [
- 'block.c',
- 'surface.c',
- 'context.c',
- 'subpicture.c',
- 'attributes.c',
- ],
-)