jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac-virtualcam: Remove unneeded includes

master
gxalpha 2021-09-19 14:44:17 +02:00 committed by Jim
parent 08d4456339
commit fab23d523b
11 changed files with 11 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt
View File

@ -3,24 +3,18 @@ set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
project(mac-dal-plugin)
find_library(AVFOUNDATION AVFoundation)
find_library(COCOA Cocoa)
find_library(APPKIT AppKit)
find_library(COREFOUNDATION CoreFoundation)
find_library(COREMEDIA CoreMedia)
find_library(COREVIDEO CoreVideo)
find_library(COCOA Cocoa)
find_library(COREMEDIA CoreMedia)
find_library(COREMEDIAIO CoreMediaIO)
find_library(IOSURFACE IOSurface)
find_library(IOKIT IOKit)
# Possible we could remove osme of these
include_directories(${AVFOUNDATION}
${COCOA}
include_directories(${APPKIT}
${COREFOUNDATION}
${COREMEDIA}
${COREVIDEO}
${COREMEDIA}
${COREMEDIAIO}
${COCOA}
${IOSURFACE}
./
../common)
@ -29,10 +23,10 @@ set(mac-dal-plugin_HEADERS
Defines.h
Logging.h
OBSDALPlugInInterface.h
OBSDALObjectStore.h
OBSDALObjectStore.h
OBSDALPlugIn.h
OBSDALDevice.h
OBSDALStream.h
OBSDALStream.h
CMSampleBufferUtils.h
OBSDALMachClient.h
../common/MachProtocol.h)
@ -43,7 +37,7 @@ set(mac-dal-plugin_SOURCES
OBSDALObjectStore.mm
OBSDALPlugIn.mm
OBSDALDevice.mm
OBSDALStream.mm
OBSDALStream.mm
CMSampleBufferUtils.mm
OBSDALMachClient.mm)
@ -64,13 +58,11 @@ else (XCODE)
endif (XCODE)
target_link_libraries(mac-dal-plugin
${AVFOUNDATION}
${COCOA}
${APPKIT}
${COREFOUNDATION}
${COREMEDIA}
${COREVIDEO}
${COREMEDIA}
${COREMEDIAIO}
${IOSURFACE}
${IOKIT})
add_custom_command(TARGET mac-dal-plugin

1
plugins/mac-virtualcam/src/dal-plugin/OBSDALDevice.mm
View File

@ -19,7 +19,6 @@
#import "OBSDALDevice.h"
#import <CoreFoundation/CoreFoundation.h>
#include <IOKit/audio/IOAudioTypes.h>
#import "OBSDALPlugIn.h"

3
plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugIn.h
View File

@ -17,9 +17,6 @@
// You should have received a copy of the GNU General Public License
// along with obs-mac-virtualcam. If not, see <http://www.gnu.org/licenses/>.
#import <Foundation/Foundation.h>
#import <CoreMediaIO/CMIOHardwarePlugIn.h>
#import "OBSDALObjectStore.h"
#import "OBSDALMachClient.h"
#import "OBSDALStream.h"

2
plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugIn.mm
View File

@ -19,8 +19,6 @@
#import "OBSDALPlugIn.h"
#import <CoreMediaIO/CMIOHardwarePlugin.h>
#import "Logging.h"
typedef enum {

2
plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugInInterface.mm
View File

@ -21,8 +21,6 @@
#import "OBSDALPlugInInterface.h"
#import <CoreFoundation/CFUUID.h>
#import "OBSDALPlugIn.h"
#import "OBSDALDevice.h"
#import "OBSDALStream.h"

2
plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugInMain.mm
View File

@ -17,8 +17,6 @@
// You should have received a copy of the GNU General Public License
// along with obs-mac-virtualcam. If not, see <http://www.gnu.org/licenses/>.
#import <CoreMediaIO/CMIOHardwarePlugin.h>
#import "OBSDALPlugInInterface.h"
#import "Logging.h"
#import "Defines.h"

2
plugins/mac-virtualcam/src/dal-plugin/OBSDALStream.h
View File

@ -17,8 +17,6 @@
// You should have received a copy of the GNU General Public License
// along with obs-mac-virtualcam. If not, see <http://www.gnu.org/licenses/>.
#import <Foundation/Foundation.h>
#import "OBSDALObjectStore.h"
NS_ASSUME_NONNULL_BEGIN

1
plugins/mac-virtualcam/src/dal-plugin/OBSDALStream.mm
View File

@ -21,7 +21,6 @@
#import <AppKit/AppKit.h>
#import <mach/mach_time.h>
#include <CoreMediaIO/CMIOSampleBuffer.h>
#import "Logging.h"
#import "CMSampleBufferUtils.h"

30
plugins/mac-virtualcam/src/obs-plugin/CMakeLists.txt
View File

@ -1,26 +1,10 @@
project(mac-virtualcam)
find_library(AVFOUNDATION AVFoundation)
find_library(APPKIT AppKit)
find_library(COCOA Cocoa)
find_library(COREFOUNDATION CoreFoundation)
find_library(COREMEDIA CoreMedia)
find_library(COREVIDEO CoreVideo)
find_library(COCOA Cocoa)
find_library(COREMEDIAIO CoreMediaIO)
find_library(IOSURFACE IOSurface)
find_library(IOKIT IOKit)
include_directories(${AVFOUNDATION}
${APPKIT}
${COCOA}
include_directories(${APPKIT}
${COREFOUNDATION}
${COREMEDIA}
${COREVIDEO}
${COREMEDIAIO}
${COCOA}
${IOSURFACE}
"${CMAKE_SOURCE_DIR}/UI/obs-frontend-api"
../common)
set(mac-virtualcam_HEADERS
@ -38,18 +22,8 @@ add_library(mac-virtualcam MODULE
target_link_libraries(mac-virtualcam
libobs
obs-frontend-api
Qt5::Core
Qt5::Widgets
${AVFOUNDATION}
${APPKIT}
${COCOA}
${COREFOUNDATION}
${COREMEDIA}
${COREVIDEO}
${COREMEDIAIO}
${IOSURFACE}
${IOKIT})
${COREFOUNDATION})
set_target_properties(mac-virtualcam PROPERTIES
FOLDER "plugins"

1
plugins/mac-virtualcam/src/obs-plugin/OBSDALMachServer.mm
View File

@ -6,7 +6,6 @@
//
#import "OBSDALMachServer.h"
#import <Foundation/Foundation.h>
#include <obs-module.h>
#include "MachProtocol.h"
#include "Defines.h"

7
plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm
View File

@ -1,11 +1,4 @@
#include <obs-module.h>
#include <obs.hpp>
#include <pthread.h>
#include <QMainWindow.h>
#include <QAction.h>
#include <obs-frontend-api.h>
#include <obs.h>
#include <CoreFoundation/CoreFoundation.h>
#include <AppKit/AppKit.h>
#include "OBSDALMachServer.h"
#include "Defines.h"