rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed: osx compile errors from last commit

This commit is contained in:
Nick Bolton 2014-02-28 13:06:25 +00:00
parent f3d542b2c3
commit 19bcb9dfae
11 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/synergyc/OSXClientTaskBarReceiver.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergyc/ClientTaskBarReceiver.h" #include "synergy/ClientTaskBarReceiver.h"
class CBufferedLogOutputter; class CBufferedLogOutputter;
class IEventQueue; class IEventQueue;

2
src/cmd/synergys/OSXServerTaskBarReceiver.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergys/ServerTaskBarReceiver.h" #include "synergy/ServerTaskBarReceiver.h"
class CBufferedLogOutputter; class CBufferedLogOutputter;

2
src/lib/platform/CMakeLists.txt
View File

@ -19,7 +19,7 @@ if (WIN32)
file(GLOB sources "MSWindows*.cpp") file(GLOB sources "MSWindows*.cpp")
elseif (APPLE) elseif (APPLE)
file(GLOB headers "OSX*.h") file(GLOB headers "OSX*.h")
file(GLOB sources "OSX*.cpp") file(GLOB sources "OSX*.cpp" "OSX*.m")
elseif (UNIX) elseif (UNIX)
file(GLOB headers "XWindows*.h") file(GLOB headers "XWindows*.h")
file(GLOB sources "XWindows*.cpp") file(GLOB sources "XWindows*.cpp")

4
src/lib/platform/OSXDragSimulator.m
View File

@ -12,9 +12,9 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#import "platform/COSXDragSimulator.h" #import "platform/OSXDragSimulator.h"
#import "platform/COSXDragView.h" #import "platform/OSXDragView.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <CoreData/CoreData.h> #import <CoreData/CoreData.h>

2
src/lib/platform/OSXDragView.m
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#import "platform/COSXDragView.h" #import "platform/OSXDragView.h"
#ifdef MAC_OS_X_VERSION_10_7 #ifdef MAC_OS_X_VERSION_10_7

2
src/lib/platform/OSXEventQueueBuffer.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "IEventQueueBuffer.h" #include "base/IEventQueueBuffer.h"
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>

2
src/lib/platform/OSXPasteboardPeeker.m
View File

@ -12,7 +12,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#import "platform/COSXPasteboardPeeker.h" #import "platform/OSXPasteboardPeeker.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <CoreData/CoreData.h> #import <CoreData/CoreData.h>

2
src/lib/platform/OSXScreen.cpp
View File

@ -18,6 +18,7 @@
#include "platform/OSXScreen.h" #include "platform/OSXScreen.h"
#include "client/Client.h"
#include "platform/OSXClipboard.h" #include "platform/OSXClipboard.h"
#include "platform/OSXEventQueueBuffer.h" #include "platform/OSXEventQueueBuffer.h"
#include "platform/OSXKeyState.h" #include "platform/OSXKeyState.h"
@ -27,7 +28,6 @@
#include "synergy/Clipboard.h" #include "synergy/Clipboard.h"
#include "synergy/KeyMap.h" #include "synergy/KeyMap.h"
#include "synergy/ClientApp.h" #include "synergy/ClientApp.h"
#include "synergy/Client.h"
#include "mt/CondVar.h" #include "mt/CondVar.h"
#include "mt/Lock.h" #include "mt/Lock.h"
#include "mt/Mutex.h" #include "mt/Mutex.h"

4
src/lib/platform/OSXScreenSaver.cpp
View File

@ -16,9 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#import "platform/COSXScreenSaver.h" #import "platform/OSXScreenSaver.h"
#import "platform/COSXScreenSaverUtil.h" #import "platform/OSXScreenSaverUtil.h"
#import "synergy/IPrimaryScreen.h" #import "synergy/IPrimaryScreen.h"
#import "base/Log.h" #import "base/Log.h"
#import "base/IEventQueue.h" #import "base/IEventQueue.h"

2
src/lib/platform/OSXScreenSaver.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "platform/IScreenSaver.h" #include "synergy/IScreenSaver.h"
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>

2
src/lib/platform/OSXScreenSaverUtil.m
View File

@ -12,7 +12,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#import "platform/COSXScreenSaverUtil.h" #import "platform/OSXScreenSaverUtil.h"
#import "platform/OSXScreenSaverControl.h" #import "platform/OSXScreenSaverControl.h"