diff options
| author | 2014-05-19 15:19:36 -0700 | |
|---|---|---|
| committer | 2014-05-19 15:19:36 -0700 | |
| commit | 403e4bf837c47c7e10dc006fafffea8c160c890f (patch) | |
| tree | 40e17e39c19fbedd6903d4985950c23d785b27b7 /src | |
| parent | Indent fixes (diff) | |
| download | yuzu-403e4bf837c47c7e10dc006fafffea8c160c890f.tar.gz yuzu-403e4bf837c47c7e10dc006fafffea8c160c890f.tar.xz yuzu-403e4bf837c47c7e10dc006fafffea8c160c890f.zip | |
CMakeLists: rename HEADS, improved comments
Changes for clarity of comments, removed redundant compiler flags.
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/citra_qt/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/common/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/video_core/CMakeLists.txt | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index 7787d6a72..1ad607d76 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | set(SRCS citra.cpp | 1 | set(SRCS citra.cpp |
| 2 | emu_window/emu_window_glfw.cpp) | 2 | emu_window/emu_window_glfw.cpp) |
| 3 | set(HEADS citra.h | 3 | set(HEADERS citra.h |
| 4 | resource.h) | 4 | resource.h) |
| 5 | 5 | ||
| 6 | # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) | 6 | # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) |
| @@ -8,7 +8,7 @@ if (NOT X11_xf86vmode_LIB) | |||
| 8 | set(X11_xv86vmode_LIB Xxf86vm) | 8 | set(X11_xv86vmode_LIB Xxf86vm) |
| 9 | endif() | 9 | endif() |
| 10 | 10 | ||
| 11 | add_executable(citra ${SRCS} ${HEADS}) | 11 | add_executable(citra ${SRCS} ${HEADERS}) |
| 12 | 12 | ||
| 13 | if (APPLE) | 13 | if (APPLE) |
| 14 | target_link_libraries(citra core common video_core iconv pthread ${COREFOUNDATION_LIBRARY} ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLFW_LIBRARIES}) | 14 | target_link_libraries(citra core common video_core iconv pthread ${COREFOUNDATION_LIBRARY} ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLFW_LIBRARIES}) |
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index 9d983c0f0..549f69217 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/citra_qt/CMakeLists.txt | |||
| @@ -8,7 +8,7 @@ set(SRCS | |||
| 8 | main.cpp | 8 | main.cpp |
| 9 | config/controller_config.cpp | 9 | config/controller_config.cpp |
| 10 | config/controller_config_util.cpp) | 10 | config/controller_config_util.cpp) |
| 11 | set (HEADS | 11 | set (HEADERS |
| 12 | bootmanager.hxx | 12 | bootmanager.hxx |
| 13 | debugger/callstack.hxx | 13 | debugger/callstack.hxx |
| 14 | debugger/disassembler.hxx | 14 | debugger/disassembler.hxx |
| @@ -49,7 +49,7 @@ qt4_wrap_cpp(MOC_SRCS | |||
| 49 | include_directories(${CMAKE_CURRENT_BINARY_DIR}) | 49 | include_directories(${CMAKE_CURRENT_BINARY_DIR}) |
| 50 | include_directories(./) | 50 | include_directories(./) |
| 51 | 51 | ||
| 52 | add_executable(citra-qt ${SRCS} ${HEADS} ${MOC_SRCS} ${UI_HDRS}) | 52 | add_executable(citra-qt ${SRCS} ${HEADERS} ${MOC_SRCS} ${UI_HDRS}) |
| 53 | if (APPLE) | 53 | if (APPLE) |
| 54 | target_link_libraries(citra-qt core common video_core qhexedit iconv ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES}) | 54 | target_link_libraries(citra-qt core common video_core qhexedit iconv ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES}) |
| 55 | else() | 55 | else() |
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 0027ae2b0..aae183393 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt | |||
| @@ -19,7 +19,7 @@ set(SRCS break_points.cpp | |||
| 19 | timer.cpp | 19 | timer.cpp |
| 20 | utf8.cpp) | 20 | utf8.cpp) |
| 21 | 21 | ||
| 22 | set(HEADS atomic.h | 22 | set(HEADERS atomic.h |
| 23 | atomic_gcc.h | 23 | atomic_gcc.h |
| 24 | atomic_win32.h | 24 | atomic_win32.h |
| 25 | bit_field.h | 25 | bit_field.h |
| @@ -58,4 +58,4 @@ set(HEADS atomic.h | |||
| 58 | timer.h | 58 | timer.h |
| 59 | utf8.h) | 59 | utf8.h) |
| 60 | 60 | ||
| 61 | add_library(common STATIC ${SRCS} ${HEADS}) | 61 | add_library(common STATIC ${SRCS} ${HEADERS}) |
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index ddf6bf79c..14c598bf3 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt | |||
| @@ -43,7 +43,7 @@ set(SRCS core.cpp | |||
| 43 | hw/lcd.cpp | 43 | hw/lcd.cpp |
| 44 | hw/ndma.cpp) | 44 | hw/ndma.cpp) |
| 45 | 45 | ||
| 46 | set(HEADS core.h | 46 | set(HEADERS core.h |
| 47 | core_timing.h | 47 | core_timing.h |
| 48 | loader.h | 48 | loader.h |
| 49 | mem_map.h | 49 | mem_map.h |
| @@ -86,4 +86,4 @@ set(HEADS core.h | |||
| 86 | hw/lcd.h | 86 | hw/lcd.h |
| 87 | hw/ndma.h) | 87 | hw/ndma.h) |
| 88 | 88 | ||
| 89 | add_library(core STATIC ${SRCS} ${HEADS}) | 89 | add_library(core STATIC ${SRCS} ${HEADERS}) |
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index 8d04d381c..e43e6e1bb 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt | |||
| @@ -2,9 +2,9 @@ set(SRCS video_core.cpp | |||
| 2 | utils.cpp | 2 | utils.cpp |
| 3 | renderer_opengl/renderer_opengl.cpp) | 3 | renderer_opengl/renderer_opengl.cpp) |
| 4 | 4 | ||
| 5 | set(HEADS video_core.h | 5 | set(HEADERS video_core.h |
| 6 | utils.h | 6 | utils.h |
| 7 | renderer_base.h | 7 | renderer_base.h |
| 8 | renderer_opengl/renderer_opengl.h) | 8 | renderer_opengl/renderer_opengl.h) |
| 9 | 9 | ||
| 10 | add_library(video_core STATIC ${SRCS} ${HEADS}) | 10 | add_library(video_core STATIC ${SRCS} ${HEADERS}) |