diff --git a/.gitignore b/.gitignore index a85eb9fe..8c91f451 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ Makefile *.dat *.kdev* *.cbp -CMakeLists.txt.user +CMakeLists.txt.user* /modules/myconfig.otml /modules/myotclientrc.lua !.gitignore diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt index 9eccf9c0..c2c1263d 100644 --- a/src/framework/CMakeLists.txt +++ b/src/framework/CMakeLists.txt @@ -53,26 +53,16 @@ IF(OPENGLES STREQUAL "2.0") ADD_DEFINITIONS(-DOPENGL_ES=2) SET(OPENGL_INCLUDE_DIR ${EGL_INCLUDE_DIR} ${OPENGLES2_INCLUDE_DIR}) SET(OPENGL_LIBRARIES ${EGL_LIBRARY} ${OPENGLES2_LIBRARY}) - - SET(framework_SOURCES ${framework_SOURCES} - ${CMAKE_CURRENT_LIST_DIR}/graphics/painterogl2.cpp) ELSEIF(OPENGLES STREQUAL "1.0") FIND_PACKAGE(OpenGLES1 REQUIRED) FIND_PACKAGE(EGL REQUIRED) ADD_DEFINITIONS(-DOPENGL_ES=1) SET(OPENGL_INCLUDE_DIR ${EGL_INCLUDE_DIR} ${OPENGLES1_INCLUDE_DIR}) SET(OPENGL_LIBRARIES ${EGL_LIBRARY} ${OPENGLES1_LIBRARY}) - - SET(framework_SOURCES ${framework_SOURCES} - ${CMAKE_CURRENT_LIST_DIR}/graphics/painterogl1.cpp) ELSE() FIND_PACKAGE(OpenGL REQUIRED) FIND_PACKAGE(GLEW REQUIRED) SET(OPENGL_LIBRARIES ${GLEW_LIBRARY} ${OPENGL_LIBRARIES}) - - SET(framework_SOURCES ${framework_SOURCES} - ${CMAKE_CURRENT_LIST_DIR}/graphics/painterogl1.cpp - ${CMAKE_CURRENT_LIST_DIR}/graphics/painterogl2.cpp) ENDIF() MESSAGE(STATUS "OpenGL ES: " ${OPENGLES})