Browse Source

Move HIDRemote to external so it won't be tidied

Tobias Hieta 8 years ago
parent
commit
2014be22cc

+ 1 - 1
CMakeModules/AppleConfiguration.cmake

@@ -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 - 0
external/CMakeLists.txt

@@ -4,4 +4,5 @@ add_subdirectory(qhttp)
 if(APPLE)
   add_subdirectory(plistparser)
   add_subdirectory(SPMediaKeyTap)
+  add_subdirectory(HIDRemote)
 endif(APPLE)

+ 2 - 0
external/HIDRemote/CMakeLists.txt

@@ -0,0 +1,2 @@
+set_source_files_properties(HIDRemote.m PROPERTIES COMPILE_FLAGS -fno-objc-arc)
+add_library(hidremote STATIC HIDRemote.m HIDRemote.h)

+ 0 - 0
src/input/apple/HIDRemote/HIDRemote.h → external/HIDRemote/HIDRemote.h


+ 0 - 0
src/input/apple/HIDRemote/HIDRemote.m → external/HIDRemote/HIDRemote.m


+ 0 - 0
src/input/apple/HIDRemote/LICENSE.txt → external/HIDRemote/LICENSE.txt


+ 0 - 0
src/input/apple/HIDRemote/README.txt → external/HIDRemote/README.txt


+ 2 - 1
src/CMakeLists.txt

@@ -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
src/input/apple/AppleRemoteDelegate.h

@@ -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

+ 0 - 1
src/input/apple/CMakeLists.txt

@@ -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
src/input/apple/InputAppleRemote.mm

@@ -1,7 +1,7 @@
 #include "InputAppleRemote.h"
 #include "QsLog.h"
 
-#include "HIDRemote/HIDRemote.h"
+#include "HIDRemote.h"
 #include "AppleRemoteDelegate.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////