From: Sangjin Kim Date: Thu, 7 Mar 2013 09:41:15 +0000 (+0900) Subject: Add check-gl binary for gl capability check by emulator manager. X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1061 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63f61c35a7a3602a48fef9e130176b846487e159;p=sdk%2Femulator%2Fqemu.git Add check-gl binary for gl capability check by emulator manager. Signed-off-by: Sangjin Kim --- diff --git a/Makefile.target b/Makefile.target index 5fa5c814aa..a0175dfcdb 100755 --- a/Makefile.target +++ b/Makefile.target @@ -62,7 +62,7 @@ else stap: endif -all: $(PROGS) stap +all: $(PROGS) stap check-gl # Dummy command so that make thinks it has done something @true @@ -298,6 +298,30 @@ $(QEMU_PROG): $(all-obj-y) $(call LINK,$^) endif +CHECK_GL_OBJS = check_gl.o gloffscreen_test.o gloffscreen_common.o +CHECK_GL_LDFLAGS = +CHECK_GL_TARGET = +ifdef CONFIG_LINUX +CHECK_GL_OBJS += gloffscreen_xcomposite.o +CHECK_GL_LDFLAGS += -lGL -lXcomposite -lXext -lglib-2.0 +CHECK_GL_TARGET = check-gl +endif +ifdef CONFIG_WIN32 +CHECK_GL_OBJS += gloffscreen_wgl.o +CHECK_GL_LDFLAGS += -fstack-protector `pkg-config --libs glib-2.0` -lopengl32 -lglu32 -lgdi32 +CHECK_GL_TARGET = check-gl.exe +endif +ifdef CONFIG_DARWIN +CHECK_GL_OBJS += gloffscreen_agl.o +CHECK_GL_LDFLAGS += -mmacosx-version-min=10.4 `pkg-config --cflags --libs glib-2.0` -framework GLUT -framework OpenGL -framework AGL +CHECK_GL_TARGET = check-gl +endif + +check-gl: check_gl.o + gcc -o $(CHECK_GL_TARGET) $(CHECK_GL_OBJS) $(CHECK_GL_LDFLAGS) +check_gl.o: check_gl.c + gcc -c ../tizen/src/check_gl.c + gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@") diff --git a/tizen/src/Makefile b/tizen/src/Makefile index 2d068d629b..4dc67fdfe3 100755 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -27,6 +27,7 @@ endif ifdef CONFIG_DARWIN $(CC) -mmacosx-version-min=10.4 -o check-hax check_hax.c endif + skin_client: ant -buildfile skin/client/build.xml make-jar @@ -100,13 +101,16 @@ endif cp skin/client/emulator-skin.jar $(EMUL_DIR)/bin ifdef CONFIG_WIN32 + cp ../../i386-softmmu/check-gl.exe $(EMUL_DIR)/bin/ cp check-hax.exe $(EMUL_DIR)/bin endif ifdef CONFIG_DARWIN + cp ../../i386-softmmu/check-gl $(EMUL_DIR)/bin/ cp check-hax $(EMUL_DIR)/bin cp sdbscript $(EMUL_DIR)/bin endif ifdef CONFIG_LINUX + cp ../../i386-softmmu/check-gl $(EMUL_DIR)/bin/ cp -pPr ../distrib/initscript/tizen-kvm $(EMUL_DIR)/etc cp -pPr ../distrib/initscript/45-tizen-kvm.rules $(EMUL_DIR)/etc endif diff --git a/tizen/src/check_gl.c b/tizen/src/check_gl.c new file mode 100644 index 0000000000..1d83edb235 --- /dev/null +++ b/tizen/src/check_gl.c @@ -0,0 +1,7 @@ +#include "hw/gloffscreen_test.h" +#include "debug_ch.h" + +int main (int argc, char** argv) +{ + return gl_acceleration_capability_check(); +}