mirror of
https://github.com/gnif/LookingGlass.git
synced 2025-08-05 18:24:08 +00:00
[build] make "common" a static library (part 1/2)
This commit is contained in:
@@ -22,6 +22,7 @@ ADD_CUSTOM_COMMAND(TARGET platform_Windows POST_BUILD
|
||||
|
||||
target_link_libraries(platform_Windows
|
||||
"${PROJECT_BINARY_DIR}/resource.o"
|
||||
lg_common
|
||||
capture
|
||||
setupapi
|
||||
)
|
||||
|
@@ -1,19 +1,20 @@
|
||||
cmake_minimum_required(VERSION 3.0)
|
||||
project(capture LANGUAGES C)
|
||||
|
||||
include("PreCapture")
|
||||
include(PreCapture)
|
||||
|
||||
option(USE_NVFBC "Enable NVFBC Support" OFF)
|
||||
option(USE_DXGI "Enable DXGI Support" ON)
|
||||
|
||||
if(NOT DEFINED NVFBC_SDK)
|
||||
set(NVFBC_SDK "C:\\Program Files (x86)\\NVIDIA Corporation\\NVIDIA Capture SDK")
|
||||
endif()
|
||||
|
||||
if(EXISTS "${NVFBC_SDK}\\inc" AND IS_DIRECTORY "${NVFBC_SDK}\\inc")
|
||||
set(USE_NVFBC ON)
|
||||
if(NOT EXISTS "${NVFBC_SDK}\\inc" OR NOT IS_DIRECTORY "${NVFBC_SDK}\\inc")
|
||||
message("Disabling NVFBC support, can't find the SDK headers")
|
||||
set(USE_NVFBC OFF)
|
||||
endif()
|
||||
|
||||
option(USE_NVFBC "Enable NVFBC Support" ${USE_NVFBC})
|
||||
option(USE_DXGI "Enable DXGI Support" ON)
|
||||
|
||||
if(USE_NVFBC)
|
||||
add_capture("NVFBC")
|
||||
endif()
|
||||
|
@@ -15,6 +15,7 @@ ADD_CUSTOM_COMMAND(TARGET capture_DXGI POST_BUILD
|
||||
)
|
||||
|
||||
target_link_libraries(capture_DXGI
|
||||
lg_common
|
||||
${PROJECT_BINARY_DIR}/libd3d11.dll
|
||||
dxgi
|
||||
)
|
||||
|
@@ -19,8 +19,8 @@ Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "interface/capture.h"
|
||||
#include "interface/platform.h"
|
||||
#include "debug.h"
|
||||
#include "windows/windebug.h"
|
||||
#include "common/debug.h"
|
||||
#include "windows/debug.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include <dxgi.h>
|
||||
|
@@ -19,7 +19,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "debug.h"
|
||||
#include "common/debug.h"
|
||||
#include <windows.h>
|
||||
|
||||
#ifdef __cplusplus
|
@@ -18,7 +18,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include "windows/mousehook.h"
|
||||
#include "windows/windebug.h"
|
||||
#include "windows/debug.h"
|
||||
#include "platform.h"
|
||||
|
||||
#include <windows.h>
|
||||
|
@@ -24,8 +24,8 @@ Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#include <setupapi.h>
|
||||
|
||||
#include "interface/platform.h"
|
||||
#include "debug.h"
|
||||
#include "windows/windebug.h"
|
||||
#include "common/debug.h"
|
||||
#include "windows/debug.h"
|
||||
#include "ivshmem/Public.h"
|
||||
|
||||
static HANDLE shmemHandle = INVALID_HANDLE_VALUE;
|
||||
|
@@ -17,7 +17,7 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
||||
Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include "windows/windebug.h"
|
||||
#include "windows/debug.h"
|
||||
#include <stdio.h>
|
||||
|
||||
void DebugWinError(const char * file, const unsigned int line, const char * function, const char * desc, HRESULT status)
|
||||
|
Reference in New Issue
Block a user