# HG changeset patch # User eldar # Date 1242497185 0 # Node ID 17cc45b326863805173cab4e10bebe08baeb5483 # Parent cf8a415f3f3251322243636a0a94525a75f74509 QtOpenGL diff -r cf8a415f3f32 -r 17cc45b32686 Makefile --- a/Makefile Sat May 16 17:12:06 2009 +0000 +++ b/Makefile Sat May 16 18:06:25 2009 +0000 @@ -53,7 +53,7 @@ NAME_PREFIX = qtd endif ifndef $(PACKAGES) -PACKAGES = core gui +PACKAGES = core gui opengl endif LIB_PREFIX = lib CC_INCLUDE += include $(QTDIR_INC) $(QTDIR_INC)$(SL)Qt $(QTDIR_INC)$(SL)QtCore $(QTDIR_INC)$(SL)QtGui $(QTDIR_INC)$(SL)QtOpenGL $(QTDIR_INC)$(SL)QtSvg @@ -135,7 +135,7 @@ cd generator && qmake && $(MAKE) dgen: make_gen - cd generator && $(GEN) $(GEN_OPT) --d-target=$(D_TARGET) --output-directory=../ qtjambi_masterinclude.h build_gui.txt + cd generator && $(GEN) $(GEN_OPT) --d-target=$(D_TARGET) --output-directory=../ qtjambi_masterinclude.h build_opengl.txt ## DGenerator ## end mkdir: diff -r cf8a415f3f32 -r 17cc45b32686 build/opengl.makefile --- a/build/opengl.makefile Sat May 16 17:12:06 2009 +0000 +++ b/build/opengl.makefile Sat May 16 18:06:25 2009 +0000 @@ -13,7 +13,9 @@ ## Classes. ## TODO: use list that generated by dgen. opengl_classes = \ - QGLWidget \ - QGLContext \ - QGLFormat \ - QGLColormap + QGLColormap \ + QGLContext \ + QGLFormat \ + QGLFramebufferObject \ + QGLPixelBuffer \ + QGLWidget \ diff -r cf8a415f3f32 -r 17cc45b32686 build/opengl.txt --- a/build/opengl.txt Sat May 16 17:12:06 2009 +0000 +++ b/build/opengl.txt Sat May 16 18:06:25 2009 +0000 @@ -1,9 +1,11 @@ set(required Core Gui) set(classes - QGLWidget - QGLContext - QGLFormat - QGLColormap + QGLColormap + QGLContext + QGLFormat + QGLFramebufferObject + QGLPixelBuffer + QGLWidget ) if(${CMAKE_SYSTEM_NAME} STREQUAL Windows AND D_IS_MARS) set(link_example opengl32 glu32) diff -r cf8a415f3f32 -r 17cc45b32686 generator/cppimplgenerator.cpp --- a/generator/cppimplgenerator.cpp Sat May 16 17:12:06 2009 +0000 +++ b/generator/cppimplgenerator.cpp Sat May 16 18:06:25 2009 +0000 @@ -501,14 +501,6 @@ InterfaceTypeEntry *ite = static_cast(iface->typeEntry()); QString real_name = ite->origin()->qualifiedCppName(); - - - /*const TypeEntry* te = TypeDatabase::instance()->findType(); - if(te) - real_name = te->qualifiedCppName(); - else - real_name = iface->qualifiedCppName();*/ - s << "extern \"C\" DLL_PUBLIC " << real_name << "* qtd_" << java_class->name() << "_cast_to_" << iface->qualifiedCppName() << "(" << java_class->qualifiedCppName() << " *ptr)" << endl << "{" << endl; Indentation indent(INDENT);