Mercurial > projects > qtd
changeset 34:17cc45b32686
QtOpenGL
author | eldar |
---|---|
date | Sat, 16 May 2009 18:06:25 +0000 |
parents | cf8a415f3f32 |
children | 5917a613d118 |
files | Makefile build/opengl.makefile build/opengl.txt generator/cppimplgenerator.cpp |
diffstat | 4 files changed, 14 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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 \
--- 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)
--- 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<InterfaceTypeEntry*>(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);