backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-05-05 21:02:39 +08:00
Code Issues Projects Releases Wiki Activity

don't build barrierd for non-windows platforms; removed some synergy-related legacy checks

Browse Source
This commit is contained in:
walker0643
2018-03-11 12:48:59 -04:00
parent ed05dc2b2e
commit b9a59c014f
7 changed files with 17 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/CMakeLists.txt
View File

@@ -19,6 +19,7 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/lib)
add_subdirectory(lib)
add_subdirectory(cmd)
if (BARRIER_BUILD_LEGACY_GUI)
add_subdirectory(gui)
endif (BARRIER_BUILD_LEGACY_GUI)
if (BARRIER_BUILD_GUI)
add_subdirectory(gui)
endif()

4
src/cmd/CMakeLists.txt
View File

@@ -18,7 +18,7 @@ add_subdirectory(barrierc)
add_subdirectory(barriers)
add_subdirectory(syntool)
if (BARRIER_BUILD_LEGACY_SERVICE)
if (WIN32)
add_subdirectory(barrierd)
endif (BARRIER_BUILD_LEGACY_SERVICE)
endif()

12
src/gui/CMakeLists.txt
View File

@@ -6,17 +6,17 @@ set (CMAKE_AUTORCC ON)
set (CMAKE_AUTOUIC ON)
set (CMAKE_INCLUDE_CURRENT_DIR ON)
file (GLOB LEGACY_GUI_SOURCE_FILES src/*.cpp src/*.h)
file (GLOB LEGACY_GUI_UI_FILES src/*.ui)
file (GLOB GUI_SOURCE_FILES src/*.cpp src/*.h)
file (GLOB GUI_UI_FILES src/*.ui)
if (WIN32)
set (LEGACY_GUI_RC_FILES res/win/Barrier.rc)
set (GUI_RC_FILES res/win/Barrier.rc)
endif()
add_executable (barrier WIN32
${LEGACY_GUI_SOURCE_FILES}
${LEGACY_GUI_UI_FILES}
${LEGACY_GUI_RC_FILES}
${GUI_SOURCE_FILES}
${GUI_UI_FILES}
${GUI_RC_FILES}
res/Barrier.qrc
)

10
src/lib/arch/win32/ArchDaemonWindows.cpp
View File

@@ -697,15 +697,7 @@ ArchDaemonWindows::installDaemon()
void
ArchDaemonWindows::uninstallDaemon()
{
// remove legacy services if installed.
if (isDaemonInstalled(LEGACY_SERVER_DAEMON_NAME)) {
uninstallDaemon(LEGACY_SERVER_DAEMON_NAME);
}
if (isDaemonInstalled(LEGACY_CLIENT_DAEMON_NAME)) {
uninstallDaemon(LEGACY_CLIENT_DAEMON_NAME);
}
// remove new service if installed.
// remove service if installed.
if (isDaemonInstalled(DEFAULT_DAEMON_NAME)) {
uninstallDaemon(DEFAULT_DAEMON_NAME);
}

3
src/lib/arch/win32/ArchDaemonWindows.h
View File

@@ -142,9 +142,6 @@ private:
#define DEFAULT_DAEMON_NAME _T("Barrier")
#define DEFAULT_DAEMON_INFO _T("Manages the Barrier foreground processes.")
#define LEGACY_SERVER_DAEMON_NAME _T("Barrier Server")
#define LEGACY_CLIENT_DAEMON_NAME _T("Barrier Client")
static const TCHAR* const g_daemonKeyPath[] = {
_T("SOFTWARE"),
_T("The Barrier Project"),