fixed: osx compile errors from last commit
This commit is contained in:
parent
f3d542b2c3
commit
19bcb9dfae
|
@ -18,7 +18,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "synergyc/ClientTaskBarReceiver.h"
|
||||
#include "synergy/ClientTaskBarReceiver.h"
|
||||
|
||||
class CBufferedLogOutputter;
|
||||
class IEventQueue;
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "synergys/ServerTaskBarReceiver.h"
|
||||
#include "synergy/ServerTaskBarReceiver.h"
|
||||
|
||||
class CBufferedLogOutputter;
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ if (WIN32)
|
|||
file(GLOB sources "MSWindows*.cpp")
|
||||
elseif (APPLE)
|
||||
file(GLOB headers "OSX*.h")
|
||||
file(GLOB sources "OSX*.cpp")
|
||||
file(GLOB sources "OSX*.cpp" "OSX*.m")
|
||||
elseif (UNIX)
|
||||
file(GLOB headers "XWindows*.h")
|
||||
file(GLOB sources "XWindows*.cpp")
|
||||
|
|
|
@ -12,9 +12,9 @@
|
|||
* 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 <CoreData/CoreData.h>
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
* 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
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "IEventQueueBuffer.h"
|
||||
#include "base/IEventQueueBuffer.h"
|
||||
|
||||
#include <Carbon/Carbon.h>
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#import "platform/COSXPasteboardPeeker.h"
|
||||
#import "platform/OSXPasteboardPeeker.h"
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <CoreData/CoreData.h>
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
#include "platform/OSXScreen.h"
|
||||
|
||||
#include "client/Client.h"
|
||||
#include "platform/OSXClipboard.h"
|
||||
#include "platform/OSXEventQueueBuffer.h"
|
||||
#include "platform/OSXKeyState.h"
|
||||
|
@ -27,7 +28,6 @@
|
|||
#include "synergy/Clipboard.h"
|
||||
#include "synergy/KeyMap.h"
|
||||
#include "synergy/ClientApp.h"
|
||||
#include "synergy/Client.h"
|
||||
#include "mt/CondVar.h"
|
||||
#include "mt/Lock.h"
|
||||
#include "mt/Mutex.h"
|
||||
|
|
|
@ -16,9 +16,9 @@
|
|||
* 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 "base/Log.h"
|
||||
#import "base/IEventQueue.h"
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "platform/IScreenSaver.h"
|
||||
#include "synergy/IScreenSaver.h"
|
||||
|
||||
#include <Carbon/Carbon.h>
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#import "platform/COSXScreenSaverUtil.h"
|
||||
#import "platform/OSXScreenSaverUtil.h"
|
||||
|
||||
#import "platform/OSXScreenSaverControl.h"
|
||||
|
||||
|
|
Loading…
Reference in New Issue