[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/libs/kgllib [POSSIBLY UNSAFE]
From:       Rivo Laks <rivolaks () hot ! ee>
Date:       2008-07-14 18:13:32
Message-ID: 1216059212.607388.24215.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 832453 by rivol:

Move some classes from extras to core

 M  +14 -0     core/kgllib/CMakeLists.txt  
 A             core/kgllib/batch.cpp   extras/kgllib/batch.cpp#830023 [License: LGPL \
(v2.1+)]  A             core/kgllib/batch.h   extras/kgllib/batch.h#830023 [License: \
LGPL (v2.1+)]  A             core/kgllib/camera.cpp   extras/kgllib/camera.cpp#830023 \
[License: LGPL (v2.1+)]  A             core/kgllib/camera.h   \
extras/kgllib/camera.h#830023 [License: LGPL (v2.1+)]  A             \
core/kgllib/fpscounter.cpp   extras/kgllib/fpscounter.cpp#830023 [License: LGPL \
(v2.1+)]  A             core/kgllib/fpscounter.h   extras/kgllib/fpscounter.h#830023 \
[License: LGPL (v2.1+)]  A             core/kgllib/glwidget.cpp   \
extras/kgllib/glwidget.cpp#830023 [License: LGPL (v2.1+)]  A             \
core/kgllib/glwidget.h   extras/kgllib/glwidget.h#830023 [License: LGPL (v2.1+)]  A   \
core/kgllib/mesh.cpp   extras/kgllib/mesh.cpp#830023 [License: LGPL (v2.1+)]  A       \
core/kgllib/mesh.h   extras/kgllib/mesh.h#830023 [License: LGPL (v2.1+)]  A           \
core/kgllib/textrenderer.cpp   extras/kgllib/textrenderer.cpp#830023 [License: LGPL \
(v2.1+)]  A             core/kgllib/textrenderer.h   \
extras/kgllib/textrenderer.h#830023 [POSSIBLY UNSAFE: system] [License: LGPL (v2.1+)] \
M  +0 -12     extras/kgllib/CMakeLists.txt    D             extras/kgllib/batch.cpp  
 D             extras/kgllib/batch.h  
 D             extras/kgllib/camera.cpp  
 D             extras/kgllib/camera.h  
 D             extras/kgllib/fpscounter.cpp  
 D             extras/kgllib/fpscounter.h  
 D             extras/kgllib/glwidget.cpp  
 D             extras/kgllib/glwidget.h  
 D             extras/kgllib/mesh.cpp  
 D             extras/kgllib/mesh.h  
 D             extras/kgllib/textrenderer.cpp  
 D             extras/kgllib/textrenderer.h  


--- trunk/playground/libs/kgllib/core/kgllib/CMakeLists.txt #832452:832453
@@ -1,6 +1,7 @@
 add_definitions(${QT_DEFINITIONS} -Wall)
 include_directories(
         ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_BINARY_DIR}
         ${QT_INCLUDE_DIR}
         ${QT_QTCORE_INCLUDE_DIR}
         ${QT_QTGUI_INCLUDE_DIR}
@@ -14,7 +15,14 @@
         texture.cpp
         shader.cpp
         program.cpp
+        batch.cpp
+        camera.cpp
+        fpscounter.cpp
+        glwidget.cpp
+        mesh.cpp
+        textrenderer.cpp
         )
+qt4_automoc(${kgllib_SRCS})
 add_library(kgllib SHARED ${kgllib_SRCS})
 
 target_link_libraries(kgllib ${OPENGL_gl_LIBRARY} ${QT_QTOPENGL_LIBRARY} \
${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${GLEW_GLEW_LIBRARY} ${OPENGL_glu_LIBRARY}) \
@@ -30,6 +38,12 @@  texture.h
         shader.h
         program.h
+        batch.h
+        camera.h
+        fpscounter.h
+        glwidget.h
+        mesh.h
+        textrenderer.h
         DESTINATION ${INCLUDE_INSTALL_DIR}/kgllib
         )
 install(TARGETS kgllib ${INSTALL_TARGETS_DEFAULT_ARGS})
--- trunk/playground/libs/kgllib/extras/kgllib/CMakeLists.txt #832452:832453
@@ -11,14 +11,8 @@
         )
 
 set(kgllib-extras_SRCS
-        batch.cpp
-        camera.cpp
-        fpscounter.cpp
-        glwidget.cpp
-        mesh.cpp
         rendertarget.cpp
         simpleterrain.cpp
-        textrenderer.cpp
         trackball.cpp
         )
 qt4_automoc(${kgllib-extras_SRCS})
@@ -31,14 +25,8 @@
         DEFINE_SYMBOL MAKE_KGLLIB_EXTRAS_LIB)
 
 install(FILES
-        batch.h
-        camera.h
-        fpscounter.h
-        glwidget.h
-        mesh.h
         rendertarget.h
         simpleterrain.h
-        textrenderer.h
         trackball.h
         DESTINATION ${INCLUDE_INSTALL_DIR}/kgllib
         )


[prev in list] [next in list] [prev in thread] [next in thread]