diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/CMakeLists.txt | 33 | ||||
| -rw-r--r-- | src/common/emu_window.h | 2 | ||||
| -rw-r--r-- | src/common/scm_rev.h | 4 |
3 files changed, 18 insertions, 21 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index c4f060db0..6cf0e61c8 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt | |||
| @@ -1,18 +1,19 @@ | |||
| 1 | set(SRCS src/break_points.cpp | 1 | set(SRCS break_points.cpp |
| 2 | src/console_listener.cpp | 2 | console_listener.cpp |
| 3 | src/extended_trace.cpp | 3 | extended_trace.cpp |
| 4 | src/file_search.cpp | 4 | file_search.cpp |
| 5 | src/file_util.cpp | 5 | file_util.cpp |
| 6 | src/hash.cpp | 6 | hash.cpp |
| 7 | src/log_manager.cpp | 7 | log_manager.cpp |
| 8 | src/math_util.cpp | 8 | math_util.cpp |
| 9 | src/mem_arena.cpp | 9 | mem_arena.cpp |
| 10 | src/memory_util.cpp | 10 | memory_util.cpp |
| 11 | src/misc.cpp | 11 | misc.cpp |
| 12 | src/msg_handler.cpp | 12 | msg_handler.cpp |
| 13 | src/string_util.cpp | 13 | string_util.cpp |
| 14 | src/thread.cpp | 14 | thread.cpp |
| 15 | src/timer.cpp | 15 | timer.cpp |
| 16 | src/version.cpp) | 16 | utf8.cpp |
| 17 | version.cpp) | ||
| 17 | 18 | ||
| 18 | add_library(common STATIC ${SRCS}) | 19 | add_library(common STATIC ${SRCS}) |
diff --git a/src/common/emu_window.h b/src/common/emu_window.h index 731784756..e70b99ec1 100644 --- a/src/common/emu_window.h +++ b/src/common/emu_window.h | |||
| @@ -55,7 +55,7 @@ public: | |||
| 55 | m_client_area_height = val; | 55 | m_client_area_height = val; |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | std::string GetWindowTitle() { | 58 | std::string GetWindowTitle() const { |
| 59 | return m_window_title; | 59 | return m_window_title; |
| 60 | } | 60 | } |
| 61 | 61 | ||
diff --git a/src/common/scm_rev.h b/src/common/scm_rev.h deleted file mode 100644 index cd5df9ca8..000000000 --- a/src/common/scm_rev.h +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | #define SCM_REV_STR "d0674cc98bfa5729168274cde62a4e69343f8524" | ||
| 2 | #define SCM_DESC_STR "d0674cc" | ||
| 3 | #define SCM_BRANCH_STR "master" | ||
| 4 | #define SCM_IS_MASTER 1 | ||