Move HIDRemote to external so it won't be tidied

This commit is contained in:
Tobias Hieta committed 2016-03-22 11:19:45 +01:00
1 parent 7f4202ff9c
commit 2014be22cc
11 files changed
+9 -6

No files matched your search

+1 -1
View File
@@ -5,7 +5,7 @@ find_library(COCOA Cocoa)
find_Library(CARBON Carbon)
find_library(SECURITY Security)
set(OS_LIBS ${FOUNDATION} ${APPKIT} ${IOKIT} ${COCOA} ${SECURITY} ${CARBON} spmediakeytap)
set(OS_LIBS ${FOUNDATION} ${APPKIT} ${IOKIT} ${COCOA} ${SECURITY} ${CARBON} spmediakeytap hidremote)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.9 -fno-omit-frame-pointer")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.9 -fno-omit-frame-pointer")
set(WARNINGS "-Wall")
+1
View File
@@ -4,4 +4,5 @@ add_subdirectory(qhttp)
if(APPLE)
add_subdirectory(plistparser)
add_subdirectory(SPMediaKeyTap)
add_subdirectory(HIDRemote)
endif(APPLE)
+2
View File
@@ -0,0 +1,2 @@
set_source_files_properties(HIDRemote.m PROPERTIES COMPILE_FLAGS -fno-objc-arc)
add_library(hidremote STATIC HIDRemote.m HIDRemote.h)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+2 -1
View File
@@ -2,6 +2,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/external/qhttp/src
${CMAKE_SOURCE_DIR}/external/qslog
${CMAKE_SOURCE_DIR}/external/SPMediaKeyTap
${CMAKE_SOURCE_DIR}/external/HIDRemote
${CMAKE_SOURCE_DIR}/external/plistparser
${CMAKE_SOURCE_DIR}/src/player
shared
@@ -110,7 +111,7 @@ if(APPLE)
endif(HAVE_UPDATER)
set_source_files_properties(
input/apple/HIDRemote/HIDRemote.h
/HIDRemote/HIDRemote.h
input/apple/HIDRemote/HIDRemote.m
PROPERTIES COMPILE_FLAGS -fno-objc-arc
)
+2 -2
View File
@@ -2,7 +2,7 @@
#define __APPLE_REMOTE_DELEGATE_H__
#import <Cocoa/Cocoa.h>
#import "HIDRemote/HIDRemote.h"
#import "HIDRemote.h"
class InputAppleRemote;
@@ -26,4 +26,4 @@ fromHardwareWithAttributes:(NSMutableDictionary *)attributes;
@end
#endif
#endif
-1
View File
@@ -1,5 +1,4 @@
set(APPLE_SRC
HIDRemote/HIDRemote.h HIDRemote/HIDRemote.m
InputAppleRemote.h InputAppleRemote.mm
AppleRemoteDelegate.mm AppleRemoteDelegate.h
InputAppleMediaKeys.h InputAppleMediaKeys.mm
+1 -1
View File
@@ -1,7 +1,7 @@
#include "InputAppleRemote.h"
#include "QsLog.h"
#include "HIDRemote/HIDRemote.h"
#include "HIDRemote.h"
#include "AppleRemoteDelegate.h"
///////////////////////////////////////////////////////////////////////////////////////////////////