diff options
| author | Piers Daniell <pdaniell@nvidia.com> | 2015-02-24 13:58:47 -0700 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-03-02 17:21:10 -0700 |
| commit | 8254bebed7609fe24902267bea25e3866f2a4bcc (patch) | |
| tree | 2dbbca6c98ac292f9892cfa823b47b7ce2725b3b /loader | |
| parent | f94f9bc3358d29b8cf7c03d753808bbbb61a5a3f (diff) | |
| download | usermoji-8254bebed7609fe24902267bea25e3866f2a4bcc.tar.xz | |
Get the trace player to work with Windows
This change modifies many of the generators to use "#if
defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)" to choose between using
XCB or WIN32 native.
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | loader/XGL.def | 4 | ||||
| -rw-r--r-- | loader/loader_platform.h | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index f5f835cd..697d0304 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -17,7 +17,7 @@ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG") if (WIN32) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXGL_PROTOTYPES -D_CRT_SECURE_NO_WARNINGS") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXGL_PROTOTYPES -D_CRT_SECURE_NO_WARNINGS -DXCB_NVIDIA") add_library(XGL SHARED loader.c loader.h dirent_on_windows.c dispatch.c table_ops.h XGL.def) set_target_properties(XGL PROPERTIES LINK_FLAGS "/DEF:${PROJECT_SOURCE_DIR}/loader/XGL.def") diff --git a/loader/XGL.def b/loader/XGL.def index 6c560ba1..4d1877ea 100644 --- a/loader/XGL.def +++ b/loader/XGL.def @@ -148,3 +148,7 @@ EXPORTS xglDbgSetDeviceOption xglCmdDbgMarkerBegin xglCmdDbgMarkerEnd + xglWsiX11AssociateConnection + xglWsiX11GetMSC + xglWsiX11CreatePresentableImage + xglWsiX11QueuePresent diff --git a/loader/loader_platform.h b/loader/loader_platform.h index 2d878bce..b4f711af 100644 --- a/loader/loader_platform.h +++ b/loader/loader_platform.h @@ -135,6 +135,7 @@ static inline void loader_platform_thread_delete_mutex(loader_platform_thread_mu /* Windows-specific common code: */ // Headers: +#include <WinSock2.h> #include <windows.h> #include <assert.h> #ifdef __cplusplus |