Skip to content

Commit 2d8e294

Browse files
committed
Merge branch 'master' into 'release'
First Release (v0.0.1) See merge request Coffee2Code/gebaar-libinput!1
2 parents 2592c27 + 24a61c4 commit 2d8e294

File tree

19 files changed

+579
-185
lines changed

19 files changed

+579
-185
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# Created by .ignore support plugin (hsz.mobi)
1+
### Personal Testing Files
2+
gebaard.toml
3+
24
### CMake template
35
CMakeCache.txt
46
CMakeFiles

.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "libs/cxxopts"]
2+
path = libs/cxxopts
3+
url = [email protected]:jarro2783/cxxopts.git
4+
[submodule "libs/cpptoml"]
5+
path = libs/cpptoml
6+
url = [email protected]:skystrife/cpptoml.git

.idea/.name

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/encodings.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gebaar.iml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
cmake_minimum_required(VERSION 3.13)
2-
project(sxgd)
2+
project(gebaar)
33
set(CMAKE_VERBOSE_MAKEFILE on)
44
set(CMAKE_EXPORT_COMPILE_COMMANDS on)
55
set(CMAKE_CXX_STANDARD 17)
66
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
77

8-
add_executable(gebaard src/main.cpp)
8+
add_executable(gebaard src/main.cpp src/io/input.cpp src/io/input.h src/config/config.cpp src/config/config.h src/daemonizer.cpp src/daemonizer.h)
99

1010
find_package(PkgConfig)
1111
if (PKG_CONFIG_FOUND)
@@ -15,6 +15,6 @@ endif ()
1515
find_package(udev)
1616
find_package(spdlog)
1717

18-
target_link_libraries(gebaard ${LIBINPUT_LIBRARIES} ${UDEV_LIBRARIES})
19-
target_include_directories(gebaard PUBLIC ${LIBINPUT_INCLUDE_DIRS} ${UDEV_INCLUDE_DIRS})
20-
target_compile_options(gebaard PUBLIC ${LIBINPUT_CFLAGS_OTHER} ${UDEV_CFLAGS_OTHER})
18+
target_link_libraries(gebaard ${LIBINPUT_LIBRARIES} ${UDEV_LIBRARIES} stdc++fs)
19+
target_include_directories(gebaard PUBLIC ${LIBINPUT_INCLUDE_DIRS} ${UDEV_INCLUDE_DIRS} libs/cxxopts/include libs/cpptoml/include)
20+
target_compile_options(gebaard PUBLIC ${LIBINPUT_CFLAGS_OTHER} ${UDEV_CFLAGS_OTHER})

0 commit comments

Comments
 (0)