diff options
| author |  Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-08-23 22:22:05 -0300 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-09-01 18:06:30 -0300 |
| commit | 45976da975a21359cfcc9a05c575ed8b07575612 (patch) | |
| tree | ac688d083cd597f12c42b5e424bb7a66cad50c45 /src/citra/CMakeLists.txt | |
| parent | 523385955c3c0af2dc2133546490f8ede0dd824f (diff) | |
CMake cleanup
Several cleanups to the buildsystem:
- Do better factoring of common libs between platforms.
- Add support to building on Windows.
- Remove Qt4 support.
- Re-sort file lists and add missing headers.
Diffstat (limited to 'src/citra/CMakeLists.txt')
| -rw-r--r-- | src/citra/CMakeLists.txt | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index bd6c4a1a..f10f3e60 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt @@ -1,6 +1,13 @@ -set(SRCS citra.cpp - emu_window/emu_window_glfw.cpp) -set(HEADERS resource.h) +set(SRCS + emu_window/emu_window_glfw.cpp + citra.cpp + ) +set(HEADERS + emu_window/emu_window_glfw.h + resource.h + ) + +create_directory_groups(${SRCS} ${HEADERS}) # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) if (NOT X11_xf86vmode_LIB) @@ -8,11 +15,16 @@ if (NOT X11_xf86vmode_LIB) endif() add_executable(citra ${SRCS} ${HEADERS}) +target_link_libraries(citra core common video_core) +target_link_libraries(citra ${OPENGL_gl_LIBRARY} ${GLFW_LIBRARIES}) if (APPLE) - target_link_libraries(citra core common video_core iconv pthread ${COREFOUNDATION_LIBRARY} ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES}) -else() - target_link_libraries(citra core common video_core pthread X11 Xxf86vm Xi Xcursor ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB} ${PNG_LIBRARIES}) + target_link_libraries(citra iconv pthread ${COREFOUNDATION_LIBRARY}) +elseif (WIN32) + target_link_libraries(citra winmm) +else() # Unix + target_link_libraries(citra pthread rt) + target_link_libraries(citra ${X11_X11_LIB} ${X11_Xi_LIB} ${X11_Xcursor_LIB} ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) endif() #install(TARGETS citra RUNTIME DESTINATION ${bindir}) |