Merge pull request #69 from yuriks/cmake-cleanup

CMake cleanup

1 files changed, 26 insertions, 11 deletions

diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index 0d737573b..13c3f7b22 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -1,27 +1,42 @@
-set(SRCS    clipper.cpp
+set(SRCS
+            renderer_opengl/generated/gl_3_2_core.c
+            renderer_opengl/renderer_opengl.cpp
+            renderer_opengl/gl_shader_util.cpp
+            debug_utils/debug_utils.cpp
+            clipper.cpp
             command_processor.cpp
             primitive_assembly.cpp
             rasterizer.cpp
             utils.cpp
             vertex_shader.cpp
             video_core.cpp
-            renderer_opengl/renderer_opengl.cpp
-            renderer_opengl/gl_shader_util.cpp
-            debug_utils/debug_utils.cpp)
+            )
 
-set(HEADERS clipper.h
+set(HEADERS
+            debug_utils/debug_utils.h
+            renderer_opengl/generated/gl_3_2_core.h
+            renderer_opengl/gl_shader_util.h
+            renderer_opengl/gl_shaders.h
+            renderer_opengl/renderer_opengl.h
+            clipper.h
             command_processor.h
+            gpu_debugger.h
             math.h
+            pica.h
             primitive_assembly.h
             rasterizer.h
-            utils.h
-            video_core.h
             renderer_base.h
+            utils.h
             vertex_shader.h
             video_core.h
-            renderer_opengl/renderer_opengl.h
-            renderer_opengl/gl_shader_util.h
-            renderer_opengl/gl_shaders.h
-            debug_utils/debug_utils.h)
+            )
+
+create_directory_groups(${SRCS} ${HEADERS})
 
 add_library(video_core STATIC ${SRCS} ${HEADERS})
+
+if (PNG_FOUND)
+    target_link_libraries(video_core ${PNG_LIBRARIES})
+    include_directories(${PNG_INCLUDE_DIRS})
+    add_definitions(${PNG_DEFINITIONS})
+endif()