Added support for glArrayElement(EXT|) to the immediate mode layer.
Support NUM_EXTENSIONS in glGet(Integer|Float|Double|Boolean|Integer64)v(EXT|)
Added interception for glGetStringi and glGetIntergerv
Improve loading of GLES and EGL libraries on Android
Various bug fixes...
Merged pull requests:
#131 NaCL Pepper now uses GLES2 prefix for ES2.0 functions, rather than gl
#130 Copyright bump to 2014
#129 NaCL-related build tweaks for regaltest, nacl example and pnacl.
#128 GLEW refresh
#126 boost::print fix for mapping 'long' and 'long long' to 32-bit or 64-bit for length purposes
#125 Resolve clang compilation error: lookup of 'Depth' in member access expression is ambiguous
#124 Add Makefile support for gcc-4.4, gcc-4.6 and clang toolchains on Linux.
#116 Make it compile with Visual Studio 2013 (VC12)
83 lines
2.4 KiB
Text
83 lines
2.4 KiB
Text
ifndef MAKEFILE_REGALTEST_INCLUDED
|
|
MAKEFILE_REGALTEST_INCLUDED := 1
|
|
|
|
.PHONY: regaltest.bin regaltest.clean
|
|
|
|
include build/common.inc
|
|
|
|
# Not supported for Emscripten - Revisit
|
|
|
|
ifeq ($(filter emscripten% nacl-pnacl,$(SYSTEM)),)
|
|
|
|
include build/regaltest.inc
|
|
|
|
#
|
|
# regaltest
|
|
#
|
|
|
|
include Makefile.regal
|
|
include Makefile.pcrelib
|
|
include Makefile.glsloptlib
|
|
include Makefile.gtest
|
|
|
|
ifndef REGAL.STATIC
|
|
$(error regaltest needs Regal.)
|
|
endif
|
|
|
|
ifndef GTEST.STATIC
|
|
$(error regaltest needs google test.)
|
|
endif
|
|
|
|
all:: regaltest.bin
|
|
|
|
clean:: regaltest.clean
|
|
|
|
regaltest.bin: bin/$(SYSTEM)/regaltest$(BIN_EXTENSION)
|
|
|
|
regaltest.clean:
|
|
$(RM) -r tmp/$(SYSTEM)/regaltest/static
|
|
$(RM) -r bin/$(SYSTEM)/regaltest$(BIN_EXTENSION)
|
|
|
|
REGALTEST.SRCS += $(REGALTEST.CXX)
|
|
REGALTEST.SRCS.NAMES := $(notdir $(REGALTEST.SRCS))
|
|
REGALTEST.OBJS := $(addprefix tmp/$(SYSTEM)/regaltest/static/,$(REGALTEST.SRCS.NAMES))
|
|
REGALTEST.OBJS := $(REGALTEST.OBJS:.cpp=.o)
|
|
REGALTEST.DEPS := $(REGALTEST.DEPS:.o=.d)
|
|
REGALTEST.CFLAGS := -Isrc/googletest/include -Isrc/googlemock/include -Isrc/regal -Isrc/boost -Isrc/lookup3 -Isrc/pcre
|
|
REGALTEST.LIBS := -Llib/$(SYSTEM) $(LDFLAGS.X11) -lm
|
|
|
|
ifeq ($(filter nacl%,$(SYSTEM)),)
|
|
REGALTEST.LIBS += -ldl
|
|
else
|
|
REGALTEST.LIBS += -lnacl_io -lppapi -lppapi_gles2
|
|
endif
|
|
|
|
-include $(REGALTEST.DEPS)
|
|
|
|
tmp/$(SYSTEM)/regaltest/static/%.o: tests/%.cpp
|
|
@mkdir -p $(dir $@)
|
|
$(LOG_CXX)$(CCACHE) $(CXX) $(REGAL.CFLAGS) $(REGALTEST.CFLAGS) $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
|
|
|
|
bin/$(SYSTEM)/regaltest$(BIN_EXTENSION): $(REGALTEST.OBJS) lib/$(SYSTEM)/$(GTEST.STATIC) lib/$(SYSTEM)/$(REGAL.STATIC) lib/$(SYSTEM)/$(PCRE.STATIC) $(REGAL.SHARED.DEPEND)
|
|
@mkdir -p $(dir $@)
|
|
ifdef APITRACE.STATIC
|
|
$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(REGALTEST.OBJS) $(LDFLAGS.STARTGROUP) lib/$(SYSTEM)/$(REGAL.STATIC) lib/$(SYSTEM)/$(APITRACE.STATIC) $(LDFLAGS.ENDGROUP) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) $(REGALTEST.LIBS) lib/$(SYSTEM)/$(PCRE.STATIC) lib/$(SYSTEM)/$(GTEST.STATIC) $(REGAL.LDFLAGS)
|
|
else
|
|
$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(REGALTEST.OBJS) lib/$(SYSTEM)/$(REGAL.STATIC) lib/$(SYSTEM)/$(PCRE.STATIC) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) $(REGALTEST.LIBS) lib/$(SYSTEM)/$(GTEST.STATIC) $(REGAL.LDFLAGS)
|
|
endif
|
|
ifneq ($(STRIP),)
|
|
$(LOG_STRIP)$(STRIP) -x $@
|
|
endif
|
|
|
|
ifneq ($(NACL_ARCH),arm)
|
|
test: bin/$(SYSTEM)/regaltest$(BIN_EXTENSION)
|
|
@echo Running tests: $^
|
|
ifeq ($(filter nacl%,$(SYSTEM)),)
|
|
$^
|
|
else
|
|
"$(NACL_SDK_ROOT)/tools/sel_ldr.py" $^
|
|
endif
|
|
endif
|
|
|
|
endif
|
|
endif
|