From f4a58dd852e0ebfb1f7db845483c525a078228e4 Mon Sep 17 00:00:00 2001 From: HuYingzhuo Date: Fri, 22 Mar 2019 23:04:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BCMAKE=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BD=BF=E5=85=B6=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E5=8C=85=E6=8B=ACINCLUDE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 8 +++++--- src/RenderDriver/CMakeLists.txt | 31 +++++++++++++++++++------------ 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d575ee4f..34680546 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,9 +27,11 @@ add_definitions(-DMATH_USE_OPENGL) add_definitions(-DMATH_RIGHTHANDED_CAMERA) add_definitions(-DMATH_AVX) -include_directories(3rdpty/MathGeoLib/src) -include_directories(3rdpty/GLEWCore/inc) -include_directories(inc) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/MathGeoLib/src) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/GLEWCore/inc) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/inc) + +SET(ROOT_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/inc) add_subdirectory(3rdpty/MathGeoLib) add_subdirectory(3rdpty/GLEWCore) diff --git a/src/RenderDriver/CMakeLists.txt b/src/RenderDriver/CMakeLists.txt index 72d9546d..5cfd006a 100644 --- a/src/RenderDriver/CMakeLists.txt +++ b/src/RenderDriver/CMakeLists.txt @@ -1,13 +1,20 @@ -add_library(ULRE.RenderDriver STATIC OpenGLDebug.cpp - OpenGLExt.cpp - GLSL.cpp - Shader.cpp - VertexArray.cpp - VertexBuffer.cpp - VertexBufferObject.cpp - TextureFormat.cpp - Texture1D.cpp - Texture1DDSA.cpp - Texture2D.cpp - Texture2DDSA.cpp) +FILE(GLOB_RECURSE GRAPH_INC_FILES "${ROOT_INCLUDE_PATH}/hgl/graph/*.h") +SET(GRAPH_SRC_FILES OpenGLDebug.cpp + OpenGLExt.cpp + GLSL.cpp + Shader.cpp + VertexArray.cpp + VertexBuffer.cpp + VertexBufferObject.cpp + TextureFormat.cpp + Texture1D.cpp + Texture1DDSA.cpp + Texture2D.cpp + Texture2DDSA.cpp) + +source_group("Headers" FILES ${GRAPH_INC_FILES}) +source_group("Sources" FILES ${GRAPH_SRC_FILES}) + +add_library(ULRE.RenderDriver STATIC ${GRAPH_INC_FILES} + ${GRAPH_SRC_FILES})