diff options
| -rw-r--r-- | src/mesa/Android.mk | 4 | ||||
| -rw-r--r-- | src/mesa/Makefile.am | 2 | ||||
| -rw-r--r-- | src/mesa/libdricore/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mesa/sources.mak | 27 |
4 files changed, 7 insertions, 27 deletions
diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk index c32b1c0c16f..552378142c4 100644 --- a/src/mesa/Android.mk +++ b/src/mesa/Android.mk @@ -26,8 +26,6 @@ LOCAL_PATH := $(call my-dir) # Import the following variables: -# MESA_CXX_FILES -# MESA_GALLIUM_CXX_FILES # MESA_GALLIUM_FILES # MESA_FILES # X86_FILES @@ -70,7 +68,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ $(MESA_GALLIUM_FILES) \ - $(MESA_GALLIUM_CXX_FILES) \ $(common_ASM) LOCAL_CFLAGS := $(common_CFLAGS) @@ -108,7 +105,6 @@ LOCAL_C_INCLUDES := \ LOCAL_SRC_FILES := \ $(MESA_FILES) \ - $(MESA_CXX_FILES) \ $(common_ASM) include $(LOCAL_PATH)/Android.gen.mk diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 1f897257ed9..34e8c82fdb1 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -122,7 +122,6 @@ endif libmesa_la_SOURCES = \ $(MESA_FILES) \ - $(MESA_CXX_FILES) \ $(MESA_ASM_FILES_FOR_ARCH) libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la @@ -130,7 +129,6 @@ libmesa_la_LDFLAGS = libmesagallium_la_SOURCES = \ $(MESA_GALLIUM_FILES) \ - $(MESA_GALLIUM_CXX_FILES) \ $(MESA_ASM_FILES_FOR_ARCH) libmesagallium_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am index efd836e45e9..1de6df80ff1 100644 --- a/src/mesa/libdricore/Makefile.am +++ b/src/mesa/libdricore/Makefile.am @@ -35,7 +35,6 @@ AM_CPPFLAGS = \ libdricore@VERSION@_la_SOURCES = \ $(MESA_FILES) \ - $(MESA_CXX_FILES) \ $(LIBGLCPP_GENERATED_FILES) \ $(LIBGLCPP_FILES) \ $(LIBGLSL_FILES) \ diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak index 3c5c14f7fbe..07076c60a5d 100644 --- a/src/mesa/sources.mak +++ b/src/mesa/sources.mak @@ -40,6 +40,7 @@ MAIN_FILES = \ $(SRCDIR)main/fbobject.c \ $(SRCDIR)main/feedback.c \ $(SRCDIR)main/ffvertex_prog.c \ + $(SRCDIR)main/ff_fragment_shader.cpp \ $(SRCDIR)main/fog.c \ $(SRCDIR)main/formats.c \ $(SRCDIR)main/format_pack.c \ @@ -76,6 +77,7 @@ MAIN_FILES = \ $(SRCDIR)main/scissor.c \ $(SRCDIR)main/shaderapi.c \ $(SRCDIR)main/shaderobj.c \ + $(SRCDIR)main/shader_query.cpp \ $(SRCDIR)main/shared.c \ $(SRCDIR)main/state.c \ $(SRCDIR)main/stencil.c \ @@ -99,6 +101,7 @@ MAIN_FILES = \ $(SRCDIR)main/texturebarrier.c \ $(SRCDIR)main/transformfeedback.c \ $(SRCDIR)main/uniforms.c \ + $(SRCDIR)main/uniform_query.cpp \ $(SRCDIR)main/varray.c \ $(SRCDIR)main/version.c \ $(SRCDIR)main/viewport.c \ @@ -106,11 +109,6 @@ MAIN_FILES = \ $(BUILDDIR)main/enums.c \ $(MAIN_ES_FILES) -MAIN_CXX_FILES = \ - $(SRCDIR)main/ff_fragment_shader.cpp \ - $(SRCDIR)main/shader_query.cpp \ - $(SRCDIR)main/uniform_query.cpp - MATH_FILES = \ $(SRCDIR)math/m_debug_clip.c \ $(SRCDIR)math/m_debug_norm.c \ @@ -240,6 +238,7 @@ STATETRACKER_FILES = \ $(SRCDIR)state_tracker/st_extensions.c \ $(SRCDIR)state_tracker/st_format.c \ $(SRCDIR)state_tracker/st_gen_mipmap.c \ + $(SRCDIR)state_tracker/st_glsl_to_tgsi.cpp \ $(SRCDIR)state_tracker/st_manager.c \ $(SRCDIR)state_tracker/st_mesa_to_tgsi.c \ $(SRCDIR)state_tracker/st_program.c \ @@ -248,6 +247,7 @@ STATETRACKER_FILES = \ PROGRAM_FILES = \ $(SRCDIR)program/arbprogparse.c \ $(SRCDIR)program/hash_table.c \ + $(SRCDIR)program/ir_to_mesa.cpp \ $(SRCDIR)program/program.c \ $(SRCDIR)program/program_parse_extra.c \ $(SRCDIR)program/prog_cache.c \ @@ -262,16 +262,12 @@ PROGRAM_FILES = \ $(SRCDIR)program/prog_statevars.c \ $(SRCDIR)program/programopt.c \ $(SRCDIR)program/register_allocate.c \ + $(SRCDIR)program/sampler.cpp \ + $(SRCDIR)program/string_to_uint_map.cpp \ $(SRCDIR)program/symbol_table.c \ $(BUILDDIR)program/lex.yy.c \ $(BUILDDIR)program/program_parse.tab.c - -SHADER_CXX_FILES = \ - $(SRCDIR)program/ir_to_mesa.cpp \ - $(SRCDIR)program/sampler.cpp \ - $(SRCDIR)program/string_to_uint_map.cpp - ASM_C_FILES = \ $(SRCDIR)x86/common_x86.c \ $(SRCDIR)x86/x86_xform.c \ @@ -326,10 +322,6 @@ MESA_FILES = \ $(COMMON_DRIVER_FILES)\ $(ASM_C_FILES) -MESA_CXX_FILES = \ - $(MAIN_CXX_FILES) \ - $(SHADER_CXX_FILES) - # Sources for building Gallium drivers MESA_GALLIUM_FILES = \ $(MAIN_FILES) \ @@ -339,14 +331,9 @@ MESA_GALLIUM_FILES = \ $(PROGRAM_FILES) \ $(SRCDIR)x86/common_x86.c -MESA_GALLIUM_CXX_FILES = \ - $(MESA_CXX_FILES) \ - $(SRCDIR)state_tracker/st_glsl_to_tgsi.cpp - # All the core C sources, for dependency checking ALL_FILES = \ $(MESA_FILES) \ - $(MESA_GALLIUM_CXX_FILES) \ $(MESA_ASM_FILES) \ $(STATETRACKER_FILES) |